release: cut the v7.1.0-beta.2 release

PR Close #26973

.circleci/README.md

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

.circleci/config.yml

@@ -7,40 +7,20 @@
 # To validate changes, use an online parser, eg.
 # http://yaml-online-parser.appspot.com/
 
-# Variables
-
-## IMPORTANT
-# If you change the `docker_image` version, also change the `cache_key` suffix and the version of
-# `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.7.0
-var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.7.0
+# Note that the browser docker image comes with Chrome and Firefox preinstalled. This is just
+# 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**: 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
+var_3: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-node-10.12
 
 # Define common ENV vars
-var_3: &define_env_vars
+var_4: &define_env_vars
   run:
     name: Define environment variables
-    command: |
-      echo "export PROJECT_ROOT=$(pwd)" | tee -a $BASH_ENV
-      echo "export CI_AIO_MIN_PWA_SCORE=95" | tee -a $BASH_ENV
-      # This is the branch being built; e.g. `pull/12345` for PR builds.
-      echo "export CI_BRANCH=$CIRCLE_BRANCH" | tee -a $BASH_ENV
-      echo "export CI_COMMIT=$CIRCLE_SHA1" | tee -a $BASH_ENV
-      # `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.
-      echo "export CI_COMMIT_RANGE=$(sed -r 's|^.*/([0-9a-f]+\.\.\.[0-9a-f]+)$|\1|i' <<< ${CIRCLE_COMPARE_URL:-})" | tee -a $BASH_ENV
-      echo "export CI_PULL_REQUEST=${CIRCLE_PR_NUMBER:-false}" | tee -a $BASH_ENV
-      echo "export CI_REPO_NAME=$CIRCLE_PROJECT_REPONAME" | tee -a $BASH_ENV
-      echo "export CI_REPO_OWNER=$CIRCLE_PROJECT_USERNAME" | tee -a $BASH_ENV
-      # WARNING: Secrets (do not print).
-      echo "export CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN=$AIO_DEPLOY_TOKEN" >> $BASH_ENV
-      echo "export CI_SECRET_PAYLOAD_FIREBASE_TOKEN=$ANGULAR_PAYLOAD_TOKEN" >> $BASH_ENV
-
-# See remote cache documentation in /docs/BAZEL.md
-var_4: &setup-bazel-remote-cache
-  run:
-    name: Start up bazel remote cache proxy
-    command: ~/bazel-remote-proxy -backend circleci://
-    background: true
+    command: ./.circleci/env.sh
 
 var_5: &setup_bazel_remote_execution
   run:
@@ -48,59 +28,67 @@ var_5: &setup_bazel_remote_execution
     command: openssl aes-256-cbc -d -in .circleci/gcp_token -k "$CI_REPO_NAME" -out /home/circleci/.gcp_credentials && echo "export GOOGLE_APPLICATION_CREDENTIALS=/home/circleci/.gcp_credentials" >> $BASH_ENV && sudo bash -c "cat .circleci/rbe-bazel.rc >> /etc/bazel.bazelrc"
 
 # Settings common to each job
-anchor_1: &job_defaults
+var_6: &job_defaults
   working_directory: ~/ng
   docker:
-    - image: *docker_image
+  - image: *default_docker_image
 
 # After checkout, rebase on top of master.
 # Similar to travis behavior, but not quite the same.
 # See https://discuss.circleci.com/t/1662
-anchor_2: &post_checkout
+var_7: &post_checkout
   post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
 
+var_8: &yarn_install
+  run:
+    name: Running Yarn install
+    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
+
 version: 2
 jobs:
   lint:
     <<: *job_defaults
     resource_class: xlarge
     steps:
-      - *define_env_vars
       - checkout:
           <<: *post_checkout
-      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
+      - *setup_circleci_bazel_config
+      - *yarn_install
 
-      # Check BUILD.bazel formatting before we have a node_modules directory
-      # Then we don't need any exclude pattern to avoid checking those files
       - run: 'yarn buildifier -mode=check ||
               (echo "BUILD files not formatted. Please run ''yarn buildifier''" ; exit 1)'
       # Run the skylark linter to check our Bazel rules
       - run: 'yarn skylint ||
               (echo -e "\n.bzl files have lint errors. Please run ''yarn skylint''"; exit 1)'
 
-      - restore_cache:
-          key: *cache_key
-
-      - run: yarn install --frozen-lockfile --non-interactive
       - run: ./node_modules/.bin/gulp lint
 
   test:
     <<: *job_defaults
     resource_class: xlarge
     steps:
-      - *define_env_vars
       - checkout:
           <<: *post_checkout
-      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
+      - *setup_circleci_bazel_config
+      - *yarn_install
 
-      - run: bazel info release
-      - run: bazel run @nodejs//:yarn
       # Setup remote execution and run RBE-compatible tests.
       - *setup_bazel_remote_execution
-      - run: bazel test //... --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only,-local
+      - run: yarn bazel test //... --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only,-local
       # Now run RBE incompatible tests locally.
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - run: bazel test //... --build_tag_filters=-ivy-only,local --test_tag_filters=-ivy-only,local
+      - run: yarn bazel test //... --build_tag_filters=-ivy-only,local --test_tag_filters=-ivy-only,local
 
       # CircleCI will allow us to go back and view/download these artifacts from past builds.
       # Also we can use a service like https://buildsize.org/ to automatically track binary size of these artifacts.
@@ -128,98 +116,97 @@ jobs:
             - "~/bazel_repository_cache"
 
   # Temporary job to test what will happen when we flip the Ivy flag to true
-  test_ivy_jit:
-    <<: *job_defaults
-    resource_class: xlarge
-    steps:
-      # don't run this job on the patch branch (to preserve resources)
-      - run: circleci step halt
-      - *define_env_vars
-      - checkout:
-          <<: *post_checkout
-      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-
-      - run: bazel run @yarn//:yarn
-      - *setup_bazel_remote_execution
-      - run: bazel test //... --define=compile=jit --build_tag_filters=ivy-jit --test_tag_filters=ivy-jit
-
   test_ivy_aot:
     <<: *job_defaults
     resource_class: xlarge
     steps:
-      # don't run this job on the patch branch (to preserve resources)
-      - run: circleci step halt
-      - *define_env_vars
-      - checkout:
-          <<: *post_checkout
-      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-
-      - run: bazel run @yarn//:yarn
-      - *setup_bazel_remote_execution
-      - run: bazel test //... --define=compile=aot --build_tag_filters=ivy-aot --test_tag_filters=ivy-aot
-
-  test_and_deploy_aio:
-    <<: *job_defaults
-    steps:
-      - *define_env_vars
       - checkout:
           <<: *post_checkout
       - restore_cache:
           key: *cache_key
+      - *define_env_vars
+      - *setup_circleci_bazel_config
+      - *yarn_install
+      - *setup_bazel_remote_execution
+
+      - run: yarn test-ivy-aot //...
+
+  test_aio:
+    <<: *job_defaults
+    docker:
+      # Needed because the AIO tests and the PWA score test depend on Chrome being available.
+      - image: *browsers_docker_image
+    steps:
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
         # Build aio
       - run: yarn --cwd aio build --progress=false
         # Lint the code
       - run: yarn --cwd aio lint
         # Run PWA-score tests
         # (Run before unit and e2e tests, which destroy the `dist/` directory.)
-      - run:
-          name: Run PWA-score tests
-          command: xvfb-run --auto-servernum yarn --cwd aio test-pwa-score-localhost $CI_AIO_MIN_PWA_SCORE
+      - run: yarn --cwd aio test-pwa-score-localhost $CI_AIO_MIN_PWA_SCORE
         # Check the bundle sizes.
         # (Run before unit and e2e tests, which destroy the `dist/` directory.)
       - run: yarn --cwd aio payload-size
         # Run unit tests
-      - run: xvfb-run --auto-servernum yarn --cwd aio test --watch=false
+      - run: yarn --cwd aio test --watch=false
         # Run e2e tests
-      - run: xvfb-run --auto-servernum yarn --cwd aio e2e
+      - run: yarn --cwd aio e2e
         # Run unit tests for Firebase redirects
       - run: yarn --cwd aio redirects-test
+
+  deploy_aio:
+    <<: *job_defaults
+    docker:
+    # Needed because before deploying the deploy-production script runs the PWA score tests.
+    - image: *browsers_docker_image
+    steps:
+      - checkout:
+          <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
+      - *define_env_vars
         # Deploy angular.io to production (if necessary)
-      - run: echo "export CI_STABLE_BRANCH=$(npm info @angular/core dist-tags.latest | sed -r 's/^\s*([0-9]+\.[0-9]+)\.[0-9]+.*$/\1.x/')" | tee -a $BASH_ENV
-      - run: xvfb-run --auto-servernum yarn --cwd aio deploy-production
+      - 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
 
   test_aio_local:
     <<: *job_defaults
+    docker:
+      # Needed because the AIO tests and the PWA score test depend on Chrome being available.
+      - image: *browsers_docker_image
     steps:
-      - *define_env_vars
       - checkout:
           <<: *post_checkout
-      - attach_workspace:
-          at: dist
       - 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:
-          name: Run PWA-score tests
-          command: xvfb-run --auto-servernum yarn --cwd aio test-pwa-score-localhost $CI_AIO_MIN_PWA_SCORE
+      - run: yarn --cwd aio test-pwa-score-localhost $CI_AIO_MIN_PWA_SCORE
         # Run unit tests
-      - run: xvfb-run --auto-servernum yarn --cwd aio test --watch=false
+      - run: yarn --cwd aio test --watch=false
         # Run e2e tests
-      - run: xvfb-run --auto-servernum yarn --cwd aio e2e
+      - run: yarn --cwd aio e2e
 
   test_aio_tools:
     <<: *job_defaults
     steps:
-      - *define_env_vars
       - checkout:
           <<: *post_checkout
-      - attach_workspace:
-          at: dist
       - 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
@@ -229,37 +216,43 @@ jobs:
 
   test_docs_examples_0:
     <<: *job_defaults
+    docker:
+      # Needed because the example e2e tests depend on Chrome.
+      - image: *browsers_docker_image
     steps:
-      - *define_env_vars
       - checkout:
           <<: *post_checkout
-      - attach_workspace:
-          at: dist
       - restore_cache:
           key: *cache_key
+      - attach_workspace:
+          at: dist
+      - *define_env_vars
         # Install root
-      - run: yarn install --frozen-lockfile --non-interactive
+      - *yarn_install
         # Install aio
       - run: yarn --cwd aio install --frozen-lockfile --non-interactive
         # Run examples tests
-      - run: xvfb-run --auto-servernum yarn --cwd aio example-e2e --setup --local --shard=0/2
+      - run: yarn --cwd aio example-e2e --setup --local --shard=0/2
 
   test_docs_examples_1:
     <<: *job_defaults
+    docker:
+      # Needed because the example e2e tests depend on Chrome.
+      - image: *browsers_docker_image
     steps:
-      - *define_env_vars
       - checkout:
           <<: *post_checkout
-      - attach_workspace:
-          at: dist
       - restore_cache:
           key: *cache_key
+      - attach_workspace:
+          at: dist
+      - *define_env_vars
         # Install root
-      - run: yarn install --frozen-lockfile --non-interactive
+      - *yarn_install
         # Install aio
       - run: yarn --cwd aio install --frozen-lockfile --non-interactive
         # Run examples tests
-      - run: xvfb-run --auto-servernum yarn --cwd aio example-e2e --setup --local --shard=1/2
+      - 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:
@@ -267,12 +260,12 @@ jobs:
     environment:
        AIO_SNAPSHOT_ARTIFACT_PATH: &aio_preview_artifact_path 'aio/tmp/snapshot.tgz'
     steps:
-      - *define_env_vars
       - checkout:
           <<: *post_checkout
       - restore_cache:
           key: *cache_key
-      - run: yarn install --frozen-lockfile --non-interactive
+      - *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
@@ -283,16 +276,19 @@ jobs:
   # This job should only be run on PR builds, where `CI_PULL_REQUEST` is not `false`.
   test_aio_preview:
     <<: *job_defaults
+    docker:
+      # Needed because the test-preview script runs e2e tests and the PWA score test with Chrome.
+      - image: *browsers_docker_image
     steps:
-      - *define_env_vars
       - 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: xvfb-run --auto-servernum node aio/scripts/test-preview.js $CI_PULL_REQUEST $CI_COMMIT $CI_AIO_MIN_PWA_SCORE
+          command: node aio/scripts/test-preview.js $CI_PULL_REQUEST $CI_COMMIT $CI_AIO_MIN_PWA_SCORE
 
   # This job exists only for backwards-compatibility with old scripts and tests
   # that rely on the pre-Bazel dist/packages-dist layout.
@@ -305,12 +301,15 @@ jobs:
     <<: *job_defaults
     resource_class: xlarge
     steps:
-      - *define_env_vars
       - checkout:
           <<: *post_checkout
-      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - run: bazel run @nodejs//:yarn
+      - 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
@@ -330,23 +329,30 @@ jobs:
   # See comments inside the integration/run_tests.sh script.
   integration_test:
     <<: *job_defaults
+    docker:
+      # Needed because the integration tests expect Chrome to be installed (e.g cli-hello-world)
+      - image: *browsers_docker_image
     # Note: we run Bazel in one of the integration tests, and it can consume >2G
     # of memory. Together with the system under test, this can exhaust the RAM
     # on a 4G worker so we use a larger machine here too.
     resource_class: xlarge
     steps:
-      - *define_env_vars
       - checkout:
           <<: *post_checkout
+      - restore_cache:
+          key: *cache_key
       - attach_workspace:
           at: dist
-      - run: xvfb-run --auto-servernum ./integration/run_tests.sh
+      - *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.
@@ -358,8 +364,6 @@ jobs:
               || "$CI_REPO_OWNER" != "angular"
               || "$CI_REPO_NAME" != "angular"
           ]] && circleci step halt || true'
-      - checkout:
-          <<: *post_checkout
       - attach_workspace:
           at: dist
       # CircleCI has a config setting to force SSH for all github connections
@@ -373,15 +377,23 @@ jobs:
 
   aio_monitoring:
     <<: *job_defaults
+    docker:
+      # This job needs Chrome to be globally installed because the tests run with Protractor
+      # which does not load the browser through the Bazel webtesting rules.
+      - image: *browsers_docker_image
     steps:
-      - *define_env_vars
       - checkout:
           <<: *post_checkout
       - restore_cache:
           key: *cache_key
+      - *define_env_vars
       - run:
           name: Run tests against the deployed apps
-          command: xvfb-run --auto-servernum ./aio/scripts/test-production.sh $CI_AIO_MIN_PWA_SCORE
+          command: ./aio/scripts/test-production.sh $CI_AIO_MIN_PWA_SCORE
+      - run:
+          name: Notify caretaker about failure
+          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
 
 workflows:
   version: 2
@@ -389,10 +401,12 @@ workflows:
     jobs:
       - lint
       - test
-      - test_ivy_jit
       - test_ivy_aot
       - build-packages-dist
-      - test_and_deploy_aio
+      - test_aio
+      - deploy_aio:
+          requires:
+            - test_aio
       - test_aio_local:
           requires:
             - build-packages-dist
@@ -424,9 +438,12 @@ workflows:
           requires:
             # Only publish if tests and integration tests pass
             - test
-            - test_ivy_jit
             - test_ivy_aot
             - integration_test
+            # Only publish if `aio`/`docs` tests using the locally built Angular packages pass
+            - test_aio_local
+            - 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-packages-dist

.circleci/env-helpers.inc.sh

@@ -0,0 +1,38 @@
+####################################################################################################
+# Helpers for defining environment variables for CircleCI.
+#
+# In CircleCI, each step runs in a new shell. The way to share ENV variables across steps is to
+# export them from `$BASH_ENV`, which is automatically sourced at the beginning of every step (for
+# the default `bash` shell).
+#
+# See also https://circleci.com/docs/2.0/env-vars/#using-bash_env-to-set-environment-variables.
+####################################################################################################
+
+# Set and print an environment variable.
+#
+# Use this function for setting environment variables that are public, i.e. it is OK for them to be
+# visible to anyone through the CI logs.
+#
+# Usage: `setPublicVar <name> <value>`
+function setPublicVar() {
+  setSecretVar $1 $2;
+  echo "$1=$2";
+}
+
+# Set (without printing) an environment variable.
+#
+# Use this function for setting environment variables that are secret, i.e. should not be visible to
+# everyone through the CI logs.
+#
+# Usage: `setSecretVar <name> <value>`
+function setSecretVar() {
+  # WARNING: Secrets (e.g. passwords, access tokens) should NOT be printed.
+  # (Keep original shell options to restore at the end.)
+  local -r originalShellOptions=$(set +o);
+  set +x -eu -o pipefail;
+
+  echo "export $1=\"${2:-}\";" >> $BASH_ENV;
+
+  # Restore original shell options.
+  eval "$originalShellOptions";
+}

.circleci/env.sh

@@ -0,0 +1,35 @@
+#!/usr/bin/env bash
+
+# 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;
+
+
+####################################################################################################
+# Define PUBLIC environment variables for CircleCI.
+####################################################################################################
+setPublicVar PROJECT_ROOT "$(pwd)";
+setPublicVar CI_AIO_MIN_PWA_SCORE "95";
+# This is the branch being built; e.g. `pull/12345` for PR builds.
+setPublicVar CI_BRANCH "$CIRCLE_BRANCH";
+setPublicVar CI_COMMIT "$CIRCLE_SHA1";
+# `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";
+
+
+####################################################################################################
+# Define SECRET environment variables for CircleCI.
+####################################################################################################
+setSecretVar CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN "$AIO_DEPLOY_TOKEN";
+setSecretVar CI_SECRET_PAYLOAD_FIREBASE_TOKEN "$ANGULAR_PAYLOAD_TOKEN";
+# 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.
+source $BASH_ENV;

.github/ISSUE_TEMPLATE.md

@@ -1,59 +1,10 @@
-<!--
-PLEASE HELP US PROCESS GITHUB ISSUES FASTER BY PROVIDING THE FOLLOWING INFORMATION.
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
 
-ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION.
--->
+Please help us process issues more efficiently by filing an
+issue using one of the following templates:
 
-## I'm submitting a...
-<!-- Check one of the following options with "x" -->
-<pre><code>
-[ ] Regression (a behavior that used to work and stopped working in a new release)
-[ ] Bug report  <!-- Please search GitHub for a similar issue or PR before submitting -->
-[ ] Performance issue
-[ ] Feature request
-[ ] Documentation issue or request
-[ ] Support request => Please do not submit support request here, instead see https://github.com/angular/angular/blob/master/CONTRIBUTING.md#question
-[ ] Other... Please describe:
-</code></pre>
+https://github.com/angular/angular/issues/new/choose
 
-## Current behavior
-<!-- Describe how the issue manifests. -->
+Thank you!
 
-
-## Expected behavior
-<!-- Describe what the desired behavior would be. -->
-
-
-## Minimal reproduction of the problem with instructions
-<!--
-For bug reports please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the problem via
-https://stackblitz.com or similar (you can use this template as a starting point: https://stackblitz.com/fork/angular-gitter).
--->
-
-## What is the motivation / use case for changing the behavior?
-<!-- Describe the motivation or the concrete use case. -->
-
-
-## Environment
-
-<pre><code>
-Angular version: X.Y.Z
-<!-- Check whether this is still an issue in the most recent Angular version -->
-
-Browser:
-- [ ] Chrome (desktop) version XX
-- [ ] Chrome (Android) version XX
-- [ ] Chrome (iOS) version XX
-- [ ] Firefox version XX
-- [ ] Safari (desktop) version XX
-- [ ] Safari (iOS) version XX
-- [ ] IE version XX
-- [ ] Edge version XX
- 
-For Tooling issues:
-- Node version: XX  <!-- run `node --version` -->
-- Platform:  <!-- Mac, Linux, Windows -->
-
-Others:
-<!-- Anything else relevant?  Operating system version, IDE, package manager, HTTP server, ... -->
-</code></pre>
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑

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

@@ -0,0 +1,63 @@
+---
+name: "\U0001F41EBug report"
+about: Report a bug in the Angular Framework
+---
+<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
+
+Oh hi there! 😄 
+
+To expedite issue processing please search open and closed issues before submitting a new one.
+Existing issues often contain information about workarounds, resolution, or progress updates.
+
+🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
+
+
+# 🐞 bug report
+
+### Affected Package
+<!-- Can you pin-point one or more @angular/* packages as the source of the bug? -->
+<!-- ✍️edit: --> The issue is caused by package @angular/....
+
+
+### Is this a regression?
+
+<!-- Did this behavior use to work in the previous version? -->
+<!-- ✍️--> Yes, the previous version in which this bug was not present was: ....
+
+
+### Description
+
+<!-- ✍️--> A clear and concise description of the problem...
+
+
+## 🔬 Minimal Reproduction
+<!--
+Please create and share minimal reproduction of the issue starting with this template: https://stackblitz.com/fork/angular-issue-repro2
+-->
+<!-- ✍️--> 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. Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.
+-->
+
+## 🔥 Exception or Error
+<pre><code>
+<!-- If the issue is accompanied by an exception or an error, please share it below: -->
+<!-- ✍️-->
+
+</code></pre>
+
+
+## 🌍  Your Environment
+
+**Angular Version:**
+<pre><code>
+<!-- run `ng version` and paste output below -->
+<!-- ✍️-->
+
+</code></pre>
+
+**Anything else relevant?**
+<!-- ✍️Is this a browser specific issue? If so, please specify the browser and version. -->
+
+<!-- ✍️Do any of these matter: operating system, IDE, package manager, HTTP server, ...? If so, please mention it below. -->

.github/ISSUE_TEMPLATE/2-feature-request.md

@@ -0,0 +1,32 @@
+---
+name: "\U0001F680Feature request"
+about: Suggest a feature for Angular Framework
+
+---
+<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
+
+Oh hi there! 😄 
+
+To expedite issue processing please search open and closed issues before submitting a new one.
+Existing issues often contain information about workarounds, resolution, or progress updates.
+
+🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
+
+
+# 🚀 feature request
+
+### Releavant Package
+<!-- Can you pin-point one or more @angular/* packages the are relevant for this feature request? -->
+<!-- ✍️edit: --> This feature request is for @angular/....
+
+
+### Description
+<!-- ✍️--> A clear and concise description of the problem or missing capability...
+
+
+### Describe the solution you'd like
+<!-- ✍️--> If you have a solution in mind, please describe it.
+
+
+### Describe alternatives you've considered
+<!-- ✍️--> Have you considered any alternative solutions or workarounds?

.github/ISSUE_TEMPLATE/3-docs-bug.md

@@ -0,0 +1,55 @@
+---
+name: "📚 Docs or angular.io issue report"
+about: Report an issue in Angular's documentation or angular.io application
+
+---
+<!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
+
+Oh hi there! 😄
+
+To expedite issue processing please search open and closed issues before submitting a new one.
+Existing issues often contain information about workarounds, resolution, or progress updates.
+
+🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
+
+# 📚 Docs or angular.io bug report
+
+### Description
+
+<!-- ✍️edit:--> A clear and concise description of the problem...
+
+
+## 🔬 Minimal Reproduction
+
+### What's the affected URL?**
+<!-- ✍️edit:--> https://angular.io/...
+
+### Reproduction Steps**
+<!-- If applicable please list the steps to take to reproduce the issue -->
+<!-- ✍️edit:-->
+
+### Expected vs Actual Behavior**
+<!-- If applicable please describe the difference between the expected and actual behavior after following the repro steps. -->
+<!-- ✍️edit:-->
+
+
+## 📷Screenshot
+<!-- Often a screenshot can help to capture the issue better than a long description. -->
+<!-- ✍️upload a screenshot:-->
+
+
+## 🔥 Exception or Error
+<pre><code>
+<!-- If the issue is accompanied by an exception or an error, please share it below: -->
+<!-- ✍️-->
+
+</code></pre>
+
+
+## 🌍  Your Environment
+
+### Browser info
+<!-- ✍️Is this a browser specific issue? If so, please specify the device, browser, and version. -->
+
+### Anything else relevant?
+<!-- ✍️Please provide additional info if necessary. -->

.github/ISSUE_TEMPLATE/4-security-issue-disclosure.md

@@ -0,0 +1,11 @@
+---
+name: ⚠️ Security issue disclosure
+about: Report a security issue in Angular Framework, Material, or CLI
+
+---
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+Please read https://angular.io/guide/security#report-issues on how to disclose security related issues.
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑

.github/ISSUE_TEMPLATE/5-support-request.md

@@ -0,0 +1,16 @@
+---
+name: "❓Support request"
+about: Questions and requests for support
+
+---
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+Please do not file questions or support requests on the GitHub issues tracker.
+
+You can get your questions answered using other communication channels. Please see: 
+https://github.com/angular/angular/blob/master/CONTRIBUTING.md#question
+
+Thank you!
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑

.github/ISSUE_TEMPLATE/6-angular-cli.md

@@ -0,0 +1,13 @@
+---
+name: "\U0001F6E0️Angular CLI"
+about: Issues and feature requests for Angular CLI
+
+---
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+Please file any Angular CLI issues at: https://github.com/angular/angular-cli/issues/new
+
+For the time being, we keep Angular CLI issues in a separate repository.
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑

.github/ISSUE_TEMPLATE/7-angular-material.md

@@ -0,0 +1,13 @@
+---
+name: "\U0001F48EAngular Material"
+about: Issues and feature requests for Angular Material
+
+---
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+Please file any Angular Material issues at: https://github.com/angular/material2/issues/new
+
+For the time being, we keep Angular Material issues in a separate repository.
+
+🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑

.github/angular-robot.yml

@@ -50,6 +50,7 @@ merge:
       - "**/BUILD.bazel"
       - "packages/**/integrationtest/**"
       - "packages/**/test/**"
+      - "packages/compiler-cli/src/ngcc/**"
 
   # comment that will be added to a PR when there is a conflict, leave empty or set to false to disable
   mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.

BUILD.bazel

@@ -8,13 +8,6 @@ exports_files([
     "protractor-perf.conf.js",
 ])
 
-# Developers should always run `bazel run :install`
-# This ensures that package.json in subdirectories get installed as well.
-alias(
-    name = "install",
-    actual = "@nodejs//:yarn",
-)
-
 filegroup(
     name = "web_test_bootstrap_scripts",
     # do not sort

CHANGELOG.md

@@ -1,3 +1,86 @@
+<a name="7.1.0-beta.2"></a>
+# [7.1.0-beta.2](https://github.com/angular/angular/compare/7.1.0-beta.1...7.1.0-beta.2) (2018-11-07)
+
+
+### Bug Fixes
+
+* **bazel:** unknown replay compiler error in windows ([#26711](https://github.com/angular/angular/issues/26711)) ([aed95fd](https://github.com/angular/angular/commit/aed95fd))
+* **core:** ensure that `ɵdefineNgModule` is available in flat-file formats ([#26403](https://github.com/angular/angular/issues/26403)) ([a64859b](https://github.com/angular/angular/commit/a64859b))
+* **router:** remove type bludgeoning of context and outlet when running CanDeactivate ([#26496](https://github.com/angular/angular/issues/26496)) ([496372d](https://github.com/angular/angular/commit/496372d)), closes [#18253](https://github.com/angular/angular/issues/18253)
+* **service-worker:** add typing to public api guard and fix lint errors ([#25860](https://github.com/angular/angular/issues/25860)) ([1061875](https://github.com/angular/angular/commit/1061875))
+* **upgrade:** improve downgrading-related error messages ([#26217](https://github.com/angular/angular/issues/26217)) ([7dbc103](https://github.com/angular/angular/commit/7dbc103))
+* **upgrade:** make typings compatible with older AngularJS typings ([#26880](https://github.com/angular/angular/issues/26880)) ([64647af](https://github.com/angular/angular/commit/64647af)), closes [#26420](https://github.com/angular/angular/issues/26420)
+
+
+### Features
+
+* **compiler:** ability to mark an InvokeFunctionExpr as pure ([#26860](https://github.com/angular/angular/issues/26860)) ([4dfa71f](https://github.com/angular/angular/commit/4dfa71f))
+* **forms:** add updateOn option to FormBuilder ([#24599](https://github.com/angular/angular/issues/24599)) ([e9e804f](https://github.com/angular/angular/commit/e9e804f))
+* **router:** allow guards to return UrlTree as well as boolean ([#26521](https://github.com/angular/angular/issues/26521)) ([081f95c](https://github.com/angular/angular/commit/081f95c))
+* **router:** allow redirect from guards by returning UrlTree ([#26521](https://github.com/angular/angular/issues/26521)) ([152ca66](https://github.com/angular/angular/commit/152ca66))
+* **router:** guard returning UrlTree cancels current navigation and redirects ([#26521](https://github.com/angular/angular/issues/26521)) ([4e9f2e5](https://github.com/angular/angular/commit/4e9f2e5)), closes [#24618](https://github.com/angular/angular/issues/24618)
+* **service-worker:** add typing for messagesClicked in SwPush service ([#25860](https://github.com/angular/angular/issues/25860)) ([c78c221](https://github.com/angular/angular/commit/c78c221))
+* **service-worker:** close notifications and focus window on click ([#25860](https://github.com/angular/angular/issues/25860)) ([f5d5a3d](https://github.com/angular/angular/commit/f5d5a3d))
+* **service-worker:** handle 'notificationclick' events ([#25860](https://github.com/angular/angular/issues/25860)) ([cf6ea28](https://github.com/angular/angular/commit/cf6ea28)), closes [#20956](https://github.com/angular/angular/issues/20956) [#22311](https://github.com/angular/angular/issues/22311)
+* **upgrade:** support downgrading multiple modules ([#26217](https://github.com/angular/angular/issues/26217)) ([93837e9](https://github.com/angular/angular/commit/93837e9)), closes [#26062](https://github.com/angular/angular/issues/26062)
+
+
+
+<a name="7.0.3"></a>
+## [7.0.3](https://github.com/angular/angular/compare/7.0.2...7.0.3) (2018-11-07)
+
+
+### Bug Fixes
+
+* **bazel:** unknown replay compiler error in windows ([#26711](https://github.com/angular/angular/issues/26711)) ([4d532df](https://github.com/angular/angular/commit/4d532df))
+* **router:** remove type bludgeoning of context and outlet when running CanDeactivate ([#26496](https://github.com/angular/angular/issues/26496)) ([dc05385](https://github.com/angular/angular/commit/dc05385)), closes [#18253](https://github.com/angular/angular/issues/18253)
+* **upgrade:** make typings compatible with older AngularJS typings ([#26880](https://github.com/angular/angular/issues/26880)) ([315d95c](https://github.com/angular/angular/commit/315d95c)), closes [#26420](https://github.com/angular/angular/issues/26420)
+
+
+
+<a name="7.1.0-beta.1"></a>
+# [7.1.0-beta.1](https://github.com/angular/angular/compare/7.1.0-beta.0...7.1.0-beta.1) (2018-10-31)
+
+
+### Bug Fixes
+
+* **compiler:** generate inputs with aliases properly ([#26774](https://github.com/angular/angular/issues/26774)) ([19fcfc3](https://github.com/angular/angular/commit/19fcfc3))
+* **compiler:** generate relative paths only in summary file errors ([#26759](https://github.com/angular/angular/issues/26759)) ([56f44be](https://github.com/angular/angular/commit/56f44be))
+* **core:** ignore comment nodes under unsafe elements ([#25879](https://github.com/angular/angular/issues/25879)) ([d5cbcef](https://github.com/angular/angular/commit/d5cbcef))
+* **core:** Remove static dependency from [@angular](https://github.com/angular)/core to [@angular](https://github.com/angular)/compiler ([#26734](https://github.com/angular/angular/issues/26734)) ([d042c4a](https://github.com/angular/angular/commit/d042c4a))
+* **core:** support computed base class in metadata inheritance ([#24014](https://github.com/angular/angular/issues/24014)) ([95743e3](https://github.com/angular/angular/commit/95743e3))
+
+
+
+<a name="7.0.2"></a>
+## [7.0.2](https://github.com/angular/angular/compare/7.0.1...7.0.2) (2018-10-31)
+
+
+### Bug Fixes
+
+* **compiler:** generate relative paths only in summary file errors ([#26759](https://github.com/angular/angular/issues/26759)) ([c01f340](https://github.com/angular/angular/commit/c01f340))
+* **core:** Remove static dependency from [@angular](https://github.com/angular)/core to [@angular](https://github.com/angular)/compiler ([#26734](https://github.com/angular/angular/issues/26734)) ([#26879](https://github.com/angular/angular/issues/26879)) ([257ac83](https://github.com/angular/angular/commit/257ac83))
+* **core:** support computed base class in metadata inheritance ([#24014](https://github.com/angular/angular/issues/24014)) ([b3c6409](https://github.com/angular/angular/commit/b3c6409))
+
+
+
+<a name="7.1.0-beta.0"></a>
+# [7.1.0-beta.0](https://github.com/angular/angular/compare/7.0.0-rc.1...7.1.0-beta.0) (2018-10-24)
+
+
+### Bug Fixes
+* **core:** allow null value for renderer setElement(…) ([#17065](https://github.com/angular/angular/issues/17065)) ([ff15043](https://github.com/angular/angular/commit/ff15043)), closes [#13686](https://github.com/angular/angular/issues/13686)
+* **router:** fix regression where navigateByUrl promise didn't resolve on CanLoad failure ([#26455](https://github.com/angular/angular/issues/26455)) ([1c9b065](https://github.com/angular/angular/commit/1c9b065)), closes [#26284](https://github.com/angular/angular/issues/26284)
+* **service-worker:** clean up caches from old SW versions ([#26319](https://github.com/angular/angular/issues/26319)) ([2326b9c](https://github.com/angular/angular/commit/2326b9c))
+* **upgrade:** properly destroy upgraded component elements and descendants ([#26209](https://github.com/angular/angular/issues/26209)) ([071934e](https://github.com/angular/angular/commit/071934e)), closes [#26208](https://github.com/angular/angular/issues/26208)
+
+
+### Features
+
+* **router:** add prioritizedGuardValue operator optimization and allowing UrlTree return from guard ([#26478](https://github.com/angular/angular/issues/26478)) ([fdfedce](https://github.com/angular/angular/commit/fdfedce))
+
+
+
 <a name="7.0.1"></a>
 ## [7.0.1](https://github.com/angular/angular/compare/7.0.0...7.0.1) (2018-10-24)
 

WORKSPACE

@@ -6,6 +6,16 @@ load(
     "rules_angular_dev_dependencies",
 )
 
+# Uncomment for local bazel rules development
+#local_repository(
+#    name = "build_bazel_rules_nodejs",
+#    path = "../rules_nodejs",
+#)
+#local_repository(
+#    name = "build_bazel_rules_typescript",
+#    path = "../rules_typescript",
+#)
+
 # Angular Bazel users will call this function
 rules_angular_dependencies()
 # These are the dependencies only for us

aio/content/cli/index.md

@@ -34,6 +34,7 @@ ng serve
 </code-example>
 
 In your browser, open http://localhost:4200/ to see the new app run. 
+When you use the [ng serve](cli/serve) command to build an app and serve it locally, the server automatically rebuilds the app and reloads the page when you change any of the source files.
 
 ## Workspaces and project files
 
@@ -49,16 +50,15 @@ You can edit the generated files directly, or add to and modify them using CLI c
 Use the [ng generate](cli/generate) command to add new files for additional components and services, and code for new pipes, directives, and so on. 
 Commands such as [add](cli/add) and [generate](cli/generate), which create or operate on apps and libraries, must be executed from within a workspace or project folder.
 
-When you use the [ng serve](cli/serve) command to build an app and serve it locally, the server automatically rebuilds the app and reloads the page when you change any of the source files.
-
 * See more about the [Workspace file structure](guide/file-structure).
 
-When you use the [ng serve](cli/serve) command to build an app and serve it locally, the server automatically rebuilds the app and reloads the page when you change any of the source files.
+### Workspace and project configuration
 
 A single workspace configuration file, `angular.json`, is created at the top level of the workspace. 
-This is where you can set workspace-wide defaults, and specify configurations to use when the CLI builds a project for different targets.
+This is where you can set per-project defaults for CLI command options, and specify configurations to use when the CLI builds a project for different targets.
 
 The [ng config](cli/config) command lets you set and retrieve configuration values from the command line, or you can edit the `angular.json` file directly. 
+Note that option names in the configuration file must use [camelCase](guide/glossary#case-types), while option names supplied to commands can use either camelCase or dash-case. 
 
 * See the [complete schema](https://github.com/angular/angular-cli/wiki/angular-workspace) for `angular.json`.
 <!-- * Learn more about *configuration options for Angular(links to new guide or topics TBD)*. -->

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

@@ -13,6 +13,10 @@ describe('Elements', () => {
     browser.wait(EC.elementToBeClickable(elem), 5000);
     elem.click();
   };
+  const waitForText = (elem: ElementFinder) => {
+    // Waiting for the element to have some text, makes the tests less flaky.
+    browser.wait(async () => /\S/.test(await elem.getText()), 5000);
+  }
 
   beforeEach(() => browser.get(''));
 
@@ -33,6 +37,8 @@ describe('Elements', () => {
       messageInput.sendKeys('Angular rocks!');
 
       click(popupComponentButton);
+      waitForText(popupComponent);
+
       expect(popupComponent.getText()).toContain('Popup: Angular rocks!');
     });
 
@@ -62,6 +68,8 @@ describe('Elements', () => {
       messageInput.sendKeys('Angular rocks!');
 
       click(popupElementButton);
+      waitForText(popupElement);
+
       expect(popupElement.getText()).toContain('Popup: Angular rocks!');
     });
 

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

@@ -10,7 +10,7 @@ describe('Security E2E Tests', () => {
     expect(interpolated.getText())
         .toContain('Template <script>alert("0wned")</script> <b>Syntax</b>');
     let bound = element(By.className('e2e-inner-html-bound'));
-    expect(bound.getText()).toContain('Template alert("0wned") Syntax');
+    expect(bound.getText()).toContain('Template Syntax');
     let bold = element(By.css('.e2e-inner-html-bound b'));
     expect(bold.getText()).toContain('Syntax');
   });

aio/content/examples/toh-pt0/src/styles.1.css

@@ -12,7 +12,7 @@ h2, h3 {
 body {
   margin: 2em;
 }
-body, input[text], button {
+body, input[type="text"], button {
   color: #888;
   font-family: Cambria, Georgia;
 }

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

@@ -40,7 +40,7 @@ export class HeroService {
   // #enddocregion getHeroes-1
       .pipe(
         // #enddocregion getHeroes-2
-        tap(heroes => this.log('fetched heroes')),
+        tap(_ => this.log('fetched heroes')),
         // #docregion getHeroes-2
         catchError(this.handleError('getHeroes', []))
       );

aio/content/examples/upgrade-phonecat-1-typescript/e2e-spec.ts

@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node
 
-import { browser, element, by, ElementFinder } from 'protractor';
+import { browser, element, by, ElementArrayFinder, ElementFinder } from 'protractor';
 
 // Angular E2E Testing Guide:
 // https://docs.angularjs.org/guide/e2e-testing
@@ -20,6 +20,12 @@ describe('PhoneCat Application', function() {
 
   describe('View: Phone list', function() {
 
+    // Helpers
+    const waitForCount = (elems: ElementArrayFinder, count: number) => {
+      // Wait for the list to stabilize, which may take a while (e.g. due to animations).
+      browser.wait(() => elems.count().then(c => c === count), 5000);
+    };
+
     beforeEach(function() {
       browser.get('index.html#!/phones');
     });
@@ -28,13 +34,16 @@ describe('PhoneCat Application', function() {
       let phoneList = element.all(by.repeater('phone in $ctrl.phones'));
       let query = element(by.model('$ctrl.query'));
 
+      waitForCount(phoneList, 20);
       expect(phoneList.count()).toBe(20);
 
       query.sendKeys('nexus');
+      waitForCount(phoneList, 1);
       expect(phoneList.count()).toBe(1);
 
       query.clear();
       query.sendKeys('motorola');
+      waitForCount(phoneList, 8);
       expect(phoneList.count()).toBe(8);
     });
 
@@ -51,6 +60,7 @@ describe('PhoneCat Application', function() {
       }
 
       queryField.sendKeys('tablet');   // Let's narrow the dataset to make the assertions shorter
+      waitForCount(phoneNameColumn, 2);
 
       expect(getNames()).toEqual([
         'Motorola XOOM\u2122 with Wi-Fi',
@@ -66,10 +76,16 @@ describe('PhoneCat Application', function() {
     });
 
     it('should render phone specific links', function() {
+      let phoneList = element.all(by.repeater('phone in $ctrl.phones'));
       let query = element(by.model('$ctrl.query'));
-      query.sendKeys('nexus');
 
-      element.all(by.css('.phones li a')).first().click();
+      query.sendKeys('nexus');
+      waitForCount(phoneList, 1);
+
+      let nexusPhone = phoneList.first();
+      let detailLink = nexusPhone.all(by.css('a')).first()
+
+      detailLink.click();
       expect(browser.getLocationAbsUrl()).toBe('/phones/nexus-s');
     });
 

aio/content/guide/deployment.md

@@ -8,12 +8,12 @@ deployment.
 
 ## Simplest deployment possible
 
-For the simplest deployment, build for development and copy the output directory to a web server.
+For the simplest deployment, create a production build and copy the output directory to a web server.
 
-1. Start with the development build:
+1. Start with the production build:
 
   <code-example language="none" class="code-shell">
-    ng build
+    ng build --prod
   </code-example>
 
 
@@ -22,8 +22,7 @@ For the simplest deployment, build for development and copy the output directory
 3. Configure the server to redirect requests for missing files to `index.html`.
 Learn more about server-side redirects [below](#fallback).
 
-This is _not_ a production deployment. It's not optimized, and it won't be fast for users.
-It might be good enough for sharing your progress and ideas internally with managers, teammates, and other stakeholders. For the next steps in deployment, see [Optimize for production](#optimize).
+This is the simplest production-ready deployment of your application.
 
 {@a deploy-to-github}
 
@@ -97,51 +96,6 @@ There is no single configuration that works for every server.
 The following sections describe configurations for some of the most popular servers.
 The list is by no means exhaustive, but should provide you with a good starting point.
 
-#### Development servers
-
-During development, the [`ng serve`](cli/serve) CLI command lets you run your app in a local browser. 
-The CLI recompiles the application each time you save a file, 
-and reloads the browser with the newly compiled application. 
-
-The app is hosted in local memory and served on `http://localhost:4200/`, using [webpack-dev-server](https://webpack.js.org/guides/development/#webpack-dev-server).
-
-{@a serve-from-disk}
-
-Later in development, you might want a closer approximation of how your app will behave when deployed. 
-You can output your distribution folder (`dist`) to disk, but you need to install a different web server. 
-Try installing  [lite-server](https://github.com/johnpapa/lite-server); like `webpack-dev-server`, it can automatically reload your browser when you write new files.
-
-To get the live-reload experience, you will need to run two terminals. 
-The first runs the build in a watch mode and compiles the application to the `dist` folder. 
-The second runs the web server against the `dist` folder. 
-The combination of these two processes provides the same behavior as `ng serve`.
-
-1. Start the build in terminal A:
-<code-example language="none" class="code-shell">
-ng build --watch
-</code-example>
-
-1. Start the web server in terminal B:
-<code-example language="none" class="code-shell">
-lite-server --baseDir="dist"
-</code-example>
-The default browser opens to the appropriate URL.
-
-* [Lite-Server](https://github.com/johnpapa/lite-server): the default dev server installed with the
-[Quickstart repo](https://github.com/angular/quickstart) is pre-configured to fallback to `index.html`.
-
-* [Webpack-Dev-Server](https://github.com/webpack/webpack-dev-server):  setup the
-`historyApiFallback` entry in the dev server options as follows:
-
-  <code-example>
-    historyApiFallback: {
-      disableDotRule: true,
-      htmlAcceptHeaders: ['text/html', 'application/xhtml+xml']
-    }
-  </code-example>
-
-#### Production servers
-
 * [Apache](https://httpd.apache.org/): add a
 [rewrite rule](http://httpd.apache.org/docs/current/mod/mod_rewrite.html) to the `.htaccess` file as shown
   (https://ngmilk.rocks/2015/03/09/angularjs-html5-mode-or-pretty-urls-on-apache-using-htaccess/):
@@ -230,19 +184,9 @@ Read about how to enable CORS for specific servers at
 
 {@a optimize}
 
-## Optimize for production
+## Production optimizations
 
-Although deploying directly from the development environment works, 
-you can generate an optimized build with additional CLI command line flags,
-starting with `--prod`.
-
-### Build with _--prod_
-
-<code-example language="none" class="code-shell">
-  ng build --prod
-</code-example>
-
-The `--prod` _meta-flag_ engages the following optimization features.
+The `--prod` _meta-flag_ engages the following build optimization features.
 
 * [Ahead-of-Time (AOT) Compilation](guide/aot-compiler): pre-compiles Angular component templates.
 * [Production mode](#enable-prod-mode): deploys the production environment which enables _production mode_.
@@ -251,25 +195,22 @@ The `--prod` _meta-flag_ engages the following optimization features.
 * Uglification: rewrites code to use short, cryptic variable and function names.
 * Dead code elimination: removes unreferenced modules and much unused code.
 
-The remaining [copy deployment steps](#copy-files) are the same as before.
-
 See [`ng build`](cli/build) for more about CLI build options and what they do.
 
+
 {@a enable-prod-mode}
 
-### Enable production mode
+### Enable runtime production mode
 
-Angular apps run in development mode by default, as you can see by the following message on the browser
-console:
+In addition to build optimizations, Angular also has a runtime production mode. Angular apps run in development mode by default, as you can see by the following message on the browser console:
 
 <code-example format="nocode">
   Angular is running in the development mode. Call enableProdMode() to enable the production mode.
 </code-example>
 
-Switching to _production mode_ can make it run faster by disabling development specific checks such as the dual change detection cycles.
+Switching to _production mode_ makes it run faster by disabling development specific checks such as the dual change detection cycles.
 
-Building for production (or appending the `--environment=prod` flag) enables _production mode_
-Look at the CLI-generated `main.ts` to see how this works.
+When you enable production builds via `--prod` command line flag, the runtime production mode is enabled as well.
 
 {@a lazy-loading}
 

aio/content/guide/elements.md

@@ -107,7 +107,7 @@ The recently-developed [custom elements](https://developer.mozilla.org/en-US/doc
 </tr>
 <tr>
   <td>Firefox</td>
-  <td> Set the <code>dom.webcomponents.enabled</code> and <code>dom.webcomponents.customelements.enabled</code> preferences to true. Planned to be enabled by default in version 63.</td>
+  <td>Supported natively as of version 63. In older versions: Set the <code>dom.webcomponents.enabled</code> and <code>dom.webcomponents.customelements.enabled</code> preferences to true.</td>
 </tr>
 <tr>
   <td>Edge</td>

aio/content/guide/feature-modules.md

@@ -98,7 +98,7 @@ When the CLI generated the `CustomerDashboardComponent` for the feature module,
 </code-example>
 
 
-To see this HTML in the `AppComponent`, you first have to export the `CustomerDashboardComponent` in the `CustomerDashboardModule`. In `customer-dashboard.module.ts`, just beneath the `declarations` array, add an `exports` array containing `CustomerDashboardModule`:
+To see this HTML in the `AppComponent`, you first have to export the `CustomerDashboardComponent` in the `CustomerDashboardModule`. In `customer-dashboard.module.ts`, just beneath the `declarations` array, add an `exports` array containing `CustomerDashboardComponent`:
 
 <code-example path="feature-modules/src/app/customer-dashboard/customer-dashboard.module.ts" region="component-exports" header="src/app/customer-dashboard/customer-dashboard.module.ts" linenums="false">
 </code-example>

aio/content/guide/file-structure.md

@@ -20,16 +20,15 @@ The top level of the workspace contains a number of workspace-wide configuration
 | :--------------------- | :------------------------------------------|
 | `.editorconfig`        | Configuration for code editors. See [EditorConfig](https://editorconfig.org/). |
 | `.gitignore`           | Specifies intentionally untracked files that [Git](https://git-scm.com/) should ignore. |
-| `angular.json`        | CLI configuration for all projects in the workspace, including configuration options for build, serve, and test tools that the CLI uses, such as [Karma](https://karma-runner.github.io/) and [Protractor](http://www.protractortest.org/).  |
+| `angular.json`         | CLI configuration defaults for all projects in the workspace, including configuration options for build, serve, and test tools that the CLI uses, such as [TSLint](https://palantir.github.io/tslint/), [Karma](https://karma-runner.github.io/), and [Protractor](http://www.protractortest.org/). For details, see [Angular Workspace Configuration](guide/workspace-config). |
 | `node_modules`         | Provides [npm packages](guide/npm-packages) to the entire workspace. |
-| `package.json`        | Lists package dependencies. See [npm documentation](https://docs.npmjs.com/files/package.json) for the specific format and contents of this file.|
-| `tsconfig.app.json`   | Default [TypeScript](https://www.typescriptlang.org/) configuration for apps in the workspace. |
-| `tsconfig.spec.json`  | Default TypeScript configuration for e2e test apps in the workspace. |
+| `package.json`         | Configures [npm package dependencies](guide/npm-packages) that are available to all projects in the workspace. See [npm documentation](https://docs.npmjs.com/files/package.json) for the specific format and contents of this file. |
+| `package-lock.json`    | Provides version information for all packages installed into `node_modules` by the npm client. See [npm documentation](https://docs.npmjs.com/files/package-lock.json) for details. If you use the yarn client, this file will be [yarn.lock](https://yarnpkg.com/lang/en/docs/yarn-lock/) instead. |
+| `tsconfig.json`        | Default [TypeScript](https://www.typescriptlang.org/) configuration for apps in the workspace, including TypeScript and Angular template compiler options. See [TypeScript Configuration](guide/typescript-configuration). |
 | `tslint.json`          | Default [TSLint](https://palantir.github.io/tslint/) configuration for apps in the workspace. |
 | `README.md`            | Introductory documentation. |
-| `package-lock.json`    | Provides version information for all packages installed into `node_modules` by the npm client. See [npm documentation](https://docs.npmjs.com/files/package-lock.json) for details. If you use the yarn client, this file will be [yarn.lock](https://yarnpkg.com/lang/en/docs/yarn-lock/) instead. |
 
-All projects within a workspace share this configuration context. 
+All projects within a workspace share a [CLI configuration context](guide/workspace-config). 
 Project-specific [TypeScript](https://www.typescriptlang.org/) configuration files inherit from the workspace-wide `tsconfig.*.json`, and app-specific [TSLint](https://palantir.github.io/tslint/) configuration files inherit from the workspace-wide `tslint.json`.
 
 ### Default app project files
@@ -40,9 +39,9 @@ This initial app is the *default app* for CLI commands (unless you change the de
 A newly generated app contains the source files for a root module, with a root component and template. 
 When the workspace file structure is in place, you can use the `ng generate` command on the command line to add functionality and data to the initial app.
 
-<div class="alert is-helpful>
+<div class="alert is-helpful">
 
- Besides using the CLI on the command line, You can also use an interactive development environment like [Angular Console](https://angular.console.com), or manipulate files directly in the app's source folder and configuration files.
+   Besides using the CLI on the command line, you can also use an interactive development environment like [Angular Console](https://angular.console.com), or manipulate files directly in the app's source folder and configuration files.
 
 </div>
 
@@ -104,18 +103,6 @@ my-app/
 
 Inside the `src/` folder, the `app/` folder contains your app's logic and data. Angular components, templates, and styles go here. An `assets/` subfolder contains images and anything else your app needs. Files at the top level of `src/` support testing and running your app.
 
-<code-example language="none" linenums="false">
-   src/
-    app/
-        app.component.css
-        app.component.html
-        app.component.spec.ts
-        app.component.ts
-        app.module.ts
-        assets/...
-    ...
-</code-example>
-
 | APP SOURCE FILES | PURPOSE |
 | :-------------------------- | :------------------------------------------|
 | `app/app.component.ts`      | Defines the logic for the app's root component, named `AppComponent`. The view associated with this root component becomes the root of the [view hierarchy](guide/glossary#view-hierarchy) as you add components and services to your app. |

aio/content/guide/i18n.md

@@ -672,7 +672,7 @@ format that Angular understands, such as `.xtb`.
 How you provide this information depends upon whether you compile with
 the JIT compiler or the AOT compiler.
 
-  * With [AOT](guide/i18n#merge-aot), you pass the information as a configuration
+  * With [AOT](guide/i18n#merge-aot), you pass the information as configuration settings.
   * With [JIT](guide/i18n#merge-jit), you provide the information at bootstrap time.
 
 

aio/content/guide/npm-packages.md

@@ -1,6 +1,6 @@
 # Workspace npm dependencies
 
-The Angular Framework, Angular CLI, and components used by Angular applicatins are packaged as [npm packages](https://docs.npmjs.com/getting-started/what-is-npm "What is npm?") and distributed via the [npm registry](https://docs.npmjs.com/).
+The Angular Framework, Angular CLI, and components used by Angular applications are packaged as [npm packages](https://docs.npmjs.com/getting-started/what-is-npm "What is npm?") and distributed via the [npm registry](https://docs.npmjs.com/).
 
 You can download and install these npm packages by using the [npm CLI client](https://docs.npmjs.com/cli/install), which is installed with and runs as a [Node.js®](https://nodejs.org "Nodejs.org") application. By default, the Angular CLI uses the npm client.
 

aio/content/guide/router.md

@@ -3066,11 +3066,13 @@ A guard's return value controls the router's behavior:
 
 * If it returns `true`, the navigation process continues.
 * If it returns `false`, the navigation process stops and the user stays put.
+* If it returns a `UrlTree`, the current navigation cancels and a new navigation is initiated to the `UrlTree` returned.
 
 
 <div class="alert is-helpful">
 
-**Note:** The guard can also tell the router to navigate elsewhere, effectively canceling the current navigation.
+**Note:** The guard can also tell the router to navigate elsewhere, effectively canceling the current navigation. When
+doing so inside a guard, the guard should return `false`;
 
 </div>
 

aio/content/guide/security.md

@@ -119,7 +119,7 @@ vulnerability. For example, code contained in a `<script>` tag is executed:
 
 
 Angular recognizes the value as unsafe and automatically sanitizes it, which removes the `<script>`
-tag but keeps safe content such as the text content of the `<script>` tag and the `<b>` element.
+tag but keeps safe content such as the `<b>` element.
 
 
 <figure>

aio/content/guide/upgrade-performance.md

@@ -281,22 +281,28 @@ The differences between `downgradeModule()` and `UpgradeModule` end here. The re
 `upgrade/static` APIs and concepts work in the exact same way for both types of hybrid apps.
 See [Upgrading from AngularJS](guide/upgrade) to learn about:
 
-- [Using Angular Components from AngularJS Code](guide/upgrade#using-angular-components-from-angularjs-code).
+- [Using Angular Components from AngularJS Code](guide/upgrade#using-angular-components-from-angularjs-code).<br />
+  _NOTE: If you are downgrading multiple modules, you need to specify the name of the downgraded
+  module each component belongs to, when calling `downgradeComponent()`._
 - [Using AngularJS Component Directives from Angular Code](guide/upgrade#using-angularjs-component-directives-from-angular-code).
 - [Projecting AngularJS Content into Angular Components](guide/upgrade#projecting-angularjs-content-into-angular-components).
 - [Transcluding Angular Content into AngularJS Component Directives](guide/upgrade#transcluding-angular-content-into-angularjs-component-directives).
 - [Making AngularJS Dependencies Injectable to Angular](guide/upgrade#making-angularjs-dependencies-injectable-to-angular).
-- [Making Angular Dependencies Injectable to AngularJS](guide/upgrade#making-angular-dependencies-injectable-to-angularjs).
+- [Making Angular Dependencies Injectable to AngularJS](guide/upgrade#making-angular-dependencies-injectable-to-angularjs).<br />
+  _NOTE: If you are downgrading multiple modules, you need to specify the name of the downgraded
+  module each injectable belongs to, when calling `downgradeInjectable()`._
 
 <div class="alert is-important">
 
   While it is possible to downgrade injectables, downgraded injectables will not be available until
-  the Angular module is instantiated. In order to be safe, you need to ensure that the downgraded
-  injectables are not used anywhere _outside_ the part of the app that is controlled by Angular.
+  the Angular module that provides them is instantiated. In order to be safe, you need to ensure
+  that the downgraded injectables are not used anywhere _outside_ the part of the app where it is
+  guaranteed that their module has been instantiated.
 
   For example, it is _OK_ to use a downgraded service in an upgraded component that is only used
-  from Angular components, but it is _not OK_ to use it in an AngularJS component that may be used
-  independently of Angular.
+  from a downgraded Angular component provided by the same Angular module as the injectable, but it
+  is _not OK_ to use it in an AngularJS component that may be used independently of Angular or use
+  it in a downgraded Angular component from a different module.
 
 </div>
 

aio/content/guide/workspace-config.md

@@ -0,0 +1,135 @@
+# Angular Workspace Configuration
+
+A file named `angular.json` at the root level of an Angular [workspace](guide/glossary#workspace) provides workspace-wide and project-specific configuration defaults for build and development tools provided by the Angular CLI. 
+Path values given in the configuration are relative to the root workspace folder. 
+
+## Overall JSON structure
+
+At the top level of `angular.json`, a few properties configure the workspace, and a `projects` section contains the remaining per-project configuration options. 
+
+* `version`: The configuration-file version.
+* `newProjectRoot`: Path where new projects are created. Absolute or relative to the workspace folder.
+* `defaultProject`: Default project name to use in commands, where not provided as an argument. When you use `ng new` to create a new app in a new workspace, that app is the default project for the workspace until you change it here.
+* `projects` : Contains a subsection for each project (library, app, e2e test app) in the workspace, with the per-project configuration options. 
+
+The initial app that you create with `ng new app_name` is listed under "projects", along with its corresponding end-to-end test app: 
+
+<code-example format="." language="none" linenums="false">
+projects
+  app_name
+    ...
+  app_name-e2e
+    ...
+</code-example>
+
+Each additional app that you create with `ng generate application` has a corresponding end-to-end test project, with its own configuration section.
+When you create a library project with `ng generate library`, the library project is also added to the `projects` section. 
+
+<div class="alert is-helpful">
+
+  Note that the `projects` section of the configuration file does not correspond exactly to the workspace file structure. 
+  * The initial app created by `ng new` is at the top level of the workspace file structure, along with its e2e app.
+  * Additional apps, e2e apps, and libraries go into a `projects` folder in the workspace.
+
+  For more information, see [Workspace and project file structure](guide/file-structure).
+
+</div>
+
+## Project configuration options
+
+The following top-level configuration properties are available for each project, under `projects:<project_name>`.
+
+<code-example format="." language="json" linenums="false">
+    "my-v7-app": {
+      "root": "",
+      "sourceRoot": "src",
+      "projectType": "application",
+      "prefix": "app",
+      "schematics": {},
+      "architect": {}
+    }
+</code-example>
+
+| PROPERTY | DESCRIPTION |
+| :-------------- | :---------------------------- |
+| `root`          | The root folder for this project's files, relative to the workspace folder. Empty for the initial app, which resides at the top level of the workspace. |
+| `sourceRoot`    | The root folder for this project's source files. |
+| `projectType`   | One of "application" or "library". An application can run independently in a browser, while a library cannot. Both an app and its e2e test app are of type "application".|
+| `prefix`        | A string that Angular prepends to generated selectors. Can be customized to identify an app or feature area. |
+| `schematics`    | An object containing schematics that customize CLI commands for this project. |
+| `architect`     | An object containing configuration defaults for Architect builder targets for this project. |
+
+## Project tool configuration options
+
+Architect is the tool that the CLI uses to perform complex tasks such as compilation and test running, according to provided configurations. The `architect` section contains a set of Architect *targets*. Many of the targets correspond to the CLI commands that run them. Some additional predefined targets can be run using the `ng run` command, and you can define your own targets.
+
+Each target object specifies the `builder` for that target, which is the npm package for the tool that Architect runs. In addition, each target has an `options` section that configure default options for the target, and a `configurations` section that names and specifies alternative configurations for the target. See the example in [Build target](#build-target) below. 
+
+<code-example format="." language="json" linenums="false">
+      "architect": {
+        "build": { },
+        "serve": { },
+        "e2e" : { },
+        "test": { },
+        "lint": { },
+        "extract-i18n": { },
+        "server": { },
+        "app-shell": { }
+      }
+</code-example>
+
+* The `architect/build` section configures defaults for options of the `ng build` command. See [Build target]{#build-target} below for more information.
+
+* The `architect/serve` section overrides build defaults and supplies additional serve defaults for the `ng serve` command.  In addition to the options available for the `ng build` command, it adds options related to serving the app.
+
+* The `architect/e2e` section overrides build-option defaults for building end-to-end testing apps using the `ng e2e` command.
+
+* The `architect/test` section overrides build-option defaults for test builds and supplies additional test-running defaults for the `ng test` command.
+
+* The `architect/lint` section configures defaults for options of the `ng lint` command, which performs code analysis on project source files.  The default linting tool for Angular is [TSLint](https://palantir.github.io/tslint/).
+
+* The `architect/extract-i18n` section configures defaults for options of the `ng-xi18n` tool used by the `ng xi18n` command, which extracts marked message strings from source code and outputs translation files.
+
+* The `architect/server` section configures defaults for creating a Universal app with server-side rendering, using the `ng run <project>:server` command. 
+
+* The `architect/app-shell` section configures defaults for creating an app shell for a progressive web app (PWA), using the `ng run <project>:app-shell` command.
+
+In general, the options for which you can configure defaults correspond to the command options listed in the [CLI reference page](cli) for each command. 
+Note that all options in the configuration file must use [camelCase](guide/glossary#case-conventions), rather than dash-case.
+
+{@a build-target}
+
+## Build target
+
+The `architect/build` section configures defaults for options of the `ng build` command. It has the following top-level properties.
+
+| PROPERTY | DESCRIPTION |
+| :-------------- | :---------------------------- |
+| `builder`       | The npm package for the build tool used to create this target. The default is `@angular-devkit/build-angular:browser`, which uses the [webpack](https://webpack.js.org/) package bundler. |
+| `options`       | This section contains defaults for build options, used when no named alternative configuration is specified. See [Default build options](#build-props) below. |
+| `configurations`| This section defines and names alternative configurations for different intended destinations. It contains a section for each named configuration, which sets the default options for that intended environment. See [Alternate build configurations](#build-configs) below. |
+
+{@a build-configs}
+
+### Alternate build configurations
+
+By default, a `production` configuration is defined, and the `ng build` command has `--prod` option that builds using this configuration. The `production` configuration sets defaults that optimize the app in a number of ways, such bundling files, minimizing excess whitespace, removing comments and dead code, and rewriting code to use short, cryptic names ("minification"). 
+
+You can define and name additional alternate configurations (such as `stage`, for instance) appropriate to your development process. Some examples of different build configurations are `stable`, `archive` and `next` used by AIO itself, and the individual locale-specific configurations required for building localized versions of an app. For details, see [Internationalization (i18n)](guide/i18n#merge-aot). 
+
+{@a build-props}
+
+### Additional build and test options
+
+The configurable options for a default or targeted build generally correspond to the options available for the [`ng build`](cli/build), [`ng serve`](cli/serve), and [`ng test`](cli/test) commands. For details of those options and their possible values, see the [CLI Reference](cli). 
+
+Some additional options (listed below) can only be set through the configuration file, either by direct editing or with the `ng config` command.
+
+| OPTIONS PROPERTIES | DESCRIPTION |
+| :------------------------- | :---------------------------- |
+| `fileReplacements`         | An object containing files and their compile-time replacements. |
+| `stylePreprocessorOptions` | An object containing option-value pairs to pass to style preprocessors. |
+| `assets`                   | An object containing paths to static assets to add to the global context of the project. The default paths point to the project's icon file and its `assets` folder. |
+| `styles`                   | An object containing style files to add to the global context of the project. Angular CLI supports CSS imports and all major CSS preprocessors: [sass/scss](http://sass-lang.com/), [less](http://lesscss.org/), and [stylus](http://stylus-lang.com/). |
+| `scripts`                  | An object containing JavaScript script files to add to the global context of the project. The scripts are loaded exactly as if you had added them in a `<script>` tag inside `index.html`. |
+| `budgets`                  | Default size-budget type and threshholds for all or parts of your app. You can configure the builder to report a warning or an error when the output reaches or exceeds a threshold size. See [Configure size budgets](guide/build#configure-size-budgets). (Not available in `test` section.) |

aio/content/marketing/resources.json

@@ -211,7 +211,7 @@
             "logo": "https://cloud.githubusercontent.com/assets/1016365/10639063/138338bc-7806-11e5-8057-d34c75f3cafc.png",
             "rev": true,
             "title": "Angular Universal",
-            "url": "https://github.com/angular/universal"
+            "url": "https://angular.io/guide/universal"
           },
           "c1": {
             "desc": "Lightweight development only Node.js® server",
@@ -273,6 +273,13 @@
             "rev": true,
             "title": "UI-jar - Test Driven Style Guide Development",
             "url": "https://github.com/ui-jar/ui-jar"
+          },
+          "protactor": {
+            "desc": "The official end to end testing framework for Angular apps",
+            "logo": "",
+            "rev": true,
+            "title": "Protractor",
+            "url": "https://protractor.angular.io/"
           }
         }
       },
@@ -362,7 +369,7 @@
             "logo": "",
             "rev": true,
             "title": "Angular Material",
-            "url": "https://github.com/angular/material2"
+            "url": "https://material.angular.io/"
           },
           "mcc": {
             "desc": "Material components made by the community",
@@ -377,6 +384,12 @@
             "title": "Ant Design of Angular (ng-zorro-antd)",
             "url": "https://ng.ant.design/docs/introduce/en"
           },
+          "ngzorromobile": {
+            "desc": "A set of enterprise-class mobile UI components based on Ant Design Mobile and Angular",
+            "rev": true,
+            "title": "Ant Design Mobile of Angular (ng-zorro-antd-mobile)",
+            "url": "http://ng.mobile.ant.design/#/docs/introduce/en"
+          },
           "aggrid": {
             "desc": "A datagrid for Angular with enterprise style features such as sorting, filtering, custom rendering, editing, grouping, aggregation and pivoting.",
             "rev": true,

aio/content/marketing/test.html

@@ -120,3 +120,20 @@ Try this <live-example></live-example>.
 <live-example embedded name="testy" stackblitz="super-stackblitz"></live-example>
 
 <p>More text follows ...</p>
+
+<p>Getting Started Widgets</p>
+
+<p>Interpolation</p>
+<aio-gs-interpolation></aio-gs-interpolation>
+
+<p>Property Binding</p>
+<aio-gs-property-binding></aio-gs-property-binding>
+
+<p>Event Binding</p>
+<aio-gs-event-binding></aio-gs-event-binding>
+
+<p>NgIf</p>
+<aio-gs-ng-if></aio-gs-ng-if>
+
+<p>NgFor</p>
+<aio-gs-ng-for></aio-gs-ng-for>

aio/content/navigation.json

@@ -513,8 +513,14 @@
         {
           "url": "guide/file-structure",
           "title": "Project File Structure",
-          "tooltip": "How your Angular workspace looks in your filesystem."
+          "tooltip": "How your Angular workspace looks on your filesystem."
         },
+        {
+          "url": "guide/workspace-config",
+          "title": "Workspace Configuration",
+          "tooltip": "The \"angular.json\" file contains workspace and project configuration defaults for Angular CLI commands."
+        },
+
         {
           "url": "guide/npm-packages",
           "title": "npm Dependencies",

aio/package.json

@@ -18,7 +18,7 @@
     "build-for": "yarn ~~build --configuration",
     "prebuild-local": "yarn setup-local",
     "build-local": "yarn ~~build --configuration=stable",
-    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js a2129510d7d57d1c02bec563872adf0204e11a2f",
+    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js b50950b97",
     "lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
     "test": "yarn check-env && ng test",
     "pree2e": "yarn check-env && yarn update-webdriver",
@@ -30,6 +30,8 @@
     "setup-local": "yarn aio-use-local && yarn example-use-local",
     "postsetup-local": "yarn postsetup",
     "set-opensearch-url": "node --eval \"const sh = require('shelljs'); sh.set('-e'); sh.sed('-i', /PLACEHOLDER_URL/g, process.argv[1], 'dist/assets/opensearch.xml');\"",
+    "presmoke-tests": "yarn update-webdriver",
+    "smoke-tests": "protractor tests/deployment/e2e/protractor.conf.js --suite smoke --baseUrl",
     "test-pwa-score": "node scripts/test-pwa-score",
     "test-pwa-score-localhost": "run-p --race \"~~http-server dist -p 4200 --silent\" \"test-pwa-score http://localhost:4200 {1} {2}\" --",
     "example-e2e": "yarn example-check-local && node ./tools/examples/run-example-e2e",
@@ -102,18 +104,18 @@
     "@types/jasminewd2": "^2.0.4",
     "@types/node": "~6.0.60",
     "archiver": "^1.3.0",
-    "canonical-path": "^0.0.2",
+    "canonical-path": "1.0.0",
     "chalk": "^2.1.0",
     "cjson": "^0.5.0",
     "codelyzer": "~4.2.1",
     "cross-spawn": "^5.1.0",
     "css-selector-parser": "^1.3.0",
     "dgeni": "^0.4.7",
-    "dgeni-packages": "^0.26.9",
+    "dgeni-packages": "^0.26.12",
     "entities": "^1.1.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jasmine": "^2.2.0",
-    "firebase-tools": "^3.2.1",
+    "firebase-tools": "^5.1.1",
     "fs-extra": "^2.1.2",
     "globby": "^6.1.0",
     "hast-util-is-element": "^1.0.0",

aio/scripts/_payload-limits.json

@@ -2,8 +2,8 @@
   "aio": {
     "master": {
       "uncompressed": {
-        "runtime": 3173,
-        "main": 494475,
+        "runtime": 3881,
+        "main": 499953,
         "polyfills": 53926,
         "prettify": 14917
       }

aio/scripts/build-artifacts.sh

@@ -13,7 +13,7 @@ readonly deployedUrl=https://pr${prNumber}-${prLastSha:0:7}.ngbuilds.io/
   cd $PROJECT_ROOT/aio
 
   # Build and store the app
-  yarn build
+  yarn build --progress=false
 
   # Set deployedUrl as parameter in the opensearch description
   # deployedUrl must end with /

aio/scripts/deploy-to-firebase.sh

@@ -93,7 +93,7 @@ fi
   cd "`dirname $0`/.."
 
   # Build the app
-  yarn build-for $deployEnv
+  yarn build-for $deployEnv --progress=false
 
   # Include any mode-specific files
   cp -rf src/extra-files/$deployEnv/. dist/
@@ -106,8 +106,8 @@ fi
   yarn payload-size
 
   # Deploy to Firebase
-  firebase use "$projectId" --token "$firebaseToken"
-  firebase deploy --message "Commit: $CI_COMMIT" --non-interactive --token "$firebaseToken"
+  yarn firebase use "$projectId" --token "$firebaseToken"
+  yarn firebase deploy --message "Commit: $CI_COMMIT" --non-interactive --token "$firebaseToken"
 
   # Run PWA-score tests
   yarn test-pwa-score "$deployedUrl" "$CI_AIO_MIN_PWA_SCORE"

aio/scripts/test-preview.js

@@ -45,8 +45,9 @@ get(previewabilityCheckUrl).
         const totalSecs = Math.round((previewCheckInterval * previewCheckAttempts) / 1000);
         throw new Error(`Preview still not available after ${totalSecs}s.`);
       }).
-      // The preview is now available. Run the PWA tests.
-      then(() => runPwaTests());
+      // The preview is now available. Run the tests.
+      then(() => yarnRun('smoke-tests', previewUrl)).
+      then(() => yarnRun('test-pwa-score', previewUrl, minPwaScore));
   }).
   catch(onError);
 
@@ -93,15 +94,6 @@ function reportNoPreview(reason) {
   console.log(`No (public) preview available. (Reason: ${reason})`);
 }
 
-function runPwaTests() {
-  return new Promise((resolve, reject) => {
-    const spawnOptions = {cwd: __dirname, stdio: 'inherit'};
-    spawn('yarn', ['test-pwa-score', previewUrl, minPwaScore], spawnOptions).
-      on('error', reject).
-      on('exit', code => (code === 0 ? resolve : reject)());
-  });
-}
-
 function validateArgs(args) {
   if (args.length !== 3) {
     const relativeScriptPath = relative('.', __filename.replace(/\.js$/, ''));
@@ -119,3 +111,12 @@ function wait(delay) {
   console.log(`Waiting ${delay}ms...`);
   return new Promise(resolve => setTimeout(resolve, delay));
 }
+
+function yarnRun(script, ...args) {
+  return new Promise((resolve, reject) => {
+    const spawnOptions = {cwd: __dirname, stdio: 'inherit'};
+    spawn('yarn', [script, ...args], spawnOptions).
+      on('error', reject).
+      on('exit', code => (code === 0 ? resolve : reject)());
+  });
+}

aio/scripts/test-production.sh

@@ -16,7 +16,7 @@ set +x -eu -o pipefail
 
   # Install dependencies.
   echo -e "\nInstalling dependencies in '$aioDir'...\n-----"
-  yarn install --frozen-lockfile
+  yarn install --frozen-lockfile --non-interactive
   yarn update-webdriver
 
   # Run checks for all URLs.

aio/src/app/custom-elements/element-registry.ts

@@ -48,6 +48,26 @@ export const ELEMENT_MODULE_PATHS_AS_ROUTES = [
     selector: 'live-example',
     loadChildren: './live-example/live-example.module#LiveExampleModule'
   },
+  {
+    selector: 'aio-gs-interpolation',
+    loadChildren: './getting-started/interpolation/interpolation.module#InterpolationModule'
+  },
+  {
+    selector: 'aio-gs-property-binding',
+    loadChildren: './getting-started/property-binding/property-binding.module#PropertyBindingModule'
+  },
+  {
+    selector: 'aio-gs-event-binding',
+    loadChildren: './getting-started/event-binding/event-binding.module#EventBindingModule'
+  },
+  {
+    selector: 'aio-gs-ng-if',
+    loadChildren: './getting-started/ng-if/ng-if.module#NgIfModule'
+  },
+  {
+    selector: 'aio-gs-ng-for',
+    loadChildren: './getting-started/ng-for/ng-for.module#NgForModule'
+  },
 ];
 
 /**

aio/src/app/custom-elements/getting-started/container/container.component.spec.ts

@@ -0,0 +1,39 @@
+import { Component } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ContainerComponent } from './container.component';
+
+@Component({
+  template: `
+    <aio-gs-container>
+      <ng-container class="template">Template</ng-container>
+      <ng-container class="data">Data</ng-container>
+      <ng-container class="result">Result</ng-container>
+    </aio-gs-container>
+  `
+})
+export class TestComponent {}
+
+describe('Getting Started Container Component', () => {
+  let fixture: ComponentFixture<ContainerComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ContainerComponent, TestComponent ]
+    });
+
+    fixture = TestBed.createComponent(TestComponent);
+    fixture.detectChanges();
+  });
+
+  it('should project the content into the appropriate areas', () => {
+    const compiled = fixture.debugElement.nativeElement;
+    const pre = compiled.querySelector('pre');
+    const code = compiled.querySelector('code');
+    const tabledata = compiled.querySelectorAll('td');
+
+    expect(pre.textContent).toContain('Template');
+    expect(code.textContent).toContain('Data');
+    expect(tabledata[2].textContent).toContain('Result');
+  });
+});

aio/src/app/custom-elements/getting-started/container/container.component.ts

@@ -0,0 +1,80 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'aio-gs-container',
+  template: `
+    <table>
+      <thead>
+        <tr>
+          <th>Template</th>
+          <th>Data</th>
+          <th>Result</th>
+        </tr>
+      </thead>
+      <tbody>
+        <tr>
+          <td>
+            <pre><ng-content select=".template"></ng-content></pre>
+          </td>
+          <td>
+            <code><ng-content select=".data"></ng-content></code>
+          </td>
+          <td><ng-content select=".result"></ng-content></td>
+        </tr>
+      </tbody>
+    </table>
+  `,
+  styles: [
+    `
+    pre {
+      margin: 0;
+    }
+
+    code {
+      display: flex;
+      align-items: center;
+    }
+
+    @media only screen and (max-width: 760px),
+    (min-device-width: 768px) and (max-device-width: 1024px)  {
+      /* Force table to not be like tables anymore */
+      table, thead, tbody, th, td, tr {
+        display: block;
+      }
+
+      /* Hide table headers (but not display: none;, for accessibility) */
+      thead tr {
+        position: absolute;
+        top: -9999px;
+        left: -9999px;
+      }
+
+      tr { border: 1px solid #ccc; }
+
+      td {
+        /* Behave  like a "row" */
+        border: none;
+        border-bottom: 1px solid #eee;
+        position: relative;
+        padding-top: 10%;
+      }
+
+      td:before {
+        /* Now like a table header */
+        position: absolute;
+        /* Top/left values mimic padding */
+        top: 6px;
+        left: 6px;
+        width: 45%;
+        padding-right: 10px;
+      }
+
+      /* Label the data */
+      td:nth-of-type(1):before { content: "Template"; }
+      td:nth-of-type(2):before { content: "Data"; }
+      td:nth-of-type(3):before { content: "Result"; }
+    }
+    `
+  ]
+})
+export class ContainerComponent { }

aio/src/app/custom-elements/getting-started/container/container.module.ts

@@ -0,0 +1,10 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { ContainerComponent } from './container.component';
+
+@NgModule({
+  imports: [ CommonModule ],
+  declarations: [ ContainerComponent ],
+  exports: [ ContainerComponent ]
+})
+export class ContainerModule { }

aio/src/app/custom-elements/getting-started/event-binding/event-binding.component.spec.ts

@@ -0,0 +1,46 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ContainerModule } from '../container/container.module';
+import { EventBindingComponent } from './event-binding.component';
+import { createCustomEvent } from '../../../../testing/dom-utils';
+
+describe('Getting Started Event Binding Component', () => {
+  let component: EventBindingComponent;
+  let fixture: ComponentFixture<EventBindingComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [ ContainerModule ],
+      declarations: [ EventBindingComponent ]
+    });
+
+    fixture = TestBed.createComponent(EventBindingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+
+    spyOn(window, 'alert');
+  });
+
+  it('should update the name property on input change', () => {
+    const text = 'Hello Angular';
+    const compiled = fixture.debugElement.nativeElement;
+    const input: HTMLInputElement = compiled.querySelector('input');
+
+
+    input.value = text;
+    input.dispatchEvent(createCustomEvent(document, 'input', ''));
+
+    fixture.detectChanges();
+
+    expect(component.name).toBe(text);
+  });
+
+  it('should display an alert when the button is clicked', () => {
+    const compiled = fixture.debugElement.nativeElement;
+    const button: HTMLButtonElement = compiled.querySelector('button');
+
+    button.click();
+
+    expect(window.alert).toHaveBeenCalledWith('Hello, Angular!');
+  });
+});

aio/src/app/custom-elements/getting-started/event-binding/event-binding.component.ts

@@ -0,0 +1,30 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'aio-gs-event-binding',
+  template: `
+    <aio-gs-container>
+      <ng-container class="template">&lt;button (click)="greet(name)"&gt;
+  Greet
+&lt;/button&gt;</ng-container>
+
+      <ng-container class="data">
+        name = '<input #input (input)="name = input.value" [value]="name">';
+      </ng-container>
+
+      <ng-container class="result">
+        <button (click)="greet(name)">
+          Greet
+        </button>
+      </ng-container>
+    </aio-gs-container>
+  `,
+  preserveWhitespaces: true
+})
+export class EventBindingComponent {
+  name = 'Angular';
+
+  greet(name: string) {
+    window.alert(`Hello, ${name}!`);
+  }
+}

aio/src/app/custom-elements/getting-started/event-binding/event-binding.module.ts

@@ -0,0 +1,15 @@
+import { NgModule, Type } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { WithCustomElementComponent } from '../../element-registry';
+import { EventBindingComponent } from './event-binding.component';
+import { ContainerModule } from '../container/container.module';
+
+@NgModule({
+  imports: [ CommonModule, ContainerModule ],
+  declarations: [ EventBindingComponent ],
+  exports: [ EventBindingComponent ],
+  entryComponents: [ EventBindingComponent ]
+})
+export class EventBindingModule implements WithCustomElementComponent {
+  customElementComponent: Type<any> = EventBindingComponent;
+}

aio/src/app/custom-elements/getting-started/interpolation/interpolation.component.spec.ts

@@ -0,0 +1,41 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { InterpolationComponent } from './interpolation.component';
+import { ContainerModule } from '../container/container.module';
+import { createCustomEvent } from '../../../../testing/dom-utils';
+
+describe('Getting Started Interpolation Component', () => {
+  let component: InterpolationComponent;
+  let fixture: ComponentFixture<InterpolationComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [ ContainerModule ],
+      declarations: [ InterpolationComponent ]
+    });
+
+    fixture = TestBed.createComponent(InterpolationComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should update the siteName property on input change', () => {
+    const text = 'Hello Angular';
+    const compiled = fixture.debugElement.nativeElement;
+    const input: HTMLInputElement = compiled.querySelector('input');
+
+    input.value = text;
+    input.dispatchEvent(createCustomEvent(document, 'input', ''));
+
+    fixture.detectChanges();
+
+    expect(component.siteName).toBe(text);
+  });
+
+  it('should display the siteName', () => {
+    const compiled = fixture.debugElement.nativeElement;
+    const header: HTMLHeadingElement = compiled.querySelector('h1');
+
+    expect(header.textContent).toContain('My Store');
+  });
+});

aio/src/app/custom-elements/getting-started/interpolation/interpolation.component.ts

@@ -0,0 +1,20 @@
+import { Component } from '@angular/core';
+
+
+@Component({
+  selector: 'aio-gs-interpolation',
+  template: `
+    <aio-gs-container>
+      <ng-container class="template">&lt;h1&gt;Welcome to {{'{'+'{'}}siteName{{'}'+'}'}}&lt;h1&gt;</ng-container>
+
+      <ng-container class="data">
+        siteName = '<input #input (input)="siteName = input.value" [value]="siteName">';
+      </ng-container>
+
+      <ng-container class="result"><h1>Welcome to {{ siteName }}</h1></ng-container>
+    </aio-gs-container>
+  `
+})
+export class InterpolationComponent {
+  siteName = 'My Store';
+}

aio/src/app/custom-elements/getting-started/interpolation/interpolation.module.ts

@@ -0,0 +1,15 @@
+import { NgModule, Type } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { WithCustomElementComponent } from '../../element-registry';
+import { InterpolationComponent } from './interpolation.component';
+import { ContainerModule } from '../container/container.module';
+
+@NgModule({
+  imports: [ CommonModule, ContainerModule ],
+  declarations: [ InterpolationComponent ],
+  exports: [ InterpolationComponent ],
+  entryComponents: [ InterpolationComponent ]
+})
+export class InterpolationModule implements WithCustomElementComponent {
+  customElementComponent: Type<any> = InterpolationComponent;
+}

aio/src/app/custom-elements/getting-started/ng-for/ng-for.component.spec.ts

@@ -0,0 +1,42 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NgForComponent } from './ng-for.component';
+import { ContainerModule } from '../container/container.module';
+import { ProductService } from '../product.service';
+
+describe('Getting Started NgFor Component', () => {
+  let component: NgForComponent;
+  let fixture: ComponentFixture<NgForComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [ ContainerModule ],
+      declarations: [ NgForComponent ],
+      providers: [ ProductService ]
+    });
+
+    fixture = TestBed.createComponent(NgForComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should display the products', () => {
+    const compiled = fixture.debugElement.nativeElement;
+    const spans = compiled.querySelectorAll('span');
+
+    expect(spans[0]!.textContent).toContain('Shoes');
+    expect(spans[1]!.textContent).toContain('Phones');
+  });
+
+  it('should display an error message if provided products JSON is invalid', () => {
+    fixture.detectChanges();
+
+    component.productsData$.next('bad');
+
+    fixture.detectChanges();
+
+    component.parseError$.subscribe(error => {
+      expect(error).toBeTruthy();
+    })
+  });
+});

aio/src/app/custom-elements/getting-started/ng-for/ng-for.component.ts

@@ -0,0 +1,46 @@
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Subscription } from 'rxjs';
+
+import { ProductService } from '../product.service';
+
+@Component({
+  selector: 'aio-gs-ng-for',
+  template: `
+    <aio-gs-container>
+      <ng-container class="template">&lt;span *ngFor="let product of products">
+  {{'{'+'{'}}product{{'}'+'}'}}
+&lt;/span&gt;</ng-container>
+
+      <ng-container class="data">
+        products = <input #input (input)="productsData$.next(input.value)" [value]="productsData$ | async">;
+        <div *ngIf="parseError$ | async" class="material-icons" matTooltip="The provided JSON is invalid">error_outline</div>
+      </ng-container>
+
+      <ng-container class="result">
+        <span *ngFor="let product of products$ | async">{{product}}</span>
+      </ng-container>
+    </aio-gs-container>
+  `,
+  styles: [`
+    span::after {
+      content: ' ';
+    }
+  `],
+  preserveWhitespaces: true
+})
+export class NgForComponent implements OnInit, OnDestroy {
+  productsData$ = this.productService.productsData$;
+  products$ = this.productService.products$;
+  parseError$ = this.productService.parseError$;
+  productsSub: Subscription;
+
+  constructor(private productService: ProductService) {}
+
+  ngOnInit() {
+    this.productsSub = this.productService.init().subscribe();
+  }
+
+  ngOnDestroy() {
+    this.productsSub.unsubscribe();
+  }
+}

aio/src/app/custom-elements/getting-started/ng-for/ng-for.module.ts

@@ -0,0 +1,18 @@
+import { NgModule, Type } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { WithCustomElementComponent } from '../../element-registry';
+import { NgForComponent } from './ng-for.component';
+import { ContainerModule } from '../container/container.module';
+import { ProductService } from '../product.service';
+
+@NgModule({
+  imports: [ CommonModule, ContainerModule, MatTooltipModule ],
+  declarations: [ NgForComponent ],
+  exports: [ NgForComponent ],
+  entryComponents: [ NgForComponent ],
+  providers: [ ProductService ]
+})
+export class NgForModule implements WithCustomElementComponent {
+  customElementComponent: Type<any> = NgForComponent;
+}

aio/src/app/custom-elements/getting-started/ng-if/ng-if.component.spec.ts

@@ -0,0 +1,51 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NgIfComponent } from './ng-if.component';
+import { ContainerModule } from '../container/container.module';
+import { ProductService } from '../product.service';
+
+describe('Getting Started NgIf Component', () => {
+  let component: NgIfComponent;
+  let fixture: ComponentFixture<NgIfComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [ ContainerModule ],
+      declarations: [ NgIfComponent ],
+      providers: [ ProductService ]
+    });
+
+    fixture = TestBed.createComponent(NgIfComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should display the message if products are listed', () => {
+    const compiled = fixture.debugElement.nativeElement;
+    const paragraph = compiled.querySelector('p');
+
+    expect(paragraph.textContent).toContain('available');
+  });
+
+  it('should not display the message if products list is empty', () => {
+    component.products$.next([]);
+    fixture.detectChanges();
+
+    const compiled = fixture.debugElement.nativeElement;
+    const paragraph = compiled.querySelector('p');
+
+    expect(paragraph).toBeFalsy();
+  });
+
+  it('should display an error message if provided products JSON is invalid', () => {
+    fixture.detectChanges();
+
+    component.productsData$.next('bad');
+
+    fixture.detectChanges();
+
+    component.parseError$.subscribe(error => {
+      expect(error).toBeTruthy();
+    })
+  });
+});

aio/src/app/custom-elements/getting-started/ng-if/ng-if.component.ts

@@ -0,0 +1,43 @@
+import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Subscription } from 'rxjs';
+
+import { ProductService } from '../product.service';
+
+@Component({
+  selector: 'aio-gs-ng-if',
+  template: `
+    <aio-gs-container>
+      <ng-container class="template">&lt;p *ngIf="products.length > 0"&gt;
+  We still have products available.
+&lt;/p&gt;</ng-container>
+
+      <ng-container class="data">
+        products = <input #input (input)="productsData$.next(input.value)" [value]="productsData$ | async">;
+        <div *ngIf="parseError$ | async" class="material-icons" matTooltip="The provided JSON is invalid">error_outline</div>
+      </ng-container>
+
+      <ng-container class="result">
+        <p *ngIf="(products$ | async)?.length > 0">
+          We still have products available.
+        </p>
+      </ng-container>
+    </aio-gs-container>
+  `,
+  preserveWhitespaces: true
+})
+export class NgIfComponent implements OnInit, OnDestroy {
+  productsData$ = this.productService.productsData$;
+  products$ = this.productService.products$;
+  parseError$ = this.productService.parseError$;
+  productsSub: Subscription;
+
+  constructor(private productService: ProductService) {}
+
+  ngOnInit() {
+    this.productsSub = this.productService.init().subscribe();
+  }
+
+  ngOnDestroy() {
+    this.productsSub.unsubscribe();
+  }
+}

aio/src/app/custom-elements/getting-started/ng-if/ng-if.module.ts

@@ -0,0 +1,18 @@
+import { NgModule, Type } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { MatTooltipModule } from '@angular/material/tooltip';
+import { WithCustomElementComponent } from '../../element-registry';
+import { NgIfComponent } from './ng-if.component';
+import { ContainerModule } from '../container/container.module';
+import { ProductService } from '../product.service';
+
+@NgModule({
+  imports: [ CommonModule, ContainerModule, MatTooltipModule ],
+  declarations: [ NgIfComponent ],
+  exports: [ NgIfComponent ],
+  entryComponents: [ NgIfComponent ],
+  providers: [ ProductService ]
+})
+export class NgIfModule implements WithCustomElementComponent {
+  customElementComponent: Type<any> = NgIfComponent;
+}

aio/src/app/custom-elements/getting-started/product.service.ts

@@ -0,0 +1,33 @@
+import { Injectable } from '@angular/core';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { tap, debounceTime } from 'rxjs/operators';
+
+export const PRODUCTS = ['Shoes', 'Phones'];
+
+@Injectable()
+export class ProductService  {
+  productsData$ = new BehaviorSubject(JSON.stringify(PRODUCTS));
+  products$ = new BehaviorSubject<string[]>(PRODUCTS);
+  parseError$ = new Subject<boolean>();
+
+  init() {
+    return this.productsData$.pipe(
+      debounceTime(250),
+      tap(data => {
+        let parsed;
+
+        try {
+          parsed = JSON.parse(data);
+        } catch (e) {
+          parsed = null;
+        }
+
+        if (parsed && Array.isArray(parsed)) {
+          this.products$.next(parsed);
+          this.parseError$.next(false);
+        } else {
+          this.parseError$.next(true);
+        }
+      }));
+  }
+}

aio/src/app/custom-elements/getting-started/property-binding/property-binding.component.spec.ts

@@ -0,0 +1,46 @@
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { PropertyBindingComponent } from './property-binding.component';
+import { ContainerModule } from '../container/container.module';
+import { createCustomEvent } from '../../../../testing/dom-utils';
+
+describe('Getting Started Property Binding Component', () => {
+  let component: PropertyBindingComponent;
+  let fixture: ComponentFixture<PropertyBindingComponent>;
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      imports: [ ContainerModule ],
+      declarations: [ PropertyBindingComponent ]
+    });
+
+    fixture = TestBed.createComponent(PropertyBindingComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should update the image title on input change', () => {
+    const text = 'Hello Angular';
+    const compiled = fixture.debugElement.nativeElement;
+    const input: HTMLInputElement = compiled.querySelector('input');
+
+    input.value = text;
+    input.dispatchEvent(createCustomEvent(document, 'input', ''));
+
+    fixture.detectChanges();
+
+    expect(component.imageTitle).toBe(text);
+  });
+
+  it('should display the image title', () => {
+    const compiled = fixture.debugElement.nativeElement;
+    const image: HTMLImageElement = compiled.querySelector('img');
+
+    expect(image.getAttribute('title')).toContain('Angular Logo');
+  });
+
+});

aio/src/app/custom-elements/getting-started/property-binding/property-binding.component.ts

@@ -0,0 +1,21 @@
+import { Component } from '@angular/core';
+
+@Component({
+  selector: 'aio-gs-property-binding',
+  template: `
+    <aio-gs-container>
+      <ng-container class="template">&lt;img ... [title]="imageTitle"&gt;</ng-container>
+
+      <ng-container class="data">
+        imageTitle = '<input #input (input)="imageTitle = input.value" [value]="imageTitle">';
+      </ng-container>
+
+      <ng-container class="result">
+        <img src="/assets/images/logos/angular/angular.svg" width="37" height="40" [title]="imageTitle">
+      </ng-container>
+    </aio-gs-container>
+  `
+})
+export class PropertyBindingComponent {
+  imageTitle = 'Angular Logo';
+}

aio/src/app/custom-elements/getting-started/property-binding/property-binding.module.ts

@@ -0,0 +1,15 @@
+import { NgModule, Type } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { WithCustomElementComponent } from '../../element-registry';
+import { PropertyBindingComponent } from './property-binding.component';
+import { ContainerModule } from '../container/container.module';
+
+@NgModule({
+  imports: [ CommonModule, ContainerModule ],
+  declarations: [ PropertyBindingComponent ],
+  exports: [ PropertyBindingComponent ],
+  entryComponents: [ PropertyBindingComponent ]
+})
+export class PropertyBindingModule implements WithCustomElementComponent {
+  customElementComponent: Type<any> = PropertyBindingComponent;
+}

aio/src/styles/0-base/_typography.scss

@@ -123,7 +123,7 @@ td {
   padding: 8px 30px;
   letter-spacing: 0.30px;
 
-  p {
+  p:first-child, p:last-child {
     margin: 0;
   }
 }

aio/src/styles/1-layouts/_api-pages.scss

@@ -1,46 +0,0 @@
-.api-body {
-
-    max-width: 1200px;
-
-    table {
-        margin: 12px 0 24px;
-
-        th {
-            text-transform: none;
-            font-size: 16px;
-            font-weight: bold;
-        }
-
-        tr {
-            border-bottom: 1px solid $lightgray;
-        }
-
-        td {
-            vertical-align: middle;
-        }
-
-        hr {
-            margin: 16px 0;
-        }
-
-        tr:last-child {
-            border-bottom: none;
-        }
-
-        &.item-table {
-            td {
-                padding: 32px;
-            }
-        }
-
-        &.list-table {
-            td {
-                padding: 16px 24px;
-            }
-        }
-
-        .short-description {
-            margin-left: 0;
-        }
-    }
-}

aio/src/styles/1-layouts/_layouts-dir.scss

@@ -2,7 +2,6 @@
    LAYOUT STYLES
    ============================== */
 
-@import 'api-pages';
 @import 'content-layout';
 @import 'doc-viewer';
 @import 'footer';

aio/src/styles/2-modules/_api-pages.scss

@@ -1,13 +1,111 @@
-.github-links {
-  float: right;
-  .material-icons {
-    border-radius: 4px;
-    padding: 4px;
-    font-size: 20px;
-    &:hover {
-      background-color: $mist;
+.api-body {
+  max-width: 1200px;
+
+  table {
+      margin: 12px 0 24px;
+
+      th {
+          text-transform: none;
+          font-size: 16px;
+          font-weight: bold;
+      }
+
+      tr {
+          border-bottom: 1px solid $lightgray;
+      }
+
+      td {
+          vertical-align: middle;
+      }
+
+      // This is overriding a style here:
+      // https://github.com/angular/angular/blob/95993e1/aio/src/styles/2-modules/_table.scss#L58-L62
+      tbody > tr > td tr td:first-child {
+        @media screen and (max-width: 480px) {
+          background-color: inherit;
         }
       }
+
+      hr {
+          margin: 16px 0;
+      }
+
+      tr:last-child {
+          border-bottom: none;
+      }
+
+      &.item-table {
+          td {
+              padding: 32px;
+          }
+      }
+
+      &.list-table {
+          td {
+              padding: 16px 24px;
+          }
+      }
+
+      .short-description {
+          margin-left: 0;
+      }
+
+      &.parameters-table {
+        margin-top: 0;
+        font-size: 14px;
+        box-shadow: none;
+
+        tr {
+          @media screen and (max-width: 480px) {
+            display: flex;
+            flex-direction: column;
+          }
+
+          td:first-child {
+            font-weight: 600;
+            padding-left: 16px;
+            width: 20%;
+          }
+        }
+
+        td {
+          padding: 8px 8px 8px 0;
+          border: 0;
+          vertical-align: top;
+        }
+      }
+  }
+
+  .class-overview {
+    position: relative;
+
+    code-example {
+        clear: left;
+    }
+  }
+
+  .short-description {
+    margin: 6px 0 0 10px;
+  }
+
+  .properties-table {
+    font-size: 14px;
+
+    thead th {
+      &:nth-child(1) {
+        width: 20%;
+      }
+      &:nth-child(2) {
+        width: 20%;
+      }
+    }
+  }
+}
+
+.breadcrumb-container {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
 }
 
 .api-header {
@@ -18,6 +116,22 @@
     flex-direction: column;
     align-items: flex-start;
   }
+
+  h1 {
+    margin-top: -4px;
+  }
+}
+
+.github-links {
+  float: right;
+  .material-icons {
+    border-radius: 4px;
+    padding: 4px;
+    font-size: 20px;
+    &:hover {
+      background-color: $mist;
+    }
+  }
 }
 
 .api-body {
@@ -65,10 +179,10 @@
     }
   }
 
+
   .api-heading {
     padding: 5px 0;
-    font-size: 16px;
-    font-weight: bold;
+    font-size: 14px;
   }
 
   .parameters-table {
@@ -80,21 +194,71 @@
   }
 
   details.overloads {
-    margin-left: -8px;
+    box-shadow: none;
+
+    .icon-action-header {
+      display: flex;
+      flex-direction: row;
+      align-items: center;
+      justify-content: space-between;
+
+      a {
+        display: flex;
+      }
+    }
+
+    .detail-contents {
+      padding: 0;
+      border: 1px solid $lightgray;
+      border-radius: 2px;
+      box-shadow: none;
+
+      > *:not(hr) {
+        margin: 16px 24px;
+      }
+    }
 
     summary {
       height: inherit;
-      padding: 8px 12px;
+      padding: 0;
+
       h4 {
         margin: 0;
         clear: left;
       }
+
+      .show-all {
+        display: initial;
+      }
+      .collapse-all {
+        display: none;
       }
     }
 
+    &[open] > summary {
+      .show-all {
+        display: none;
+      }
+      .collapse-all {
+        display: initial;
+      }
+    }
+  }
+
+  details.overload {
+    box-shadow: none;
+    margin: 0;
+  }
+
+
   .from-constructor, .read-only-property, .write-only-property {
+    font-size: 12px;
+    font-weight: 600;
+    letter-spacing: 0.5px;
     font-style: italic;
-    color: $blue;
+    background-color: $lightgray;
+    border-radius: 4px;
+    padding: 4px 6px;
   }
 
   .ngmodule-list {
@@ -120,10 +284,6 @@
       }
     }
   }
-
-  .member-name {
-    font-weight: bold;
-  }
 }
 
 .deprecated-api-item {

aio/src/styles/2-modules/_details.scss

@@ -25,14 +25,7 @@ summary {
     display: none; // Remove the built in details marker in webkit
   }
 
-  &::before {
-    content: '\E5CE'; // See https://material.io/icons/#ic_expand_less
-    font-family: 'Material Icons';
-    font-size: 24px;
-    -webkit-font-smoothing: antialiased;
-    @include rotate(0deg); // We will rotate 180 degrees when details is open
-    float: right;
-  }
+  overflow: hidden;
 }
 
 details {
@@ -42,7 +35,11 @@ details {
     padding: 16px 24px;
   }
 
-  &[open] > summary::before {
-    @include rotate(180deg); // Rotate the icon
+  // Rotate the icon
+  summary i.material-icons.expand {
+    @include rotate(0deg);
+  }
+  &[open] > summary i.material-icons.expand {
+    @include rotate(180deg);
   }
 }

aio/src/styles/2-modules/_hr.scss

@@ -3,12 +3,3 @@ hr {
     background: $lightgray;
     height: 1px;
 }
-
-.hr-margin {
-    display: block;
-    height: 1px;
-    border: 0;
-    margin-top: 16px;
-    margin-bottom: 16px;
-    padding: 0;
-}

aio/src/styles/2-modules/_modules-dir.scss

@@ -3,8 +3,8 @@
    ============================== */
 
    @import 'alert';
-   @import 'api-pages';
    @import 'api-list';
+   @import 'api-pages';
    @import 'buttons';
    @import 'callout';
    @import 'card';

aio/src/testing/dom-utils.ts

@@ -0,0 +1,16 @@
+/**
+ * Create a `CustomEvent` (even on browsers where `CustomEvent` is not a constructor).
+ */
+export function createCustomEvent(doc: Document, name: string, detail: any): CustomEvent {
+  const bubbles = false;
+  const cancelable = false;
+
+  // On IE9-11, `CustomEvent` is not a constructor.
+  if (typeof CustomEvent !== 'function') {
+    const event = doc.createEvent('CustomEvent');
+    event.initCustomEvent(name, bubbles, cancelable, detail);
+    return event;
+  }
+
+  return new CustomEvent(name, {bubbles, cancelable, detail});
+}

aio/tests/deployment/e2e/protractor.conf.js

@@ -3,9 +3,11 @@
 
 exports.config = {
   allScriptsTimeout: 11000,
-  specs: [
-    './*.e2e-spec.ts'
-  ],
+  suites: {
+    full: './*.e2e-spec.ts',
+    smoke: './smoke-tests.e2e-spec.ts',
+  },
+  suite: 'full',
   capabilities: {
     browserName: 'chrome',
     // For Travis

aio/tests/deployment/e2e/redirection.e2e-spec.ts

@@ -59,7 +59,9 @@ describe(browser.baseUrl, () => {
     it('should serve `index.html` for unknown pages', async () => {
       const aioShell = element(by.css('aio-shell'));
       const heading = aioShell.element(by.css('h1'));
+
       await page.goTo(unknownPagePath);
+      await browser.wait(() => page.getDocViewerText(), 5000);  // Wait for the document to be loaded.
 
       expect(aioShell.isPresent()).toBe(true);
       expect(heading.getText()).toMatch(/page not found/i);

aio/tests/deployment/e2e/smoke-tests.e2e-spec.ts

@@ -29,6 +29,8 @@ describe(browser.baseUrl, () => {
       Object.keys(textPerUrl).forEach(url => {
         it(`should show the page at '${url}'`, () => {
           page.goTo(url);
+          browser.wait(() => page.getDocViewerText(), 5000);  // Wait for the document to be loaded.
+
           expect(page.getDocViewerText()).toContain(textPerUrl[url]);
         });
       });
@@ -39,7 +41,7 @@ describe(browser.baseUrl, () => {
         api: 'api list',
         'guide/architecture': 'architecture',
         'guide/http': 'httpclient',
-        'guide/quickstart': 'quickstart',
+        'guide/quickstart': 'getting started',
         'guide/security': 'security',
         tutorial: 'tutorial',
       };
@@ -47,6 +49,8 @@ describe(browser.baseUrl, () => {
       Object.keys(textPerUrl).forEach(url => {
         it(`should show the page at '${url}'`, () => {
           page.goTo(url);
+          browser.wait(() => page.getDocViewerText(), 5000);  // Wait for the document to be loaded.
+
           expect(page.getDocViewerText()).toContain(textPerUrl[url]);
         });
       });
@@ -68,6 +72,8 @@ describe(browser.baseUrl, () => {
       Object.keys(textPerUrl).forEach(url => {
         it(`should show the page at '${url}'`, () => {
           page.goTo(url);
+          browser.wait(() => page.getDocViewerText(), 5000);  // Wait for the document to be loaded.
+
           expect(page.getDocViewerText()).toContain(textPerUrl[url]);
         });
       });

aio/tools/examples/shared/boilerplate/cli/package.json

@@ -12,15 +12,15 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~7.0.0-rc.0",
-    "@angular/common": "~7.0.0-rc.0",
-    "@angular/compiler": "~7.0.0-rc.0",
-    "@angular/core": "~7.0.0-rc.0",
-    "@angular/forms": "~7.0.0-rc.0",
-    "@angular/http": "~7.0.0-rc.0",
-    "@angular/platform-browser": "~7.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "~7.0.0-rc.0",
-    "@angular/router": "~7.0.0-rc.0",
+    "@angular/animations": "^7.0.0",
+    "@angular/common": "^7.0.0",
+    "@angular/compiler": "^7.0.0",
+    "@angular/core": "^7.0.0",
+    "@angular/forms": "^7.0.0",
+    "@angular/http": "^7.0.0",
+    "@angular/platform-browser": "^7.0.0",
+    "@angular/platform-browser-dynamic": "^7.0.0",
+    "@angular/router": "^7.0.0",
     "angular-in-memory-web-api": "^0.6.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.3.0",
@@ -28,10 +28,10 @@
     "zone.js": "~0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.9.0-rc.2",
-    "@angular/cli": "~7.0.0-rc.2",
-    "@angular/compiler-cli": "~7.0.0-rc.0",
-    "@angular/language-service": "~7.0.0-rc.0",
+    "@angular-devkit/build-angular": "^0.10.0",
+    "@angular/cli": "^7.0.0",
+    "@angular/compiler-cli": "^7.0.0",
+    "@angular/language-service": "^7.0.0",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",

aio/tools/examples/shared/boilerplate/i18n/package.json

@@ -15,15 +15,15 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~7.0.0-rc.0",
-    "@angular/common": "~7.0.0-rc.0",
-    "@angular/compiler": "~7.0.0-rc.0",
-    "@angular/core": "~7.0.0-rc.0",
-    "@angular/forms": "~7.0.0-rc.0",
-    "@angular/http": "~7.0.0-rc.0",
-    "@angular/platform-browser": "~7.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "~7.0.0-rc.0",
-    "@angular/router": "~7.0.0-rc.0",
+    "@angular/animations": "^7.0.0",
+    "@angular/common": "^7.0.0",
+    "@angular/compiler": "^7.0.0",
+    "@angular/core": "^7.0.0",
+    "@angular/forms": "^7.0.0",
+    "@angular/http": "^7.0.0",
+    "@angular/platform-browser": "^7.0.0",
+    "@angular/platform-browser-dynamic": "^7.0.0",
+    "@angular/router": "^7.0.0",
     "angular-in-memory-web-api": "^0.6.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.3.0",
@@ -31,10 +31,10 @@
     "zone.js": "~0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.9.0-rc.2",
-    "@angular/cli": "~7.0.0-rc.2",
-    "@angular/compiler-cli": "~7.0.0-rc.0",
-    "@angular/language-service": "~7.0.0-rc.0",
+    "@angular-devkit/build-angular": "^0.10.0",
+    "@angular/cli": "^7.0.0",
+    "@angular/compiler-cli": "^7.0.0",
+    "@angular/language-service": "^7.0.0",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",

aio/tools/examples/shared/boilerplate/universal/package.json

@@ -16,18 +16,18 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "~7.0.0-rc.0",
-    "@angular/common": "~7.0.0-rc.0",
-    "@angular/compiler": "~7.0.0-rc.0",
-    "@angular/core": "~7.0.0-rc.0",
-    "@angular/forms": "~7.0.0-rc.0",
-    "@angular/http": "~7.0.0-rc.0",
-    "@angular/platform-browser": "~7.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "~7.0.0-rc.0",
-    "@angular/router": "~7.0.0-rc.0",
-    "@nguniversal/common": "^6.1.0",
-    "@nguniversal/express-engine": "^6.1.0",
-    "@nguniversal/module-map-ngfactory-loader": "^6.1.0",
+    "@angular/animations": "^7.0.0",
+    "@angular/common": "^7.0.0",
+    "@angular/compiler": "^7.0.0",
+    "@angular/core": "^7.0.0",
+    "@angular/forms": "^7.0.0",
+    "@angular/http": "^7.0.0",
+    "@angular/platform-browser": "^7.0.0",
+    "@angular/platform-browser-dynamic": "^7.0.0",
+    "@angular/router": "^7.0.0",
+    "@nguniversal/common": "^7.0.0",
+    "@nguniversal/express-engine": "^7.0.0",
+    "@nguniversal/module-map-ngfactory-loader": "^7.0.0",
     "angular-in-memory-web-api": "^0.6.0",
     "core-js": "^2.5.4",
     "rxjs": "^6.3.0",
@@ -35,11 +35,11 @@
     "zone.js": "~0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.9.0-rc.2",
-    "@angular/cli": "~7.0.0-rc.2",
-    "@angular/compiler-cli": "~7.0.0-rc.0",
-    "@angular/language-service": "~7.0.0-rc.0",
-    "@angular/platform-server": "~7.0.0-rc.0",
+    "@angular-devkit/build-angular": "^0.10.0",
+    "@angular/cli": "^7.0.0",
+    "@angular/compiler-cli": "^7.0.0",
+    "@angular/language-service": "^7.0.0",
+    "@angular/platform-server": "^7.0.0",
     "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",

aio/tools/examples/shared/package.json

@@ -18,21 +18,21 @@
   "author": "",
   "license": "MIT",
   "dependencies": {
-    "@angular/animations": "~7.0.0-rc.0",
-    "@angular/common": "~7.0.0-rc.0",
-    "@angular/compiler": "~7.0.0-rc.0",
-    "@angular/core": "~7.0.0-rc.0",
-    "@angular/elements": "~7.0.0-rc.0",
-    "@angular/forms": "~7.0.0-rc.0",
-    "@angular/http": "~7.0.0-rc.0",
-    "@angular/platform-browser": "~7.0.0-rc.0",
-    "@angular/platform-browser-dynamic": "~7.0.0-rc.0",
-    "@angular/router": "~7.0.0-rc.0",
-    "@angular/service-worker": "~7.0.0-rc.0",
-    "@angular/upgrade": "~7.0.0-rc.0",
-    "@nguniversal/common": "^6.1.0",
-    "@nguniversal/express-engine": "^6.1.0",
-    "@nguniversal/module-map-ngfactory-loader": "^6.1.0",
+    "@angular/animations": "^7.0.0",
+    "@angular/common": "^7.0.0",
+    "@angular/compiler": "^7.0.0",
+    "@angular/core": "^7.0.0",
+    "@angular/elements": "^7.0.0",
+    "@angular/forms": "^7.0.0",
+    "@angular/http": "^7.0.0",
+    "@angular/platform-browser": "^7.0.0",
+    "@angular/platform-browser-dynamic": "^7.0.0",
+    "@angular/router": "^7.0.0",
+    "@angular/service-worker": "^7.0.0",
+    "@angular/upgrade": "^7.0.0",
+    "@nguniversal/common": "^7.0.0",
+    "@nguniversal/express-engine": "^7.0.0",
+    "@nguniversal/module-map-ngfactory-loader": "^7.0.0",
     "angular-in-memory-web-api": "^0.6.0",
     "core-js": "^2.5.4",
     "express": "^4.14.1",
@@ -42,11 +42,11 @@
     "zone.js": "~0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.9.0-rc.2",
-    "@angular/cli": "^7.0.0-rc.2",
-    "@angular/compiler-cli": "~7.0.0-rc.0",
-    "@angular/language-service": "~7.0.0-rc.0",
-    "@angular/platform-server": "~7.0.0-rc.0",
+    "@angular-devkit/build-angular": "^0.10.0",
+    "@angular/cli": "^7.0.0",
+    "@angular/compiler-cli": "^7.0.0",
+    "@angular/language-service": "^7.0.0",
+    "@angular/platform-server": "^7.0.0",
     "@types/angular": "^1.6.47",
     "@types/angular-animate": "^1.5.10",
     "@types/angular-mocks": "^1.6.0",
@@ -57,7 +57,7 @@
     "@types/jasminewd2": "^2.0.4",
     "@types/jquery": "^3.3.4",
     "@types/node": "~8.9.4",
-    "canonical-path": "0.0.2",
+    "canonical-path": "1.0.0",
     "concurrently": "^3.0.0",
     "http-server": "^0.9.0",
     "jasmine-core": "~2.99.1",

aio/tools/transforms/angular-base-package/post-processors/auto-link-code.js

@@ -30,7 +30,9 @@ module.exports = function autoLinkCode(getDocFromAlias) {
     return (ast) => {
       visit(ast, 'element', (node, ancestors) => {
         // Only interested in code elements that are not inside links
-        if (autoLinkCodeImpl.codeElements.some(elementType => is(node, elementType)) &&
+        if (autoLinkCodeImpl.codeElements.some(elementType =>
+            is(node, elementType)) &&
+            (!node.properties.className || node.properties.className.indexOf('no-auto-link') === -1) &&
             ancestors.every(ancestor => !is(ancestor, 'a'))) {
           visit(node, 'text', (node, ancestors) => {
             // Only interested in text nodes that are not inside links

aio/tools/transforms/angular-base-package/post-processors/auto-link-code.spec.js

@@ -109,4 +109,11 @@ describe('autoLinkCode post-processor', () => {
     processor.$process([doc]);
     expect(doc.renderedContent).toEqual('<code-example><a href="a/b/myclass" class="code-anchor">MyClass</a></code-example>');
   });
+
+  it('should ignore code blocks that are marked with a `no-auto-link` class', () => {
+    aliasMap.addDoc({ docType: 'class', id: 'MyClass', aliases: ['MyClass'], path: 'a/b/myclass' });
+    const doc = { docType: 'test-doc', renderedContent: '<code class="no-auto-link">MyClass</code>' };
+    processor.$process([doc]);
+    expect(doc.renderedContent).toEqual('<code class="no-auto-link">MyClass</code>');
+  });
 });

aio/tools/transforms/angular-base-package/processors/generateKeywords.js

@@ -47,40 +47,6 @@ module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
 
       var ignoreWordsMap = convertToMap(wordsToIgnore);
 
-      // If the heading contains a name starting with ng, e.g. "ngController", then add the
-      // name without the ng to the text, e.g. "controller".
-      function tokenize(text) {
-        const rawTokens = text.split(/[\s\/]+/mg);
-        const tokens = [];
-        rawTokens.forEach(token => {
-          // Strip off unwanted trivial characters
-          token = token
-              .trim()
-              .replace(/^[_\-"'`({[<$*)}\]>.]+/, '')
-              .replace(/[_\-"'`({[<$*)}\]>.]+$/, '');
-          // Ignore tokens that contain weird characters
-          if (/^[\w.\-]+$/.test(token)) {
-            tokens.push(token.toLowerCase());
-            const ngTokenMatch = /^[nN]g([A-Z]\w*)/.exec(token);
-            if (ngTokenMatch) {
-              tokens.push(ngTokenMatch[1].toLowerCase());
-            }
-          }
-        });
-        return tokens;
-      }
-
-      function extractWords(text, words, keywordMap) {
-        var tokens = tokenize(text);
-        tokens.forEach(function(token) {
-          if (!keywordMap[token]) {
-            words.push(token);
-            keywordMap[token] = true;
-          }
-        });
-      }
-
-
       const filteredDocs = docs
           // We are not interested in some docTypes
           .filter(function(doc) { return !docTypesToIgnore[doc.docType]; })
@@ -104,14 +70,10 @@ module.exports = function generateKeywordsProcessor(log, readFilesProcessor) {
           if (isString(value) && !propertiesToIgnore[key]) {
             extractWords(value, words, keywordMap);
           }
-
-          // Special case properties that contain content relating to "members"
-          // of a doc that represents, say, a class or interface
-          if (key === 'members' || key === 'statics') {
-            value.forEach(function(member) { extractWords(member.name, members, membersMap); });
-          }
         });
 
+        extractMemberWords(doc, members, membersMap);
+
         // Extract all the keywords from the headings
         if (doc.vFile && doc.vFile.headings) {
           Object.keys(doc.vFile.headings).forEach(function(headingTag) {
@@ -167,3 +129,53 @@ function convertToMap(collection) {
   collection.forEach(key => { obj[key] = true; });
   return obj;
 }
+
+// If the heading contains a name starting with ng, e.g. "ngController", then add the
+// name without the ng to the text, e.g. "controller".
+function tokenize(text) {
+  const rawTokens = text.split(/[\s\/]+/mg);
+  const tokens = [];
+  rawTokens.forEach(token => {
+    // Strip off unwanted trivial characters
+    token = token
+        .trim()
+        .replace(/^[_\-"'`({[<$*)}\]>.]+/, '')
+        .replace(/[_\-"'`({[<$*)}\]>.]+$/, '');
+    // Ignore tokens that contain weird characters
+    if (/^[\w.\-]+$/.test(token)) {
+      tokens.push(token.toLowerCase());
+      const ngTokenMatch = /^[nN]g([A-Z]\w*)/.exec(token);
+      if (ngTokenMatch) {
+        tokens.push(ngTokenMatch[1].toLowerCase());
+      }
+    }
+  });
+  return tokens;
+}
+
+function extractWords(text, words, keywordMap) {
+  var tokens = tokenize(text);
+  tokens.forEach(function(token) {
+    if (!keywordMap[token]) {
+      words.push(token);
+      keywordMap[token] = true;
+    }
+  });
+}
+
+function extractMemberWords(doc, members, membersMap) {
+  if (!doc) return;
+
+  if (doc.members) {
+    doc.members.forEach(member => extractWords(member.name, members, membersMap));
+  }
+  if (doc.statics) {
+    doc.statics.forEach(member => extractWords(member.name, members, membersMap));
+  }
+  if (doc.extendsClauses) {
+    doc.extendsClauses.forEach(clause => extractMemberWords(clause.doc, members, membersMap));
+  }
+  if (doc.implementsClauses) {
+    doc.implementsClauses.forEach(clause => extractMemberWords(clause.doc, members, membersMap));
+  }
+}

aio/tools/transforms/angular-base-package/processors/generateKeywords.spec.js

@@ -128,6 +128,46 @@ describe('generateKeywords processor', () => {
     );
   });
 
+  it('should add inherited member doc properties to the search terms', () => {
+    const processor = processorFactory(mockLogger, mockReadFilesProcessor);
+    const parentClass =       {
+      docType: 'class',
+      name: 'ParentClass',
+      members: [
+        { name: 'parentMember1' },
+      ],
+      statics: [
+        { name: 'parentMember2' },
+      ],
+    };
+    const parentInterface = {
+      docType: 'interface',
+      name: 'ParentInterface',
+      members: [
+        { name: 'parentMember3' },
+      ]
+    };
+
+    const childClass = {
+      docType: 'class',
+      name: 'Child',
+      members: [
+        { name: 'childMember1' }
+      ],
+      statics: [
+        { name: 'childMember2' }
+      ],
+      extendsClauses: [{ doc: parentClass }],
+      implementsClauses: [{ doc: parentInterface }]
+    };
+    const docs = [childClass, parentClass, parentInterface];
+    processor.$process(docs);
+    const keywordsDoc = docs[docs.length - 1];
+    expect(keywordsDoc.data[0].members.split(' ').sort().join(' ')).toEqual(
+      'childmember1 childmember2 parentmember1 parentmember2 parentmember3'
+    );
+  });
+
   it('should process terms prefixed with "ng" to include the term stripped of "ng"', () => {
     const processor = processorFactory(mockLogger, mockReadFilesProcessor);
     const docs = [

aio/tools/transforms/templates/api/base.template.html

@@ -2,7 +2,7 @@
 {% set comma = joiner(',') %}
 {% set breadcrumbDelimiter = joiner('>') %}
 <article>
-  {$ github.githubLinks(doc, versionInfo) $}
+  <div class="breadcrumb-container">
     <div class="breadcrumb">
       <script type="application/ld+json">
         {
@@ -16,6 +16,8 @@
       </script>
       {% for crumb in doc.breadCrumbs %}{% if not loop.last %} {$ breadcrumbDelimiter() $} {% if crumb.path %}<a href="{$ crumb.path $}">{$ crumb.text $}</a>{% else %}{$ crumb.text $}{% endif %}{% endif %}{% endfor %}
     </div>
+    {$ github.githubLinks(doc, versionInfo) $}
+  </div>
   {% block header %}
   <header class="api-header">
     <h1>{$ doc.name $}</h1>

aio/tools/transforms/templates/api/lib/memberHelpers.html

@@ -40,7 +40,7 @@
 {%- endmacro -%}
 
 {%- macro renderOverloadInfo(overload, cssClass, method) -%}
-
+<div class="overload-info">
   {% if overload.shortDescription and (overload.shortDescription != method.shortDescription) %}
   <div class="short-description">
     {$ overload.shortDescription | marked $}
@@ -53,17 +53,17 @@
     {$ ('**Deprecated** ' + overload.deprecated) | marked $}
   </div>{% endif %}
 
-<h4 class="no-anchor">Parameters</h4>
-{$ params.renderParameters(overload.parameterDocs, cssClass + '-parameters', cssClass + '-parameter') $}
+  <h6 class="no-anchor">Parameters</h6>
+  {$ params.renderParameters(overload.parameterDocs, cssClass + '-parameters', cssClass + '-parameter', true) $}
 
   {% if overload.type or overload.returns.type %}
-<h4 class="no-anchor">Returns</h4>
+  <h6 class="no-anchor">Returns</h6>
   {% marked %}`{$ (overload.type or overload.returns.type) $}`{% if overload.returns %}: {$ overload.returns.description $}{% endif %}{% endmarked %}
   {% endif %}
 
 
   {% if overload.throws.length %}
-<h4 class="no-anchor">Throws</h4>
+  <h6 class="no-anchor">Throws</h6>
   {% for error in overload.throws %}
   {% marked %}`{$ (error.typeList or 'Error') $}` {$ error.description $}{% endmarked %}
   {% endfor %}
@@ -74,6 +74,7 @@
     {$ overload.description | marked $}
   </div>
   {%- endif %}
+</div>
 {%- endmacro -%}
 
 {%- macro renderMethodDetail(versionInfo, method, cssClass) -%}
@@ -121,15 +122,25 @@
     <tr>
       <td>
         <details class="overloads">
-          <summary><h4 class="no-anchor">{$ method.overloads.length $} overloads...</h4></summary>
+          <summary>
+            <div class="icon-action-header">
+                <h4 class="no-anchor">{$ method.overloads.length $} overloads...</h4>
+                <a>
+                  <span class="show-all">Show All</span>
+                  <span class="collapse-all">Hide All</span>
+                  <i class="material-icons expand">expand_more</i>
+                </a>
+              </div>
+          </summary>
           <div class="detail-contents">
             {% if method.isAbstract %}
               {$ renderOverloadInfo(method, cssClass + '-overload', method) $}
               <hr class="hr-margin fullwidth">
             {% endif %}
             {% for overload in method.overloads %}
+              <h5 class="no-anchor">Overload #{$ loop.index $}</h5>
               {$ renderOverloadInfo(overload, cssClass + '-overload', method) $}
-                {% if not loop.last %}<hr class="hr-margin fullwidth">{% endif %}
+              {% if not loop.last %}<hr class="hr-margin">{% endif %}
             {% endfor %}
           </div>
         </details>
@@ -140,7 +151,7 @@
   {% if method.description -%}
     <tr>
       <td class="description">
-        {$ method.description | marked({ h3: 'h4' }) $}
+        {$ method.description | marked({ h3: 'h5' }) $}
       </td>
     </tr>
   {%- endif %}
@@ -148,7 +159,8 @@
   {% if method.usageNotes -%}
     <tr>
       <td class="usage-notes">
-        {$ method.usageNotes | marked({ h3: 'h4' }) $}
+        <h4 id="{$ method.anchor $}-usage-notes">Usage Notes</h4>
+        {$ method.usageNotes | marked({ h3: 'h5' }) $}
       </td>
     </tr>
   {%- endif %}

aio/tools/transforms/templates/api/lib/paramList.html

@@ -17,12 +17,14 @@
   <tbody>
   {% for parameter in parameters %}
     <tr class="{$ parameterClass $}">
-      <td class="param-name"><a id="{$ parameter.anchor $}"></a>{$ parameter.name $}</td>
-      {% if showType %}<td class="param-type"><code>{$ parameter.type $}</code></td>{% endif %}
+      <td class="param-name">
+        <a id="{$ parameter.anchor $}"></a>
+        <code>{$ parameter.name $}</code>
+      </td>
+      {% if showType %}<td class="param-type"><code>{% if r/^\{/.test(parameter.type) and r/\}$/.test(parameter.type) and parameter.type.length > 20 %}object{% else %}{$ parameter.type $}{% endif %}</code></td>{% endif %}
       <td class="param-description">
       {% marked %}
       {% if (parameter.shortDescription | trim) or (parameter.description | trim) %}{$ parameter.shortDescription + '\n\n' + parameter.description $}
-      {% elseif not showType and parameter.type %}<p>Type: <code>{$ parameter.type $}</code>.</p>
       {% endif %}
 
       {% if parameter.isOptional or parameter.defaultValue !== undefined %}Optional. Default is `{$ parameter.defaultValue === undefined and 'undefined' or parameter.defaultValue $}`.{% endif %}

aio/tools/transforms/templates/cli/cli-command.template.html

@@ -12,9 +12,14 @@
     {$ doc.shortDescription | marked $}
     {$ doc.description | marked $}
     {$ cli.renderSyntax(doc) $}
+
+    {% if doc.longDescription.length %}
+    <h2 class="no-anchor">Description</h2>
+    {$ doc.longDescription | marked $}
+    {% endif%}
+
     {$ cli.renderArguments(doc.positionalOptions, 2) $}
     {$ cli.renderNamedOptions(doc.namedOptions, 2) $}
     {$ cli.renderSubcommands(doc) $}
-    {$ doc.longDescription | marked $}
   </div>
 </article>

aio/tools/transforms/templates/cli/cli-container.template.html

@@ -17,8 +17,8 @@
   <tbody>
 {% for command in doc.commands %}
   <tr>
-    <td><a class="code-anchor" href="{$ command.path $}"><code>{$ command.name $}</code></a></td>
-    <td>{% for alias in command.commandAliases %}<code>{$ alias $} </code>{% endfor %}</td>
+    <td><a class="code-anchor" href="{$ command.path $}"><code class="no-auto-link">{$ command.name $}</code></a></td>
+    <td>{% for alias in command.commandAliases %}<code class="no-auto-link">{$ alias $} </code>{% endfor %}</td>
     <td>{$ command.description | marked $}</td>
   </tr>
 {% endfor %}

aio/tools/transforms/templates/cli/lib/cli.html

@@ -1,6 +1,6 @@
 {% macro renderSyntax(container, prefix) -%}
 {% for name in container.names %}
-<code-example hideCopy="true" class="no-box api-heading">ng {%if prefix %}{$ prefix $} {% endif %}<span class="cli-name">{$ name $}</span>
+<code-example hideCopy="true" class="no-box api-heading no-auto-link">ng {%if prefix %}{$ prefix $} {% endif %}<span class="cli-name">{$ name $}</span>
   {%- for arg in container.positionalOptions %} &lt;<var>{$ arg.name $}</var>&gt;{% endfor %}
   {%- if container.namedOptions.length %} [<var>options</var>]{% endif -%}
 </code-example>
@@ -20,14 +20,14 @@
   <tbody>
   {% for option in arguments %}
   <tr class="cli-option">
-    <td><code>&lt;<var>{$ option.name $}</var>&gt;</code></td>
+    <td><code class="no-auto-link">&lt;<var>{$ option.name $}</var>&gt;</code></td>
     <td>
       {$ option.description | marked $}
       {% if option.subcommands.length -%}
       <p>This option can take one of the following <a href="#{$ option.name $}-commands">sub-commands</a>:<p>
       <ul>
         {% for subcommand in option.subcommands %}
-        <li><code><a class="code-anchor" href="#{$ subcommand.name $}-command">{$ subcommand.name $}</a></code></li>
+        <li><code class="no-auto-link"><a class="code-anchor" href="#{$ subcommand.name $}-command">{$ subcommand.name $}</a></code></li>
         {% endfor %}
       </ul>
       {%- endif %}
@@ -53,11 +53,11 @@
   {% for option in options %}
     <tr class="cli-option">
       <td>
-        <code class="cli-option-syntax">{$ renderOption(option.name, option.type, option.default, option.enum) $}</code>
+        <code class="cli-option-syntax no-auto-link">{$ renderOption(option.name, option.type, option.default, option.enum) $}</code>
       </td>
       <td>
         {$ option.description | marked $}
-        {% if option.default !== undefined %}<p><span class="cli-default">Default:</span> <code>{$ option.default $}</code></p>{% endif %}
+        {% if option.default !== undefined %}<p><span class="cli-default">Default:</span> <code class="no-auto-link">{$ option.default $}</code></p>{% endif %}
         {% if option.aliases.length %}<p><span class="cli-aliases">Aliases:</span> {% for alias in option.aliases %}{$ renderOptionName(alias) $}{% if not loop.last %}, {% endif %}{% endfor %}</p>{% endif %}
       </td>
     </tr>
@@ -92,7 +92,7 @@
 {% for command in container.positionalOptions %}{% if command.subcommands.length %}
 <h2><a id="{$ command.name $}-commands"></a>{$ command.name | title $} commands</h2>
 {% for subcommand in command.subcommands %}
-<h3><code><a id="{$ subcommand.name $}-command"></a>{$ subcommand.name $}</code></h3>
+<h3><code class="no-auto-link"><a id="{$ subcommand.name $}-command"></a>{$ subcommand.name $}</code></h3>
 {% for name in container.names %}
 {$ renderSyntax(subcommand, name) $}
 {% endfor %}

docs/BAZEL.md

@@ -9,21 +9,14 @@ Bazel.
 
 ## Installation
 
-Install Bazel from the distribution, see [install] instructions.
-On Mac, just `brew install bazel`.
+In order to ensure that everyone builds Angular in a _consistent_ way, Bazel
+will be installed through NPM and therefore it's not necessary to install Bazel
+manually.
 
-Bazel will install a hermetic version of Node, npm, and Yarn when
-you run the first build.
+The binaries for Bazel will be provided by the [`@bazel/bazel`](https://github.com/bazelbuild/rules_nodejs/tree/master/packages)
+NPM package and its platform-specific dependencies.
 
-[install]: https://bazel.build/versions/master/docs/install.html
-
-### Installation of ibazel
-
-Install interactive bazel runner / fs watcher via:
-
-```
-yarn global add @bazel/ibazel
-```
+You can access Bazel with the `yarn bazel` command
 
 ## Configuration
 
@@ -33,12 +26,6 @@ use to execute build steps, from `build_bazel_rules_typescript`.
 The sources on [GitHub] are published from Google's internal
 repository (google3).
 
-That repository defines dependencies on specific versions of
-all the tools. You can run the tools Bazel installed, for
-example rather than `yarn install` (which depends on whatever
-version you have installed on your machine), you can
-`bazel run @nodejs//:yarn`.
-
 Bazel accepts a lot of options. We check in some options in the
 `.bazelrc` file. See the [bazelrc doc]. For example, if you don't
 want Bazel to create several symlinks in your project directory
@@ -50,8 +37,8 @@ want Bazel to create several symlinks in your project directory
 
 ## Building Angular
 
-- Build a package: `bazel build packages/core`
-- Build all packages: `bazel build packages/...`
+- Build a package: `yarn bazel build packages/core`
+- Build all packages: `yarn bazel build packages/...`
 
 You can use [ibazel] to get a "watch mode" that continuously
 keeps the outputs up-to-date as you save sources. Note this is
@@ -61,9 +48,9 @@ new as of May 2017 and not very stable yet.
 
 ## Testing Angular
 
-- Test package in node: `bazel test packages/core/test:test`
-- Test package in karma: `bazel test packages/core/test:test_web`
-- Test all packages: `bazel test packages/...`
+- Test package in node: `yarn bazel test packages/core/test:test`
+- Test package in karma: `yarn bazel test packages/core/test:test_web`
+- Test all packages: `yarn bazel test packages/...`
 
 You can use [ibazel] to get a "watch mode" that continuously
 keeps the outputs up-to-date as you save sources.
@@ -72,19 +59,20 @@ keeps the outputs up-to-date as you save sources.
 
 If you're experiencing problems with seemingly unrelated tests failing, it may be because you're not using the proper flags with your Bazel test runs in Angular.
 
-See also: [`//.bazelrc`](https://github.com/angular/angular/blob/master/.bazelrc) where `--define=ivy=false` is defined as default.
+See also: [`//.bazelrc`](https://github.com/angular/angular/blob/master/.bazelrc) where `--define=compile=legacy` is defined as default.
 
 - `--config=debug`: build and launch in debug mode (see [debugging](#debugging) instructions below)
 - `--test_arg=--node_options=--inspect=9228`: change the inspector port.
-- `--define=compile=<option>` Controls if ivy or legacy mode is enabled. This is done by generating the [`src/ivy_switch.ts`](https://github.com/angular/angular/blob/master/packages/core/src/ivy_switch.ts) file from [`ivy_switch_legacy.ts`](https://github.com/angular/angular/blob/master/packages/core/src/ivy_switch_legacy.ts) (default), [`ivy_switch_jit.ts`](https://github.com/angular/angular/blob/master/packages/core/src/ivy_switch_jit.ts), or [`ivy_switch_local.ts`](https://github.com/angular/angular/blob/master/packages/core/src/ivy_switch_local.ts).
+- `--define=compile=<option>` Controls if ivy or legacy mode is enabled. This switches which compiler is used (ngc, ngtsc, or a tsc pass-through mode).
     - `legacy`: (default behavior) compile against View Engine, e.g. `--define=compile=legacy`
     - `jit`: Compile in ivy JIT mode, e.g. `--define=compile=jit`
-    - `local`: Compile in ivy AOT move, e.g. `--define=compile=local`
-- `--test_tag_filters=<tag>`: filter tests down to tags defined in the `tag` config
-of your rules in any given `BUILD.bazel`.
-    - `ivy-jit`: This flag should be set for tests that should be excuted with ivy JIT, e.g. `--test_tag_filters=ivy-jit`. For this, you may have to include `--define=compile=jit`.
-    - `ivy-local`: Only run tests that have to do with ivy AOT. For this, you may have to include `--define=compile=local`, e.g. `--test_tag_filters=ivy-local`..
-    - `ivy-only`: Only run ivy related tests, e.g. `--test_tag_filters=ivy-only`.
+    - `aot`: Compile in ivy AOT move, e.g. `--define=compile=aot`
+- `--test_tag_filters=<tag>`: filter tests down to tags defined in the `tag` config of your rules in any given `BUILD.bazel`.
+    - `no-ivy-aot`: Useful for excluding build and test targets that are not meant to be executed in Ivy AOT mode (`--define=compile=aot`).
+    - `no-ivy-jit`: Useful for excluding build and test targets that are not meant to be executed in Ivy JIT mode (`--define=compile=jit`).
+    - `ivy-only`: Useful for excluding all Ivy build and tests targets with `--define=compile=legacy`.
+    - `fixme-ivy-aot`: Useful for including/excluding build and test targets that are currently broken in Ivy AOT mode (`--define=compile=aot`).
+    - `fixme-ivy-jit`: Useful for including/excluding build and test targets that are currently broken in Ivy JIT mode (`--define=compile=jit`).
 
 
 ### Debugging a Node Test
@@ -92,7 +80,7 @@ of your rules in any given `BUILD.bazel`.
 
 - Open chrome at: [chrome://inspect](chrome://inspect)
 - Click on  `Open dedicated DevTools for Node` to launch a debugger.
-- Run test: `bazel test packages/core/test:test --config=debug`
+- Run test: `yarn bazel test packages/core/test:test --config=debug`
 
 The process should automatically connect to the debugger. For additional info and testing options, see the [nodejs_test documentation](https://bazelbuild.github.io/rules_nodejs/node/node.html#nodejs_test).
 
@@ -129,7 +117,7 @@ First time setup:
 
 **Setting breakpoints directly in your code files may not work in VSCode**. This is because the files you're actually debugging are built files that exist in a `./private/...` folder.
 The easiest way to debug a test for now is to add a `debugger` statement in the code
-and launch the bazel corresponding test (`bazel test <target> --config=debug`).
+and launch the bazel corresponding test (`yarn bazel test <target> --config=debug`).
 
 Bazel will wait on a connection. Go to the debug view (by clicking on the sidebar or
 Apple+Shift+D on Mac) and click on the green play icon next to the configuration name
@@ -137,7 +125,7 @@ Apple+Shift+D on Mac) and click on the green play icon next to the configuration
 
 ### Debugging a Karma Test
 
-- Run test: `bazel run packages/core/test:test_web`
+- Run test: `yarn bazel run packages/core/test:test_web`
 - Open chrome at: [http://localhost:9876/debug.html](http://localhost:9876/debug.html)
 - Open chrome inspector
 
@@ -150,7 +138,7 @@ open $(bazel info output_base)/external
 
 See subcommands that bazel executes (helpful for debugging):
 ```sh
-bazel build //packages/core:package -s
+yarn bazel build //packages/core:package -s
 ```
 
 To debug nodejs_binary executable paths uncomment `find . -name rollup 1>&2` (~ line 96) in
@@ -167,7 +155,7 @@ In our repo, here is how it's configured:
 1) In `tools/bazel_stamp_vars.sh` we run the `git` commands to generate our versioning info.
 1) In `.bazelrc` we register this script as the value for the `workspace_status_command` flag. Bazel will run the script when it needs to stamp a binary.
 
-Note that Bazel has a `--stamp` argument to `bazel build`, but this has no effect since our stamping takes place in Skylark rules. See https://github.com/bazelbuild/bazel/issues/1054
+Note that Bazel has a `--stamp` argument to `yarn bazel build`, but this has no effect since our stamping takes place in Skylark rules. See https://github.com/bazelbuild/bazel/issues/1054
 
 ## Remote cache
 
@@ -205,7 +193,7 @@ See [bazelbuild/intellij#246](https://github.com/bazelbuild/intellij/issues/246)
 If you see the following error:
 
 ```
-$ bazel build packages/...
+$ yarn bazel build packages/...
 ERROR: /private/var/tmp/[...]/external/local_config_cc/BUILD:50:5: in apple_cc_toolchain rule @local_config_cc//:cc-compiler-darwin_x86_64: Xcode version must be specified to use an Apple CROSSTOOL
 ERROR: Analysis of target '//packages/core/test/render3:render3' failed; build aborted: Analysis of target '@local_config_cc//:cc-compiler-darwin_x86_64' failed; build aborted
 ```
@@ -227,7 +215,7 @@ If VSCode is not the root cause, you might try:
 bazel clean --expunge
 sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
 sudo xcodebuild -license
-bazel build //packages/core    # Run a build outside VSCode to pre-build the xcode; then safe to run VSCode
+yarn bazel build //packages/core    # Run a build outside VSCode to pre-build the xcode; then safe to run VSCode
 ```
 
 Source: https://stackoverflow.com/questions/45276830/xcode-version-must-be-specified-to-use-an-apple-crosstool

integration/README.md

@@ -10,10 +10,11 @@ To test Angular CLI applications, we use the integration test `cli-hello-world`.
 When a significant change is released in the CLI, the application should be updated with `ng update`:
 
 ```bash
-$ cd integration
-$ ng update
-# ng build
-# ng test
+$ cd integration/cli-hello-world
+$ yarn install
+$ yarn ng update @angular/cli @angular-devkit/build-angular
+# yarn build
+# yarn test
 # typescript version
 ```
 
@@ -36,7 +37,7 @@ The API for each test is:
 
 This means that the test should be started by test script, like
 ```
-'scripts' { 'test': 'runProgramA && assertResultIsGood' }
+"scripts": {"test": "runProgramA && assertResultIsGood"}
 ```
 
 Note that the `package.json` file uses a special `file://../../dist` scheme

integration/_payload-limits.json

@@ -2,9 +2,9 @@
   "cli-hello-world": {
     "master": {
       "uncompressed": {
-        "runtime": 1110,
-        "main": 151765,
-        "polyfills": 59462
+        "runtime": 1497,
+        "main": 181839,
+        "polyfills": 59608
       }
     }
   },
@@ -12,32 +12,8 @@
     "master": {
       "uncompressed": {
         "bundle": "TODO(i): temporarily increase the payload size limit from 105779 - this is due to a closure issue related to ESM reexports that still needs to be investigated",
-        "bundle": 178101
-      }
-    }
-  },
-  "hello_world__render3__closure": {
-    "master": {
-      "uncompressed": {
-        "bundle": 8153
-      }
-    }
-  },
-  "hello_world__render3__rollup": {
-    "master": {
-      "uncompressed": {
-        "bundle": 10129
-      }
-    }
-  },
-  "hello_world__render3__cli": {
-    "master": {
-      "uncompressed": {
-        "inline": 1447,
-        "main": 40513,
-        "polyfills": 60105
+        "bundle": 177585
       }
     }
   }
 }
-

integration/bazel/package.json

@@ -5,6 +5,9 @@
   "license": "MIT",
   "dependencies": {
   },
+  "devDependencies": {
+    "@bazel/bazel": "file:../../node_modules/@bazel/bazel"
+  },
   "scripts": {
     "//": "deps are listed in src/package.json which is used by yarn_install",
     "//": "this package.json file is only here so that `yarn test` can be called by /integration/run_tests.sh",

integration/bazel/yarn.lock

@@ -2,3 +2,24 @@
 # yarn lockfile v1
 
 
+"@bazel/bazel-darwin_x64@0.18.0":
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.18.0.tgz#bab437605a702279d42f59caa4741bb327eb7dbc"
+  integrity sha512-um2OzgLL2Gd/W6joOpvrSTcqpnupliPNpwe/uE7sB0huBSJ/4Im0w2IlCTI6C7OfgMcbpUj4YxgUa9T6u6WY6w==
+
+"@bazel/bazel-linux_x64@0.18.0":
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.18.0.tgz#0c02b2404ec95c180e17615cc7079ee07df48a69"
+  integrity sha512-Rq8X8bL6SgQvbOHnfPhSgF6hp+f6Fbt2w6pRmBlFvV1J+CeUyrSrrRXfnnO1bjIuq05Ur3mV8ULA0qK6rtA5lQ==
+
+"@bazel/bazel-win32_x64@0.18.0":
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.18.0.tgz#aa4575fb00066dcf59a6d464971774dea6a0bafd"
+  integrity sha512-U2TbfK8B7dc3JqXSFwj2oXCQrxEaSzCCUkAHjAOIGOKzx/HLKIKs+NJj9IQkLLr7BsMU+Qqzo8aqo11E+Vs+aA==
+
+"@bazel/bazel@file:../../node_modules/@bazel/bazel":
+  version "0.18.0"
+  optionalDependencies:
+    "@bazel/bazel-darwin_x64" "0.18.0"
+    "@bazel/bazel-linux_x64" "0.18.0"
+    "@bazel/bazel-win32_x64" "0.18.0"

integration/cli-hello-world-ivy/.editorconfig

@@ -0,0 +1,13 @@
+# Editor configuration, see http://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

integration/cli-hello-world-ivy/.gitignore

@@ -0,0 +1 @@
+yarn.lock

integration/cli-hello-world-ivy/README.md

@@ -0,0 +1,27 @@
+# CliHelloWorld
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.6.6.
+
+## Development server
+
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive|pipe|service|class|guard|interface|enum|module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

integration/cli-hello-world-ivy/angular.json

@@ -0,0 +1,170 @@
+{
+  "$schema": "./node_modules/@angular-devkit/core/src/workspace/workspace-schema.json",
+  "version": 1,
+  "cli": {
+    "packageManager": "yarn"
+  },
+  "newProjectRoot": "projects",
+  "projects": {
+    "cli-hello-world": {
+      "root": "",
+      "projectType": "application",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist",
+            "index": "src/index.html",
+            "main": "src/main.ts",
+            "polyfills": "src/polyfills.ts",
+            "tsConfig": "src/tsconfig.app.json",
+            "assets": [
+              {
+                "glob": "assets",
+                "input": "/src",
+                "output": "/"
+              },
+              {
+                "glob": "favicon.ico",
+                "input": "/src",
+                "output": "/"
+              }
+            ],
+            "styles": [
+              {
+                "input": "src/styles.css"
+              }
+            ],
+            "scripts": []
+          },
+          "configurations": {
+            "dev": {
+              "fileReplacements": [
+                {
+                  "from": "src/environments/environment.ts",
+                  "to": "dist/environments/environment.ts"
+                }
+              ]
+            },
+            "production": {
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": true,
+              "extractCss": true,
+              "namedChunks": false,
+              "aot": true,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "fileReplacements": [
+                {
+                  "src": "src/environments/environment.ts",
+                  "replaceWith": "src/environments/environment.prod.ts"
+                }
+              ]
+            }
+          }
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "cli-hello-world:build"
+          },
+          "configurations": {
+            "dev": {
+              "browserTarget": "cli-hello-world:build:dev"
+            },
+            "production": {
+              "browserTarget": "cli-hello-world:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "cli-hello-world:build"
+          }
+        },
+        "test": {
+          "builder": "@angular-devkit/build-angular:karma",
+          "options": {
+            "main": "src/test.ts",
+            "polyfills": "src/polyfills.ts",
+            "karmaConfig": "./karma.conf.js",
+            "tsConfig": "src/tsconfig.spec.json",
+            "scripts": [],
+            "styles": [
+              {
+                "input": "src/styles.css"
+              }
+            ],
+            "assets": [
+              {
+                "glob": "assets",
+                "input": "/src",
+                "output": "/"
+              },
+              {
+                "glob": "favicon.ico",
+                "input": "/src",
+                "output": "/"
+              }
+            ]
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "src/tsconfig.app.json",
+              "src/tsconfig.spec.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    },
+    "cli-hello-world-e2e": {
+      "root": "",
+      "projectType": "application",
+      "cli": {},
+      "schematics": {},
+      "architect": {
+        "e2e": {
+          "builder": "@angular-devkit/build-angular:protractor",
+          "options": {
+            "protractorConfig": "./protractor.conf.js",
+            "devServerTarget": "cli-hello-world:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "cli-hello-world:serve:production"
+            }
+          }
+        },
+        "lint": {
+          "builder": "@angular-devkit/build-angular:tslint",
+          "options": {
+            "tsConfig": [
+              "e2e/tsconfig.e2e.json"
+            ],
+            "exclude": [
+              "**/node_modules/**"
+            ]
+          }
+        }
+      }
+    }
+  },
+  "schematics": {
+    "@schematics/angular:component": {
+      "prefix": "app",
+      "styleext": "css"
+    },
+    "@schematics/angular:directive": {
+      "prefix": "app"
+    }
+  }
+}

integration/cli-hello-world-ivy/e2e/app.e2e-spec.ts

@@ -0,0 +1,19 @@
+import { AppPage } from './app.po';
+
+describe('cli-hello-world App', () => {
+  let page: AppPage;
+
+  beforeEach(() => {
+    page = new AppPage();
+  });
+
+  it('should display welcome message', () => {
+    page.navigateTo();
+    expect(page.getParagraphText()).toEqual('Welcome to app!');
+  });
+
+  it('the percent pipe should work', () => {
+    page.navigateTo();
+    expect(page.getPipeContent()).toEqual('100 % awesome');
+  })
+});

integration/cli-hello-world-ivy/e2e/app.po.ts

@@ -0,0 +1,15 @@
+import { browser, by, element } from 'protractor';
+
+export class AppPage {
+  navigateTo() {
+    return browser.get('/');
+  }
+
+  getParagraphText() {
+    return element(by.css('app-root h1')).getText();
+  }
+
+  getPipeContent() {
+    return element(by.css('app-root p')).getText();
+  }
+}