release: cut the v7.0.0 release

PR Close #26514

.bazelignore

@@ -1,4 +0,0 @@
-node_modules
-dist
-aio/node_modules
-aio/tools/examples/shared/node_modules

.buildkite/Dockerfile

@@ -1,42 +0,0 @@
-# Heavily based on https://github.com/StefanScherer/dockerfiles-windows/ images.
-# Combines the node windowsservercore image with the Bazel Prerequisites (https://docs.bazel.build/versions/master/install-windows.html).
-# msys install taken from https://github.com/StefanScherer/dockerfiles-windows/issues/30
-# VS redist install taken from https://github.com/StefanScherer/dockerfiles-windows/blob/master/apache/Dockerfile
-# The nanoserver image won't work because MSYS2 does not run in it https://github.com/Alexpux/MSYS2-packages/issues/1493
-
-# Before building this image, you must locally build node-windows:10.13.0-windowsservercore-1803.
-# Clone https://github.com/StefanScherer/dockerfiles-windows/commit/4ce7101a766b9b880ac262479dd9126b64d656cf and build using
-# docker build -t node-windows:10.13.0-windowsservercore-1803 --build-arg core=microsoft/windowsservercore:1803 --build-arg target=microsoft/windowsservercore:1803 .
-FROM node-windows:10.13.0-windowsservercore-1803
-
-SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
-
-# Install 7zip to extract msys2
-RUN Invoke-WebRequest -UseBasicParsing 'https://www.7-zip.org/a/7z1805-x64.exe' -OutFile 7z.exe
-# For some reason the last letter in the destination directory is lost. So '/D=C:\\7zip0' will extract to '/D=C:\\7zip'.
-RUN Start-Process -FilePath 'C:\\7z.exe' -ArgumentList '/S', '/D=C:\\7zip0' -NoNewWindow -Wait
-
-# Extract msys2
-RUN Invoke-WebRequest -UseBasicParsing 'http://repo.msys2.org/distrib/x86_64/msys2-base-x86_64-20180531.tar.xz' -OutFile msys2.tar.xz
-RUN Start-Process -FilePath 'C:\\7zip\\7z' -ArgumentList 'e', 'msys2.tar.xz' -Wait
-RUN Start-Process -FilePath 'C:\\7zip\\7z' -ArgumentList 'x', 'msys2.tar', '-oC:\\' -Wait
-RUN Remove-Item msys2.tar.xz
-RUN Remove-Item msys2.tar
-RUN Remove-Item 7z.exe
-RUN Remove-Item -Recurse 7zip
-
-# Add MSYS2 to PATH, and set BAZEL_SH
-RUN [Environment]::SetEnvironmentVariable('Path', $env:Path + ';C:\msys64\usr\bin', [System.EnvironmentVariableTarget]::Machine)
-RUN [Environment]::SetEnvironmentVariable('BAZEL_SH', 'C:\msys64\usr\bin\bash.exe', [System.EnvironmentVariableTarget]::Machine)
-
-# Install Microsoft Visual C++ Redistributable for Visual Studio 2015
-RUN Invoke-WebRequest -UseBasicParsing 'https://download.microsoft.com/download/9/3/F/93FCF1E7-E6A4-478B-96E7-D4B285925B00/vc_redist.x64.exe' -OutFile vc_redist.x64.exe
-RUN Start-Process 'c:\\vc_redist.x64.exe' -ArgumentList '/Install', '/Passive', '/NoRestart' -NoNewWindow -Wait
-RUN Remove-Item vc_redist.x64.exe
-
-# Add a fix for https://github.com/docker/for-win/issues/2920 as entry point to the container.
-SHELL ["cmd", "/c"]
-COPY "fix-msys64.cmd" "C:\\fix-msys64.cmd"
-ENTRYPOINT cmd /C C:\\fix-msys64.cmd && cmd /c
-
-CMD ["cmd.exe"]

.buildkite/README.md

@@ -1,96 +0,0 @@
-# BuildKite configuration
-
-This folder contains configuration for the [BuildKite](https://buildkite.com) based CI checks for 
-this repository.
-
-BuildKite is a CI provider that provides build coordination and reports while we provide the 
-infrastructure.
-
-CI runs are triggered by new PRs and will show up on the GitHub checks interface, along with the 
-other current CI solutions.
-
-Currently it is only used for tests on Windows platforms.
-
-
-## The build pipeline
-
-BuildKite uses a pipeline for each repository. The `pipeline.yml` file defines pipeline 
-[build steps](https://buildkite.com/docs/pipelines/defining-steps) for this repository.
-
-Run results can be seen in the GitHub checks interface and in the 
-[pipeline dashboard](https://buildkite.com/angular/angular).
-
-Although most configuration is done via `pipeline.yml`, some options are only available
-in the online [pipeline settings](https://buildkite.com/angular/angular/settings).
-
-
-## Infrastructure
-
-BuildKite does not provide the host machines where the builds runs, providing instead the
-[BuildKite Agent](https://buildkite.com/docs/agent/v3) that should be run our own infrastructure.
-
-
-### Agents
-
-This agent polls the BuildKite API for builds, runs them, and reports back the results.
-Agents are the unit of concurrency: each agent can run one build at any given time. 
-Adding agents allows more builds to be ran at the same time.
-
-Individual agents can have tags, and pipeline steps can target only agents with certain tags via the
-`agents` field in `pipeline.yml`.
-For example: agents on Windows machines are tagged as `windows`, and the Windows specific build 
-steps list `windows: true` in their `agents` field.
-
-You can see the current agent pool, along with their tags, in the 
-[agents list](https://buildkite.com/organizations/angular/agents).
-
-
-### Our host machines
-
-We use [Google Cloud](https://cloud.google.com/) as our cloud provider, under the 
-[Angular project](https://console.cloud.google.com/home/dashboard?project=internal-200822).
-To access this project you need need to be logged in with a Google account that's a member of 
-team@angular.io. 
-For googlers this may be your google.com account, for others it is an angular.io account.
-
-In this project we have a number of Windows VMs running, each of them with several agents.
-The `provision-windows-buildkite.ps1` file contains instructions on how to create new host VMs that
-are fully configured to run the BuildKite agents as services.
-
-Our pipeline uses [docker-buildkite-plugin](https://github.com/buildkite-plugins/docker-buildkite-plugin)
-to run build steps inside docker containers.
-This way we achieve isolation and hermeticity.
-
-The `Dockerfile` file describes a custom Docker image that includes NodeJs, Yarn, and the Bazel 
-pre-requisites on Windows.
-
-To upload a new version of the docker image, follow any build instructions in `Dockerfile` and then
-run `docker build -t angular/node-bazel-windows:NEW_VERSION`, followed by 
-`docker push angular/node-bazel-windows:NEW_VERSION`. 
-After being pushed it should be available online, and you can use the new version in `pipeline.yml`.
-
-
-## Caretaker 
-
-BuildKite status can be found at https://www.buildkitestatus.com/.
-
-Issues related to the BuildKite setup should be escalated to the Tools Team via the current 
-caretaker, followed by Alex Eagle and Filipe Silva.
-
-Support requests should be submitted via email to support@buildkite.com and cc Igor, Misko, Alex,
-Jeremy and Manu
-
-
-## Rollout strategy
-
-At the moment our BuildKite CI uses 1 host VM running 4 agents, thus being capable of 4 concurrent 
-builds.
-The only test running is `bazel test //tools/ts-api-guardian:all`, and the PR check is not 
-mandatory.
-
-In the future we should add cache support to speed up the initial `yarn` install, and also Bazel
-remote caching to speed up Bazel builds.
-
-After the current setup is verified as stable and reliable the GitHub PR check can become mandatory.
-
-The tests ran should also be expanded to cover most, if not all, of the Bazel tests.

.buildkite/fix-msys64.cmd

@@ -1,6 +0,0 @@
-@echo off
-REM Fix for https://github.com/docker/for-win/issues/2920
-REM echo "Fixing msys64 folder..."
-REM Touch all .dll files inside C:\msys64\
-forfiles /p C:\msys64\ /s /m *.dll /c "cmd /c Copy /B @path+,, >NUL"
-REM echo "Fixed msys64 folder."

.buildkite/pipeline.yml

@@ -1,10 +0,0 @@
-steps:
-  - label: windows-test
-    commands:
-      - "yarn install --frozen-lockfile --non-interactive --network-timeout 100000"
-      - "yarn bazel test //tools/ts-api-guardian:all --noshow_progress"
-    plugins:
-      - docker#v2.1.0:
-          image: "filipesilva/node-bazel-windows:0.0.2"
-    agents:
-      windows: true

.buildkite/provision-windows-buildkite.ps1

@@ -1,92 +0,0 @@
-# PowerShell script to provision a Windows Server with BuildKite
-# This script follows https://buildkite.com/docs/agent/v3/windows.
-
-# Instructions
-
-# VM creation:
-# In Google Cloud Platform, create a Compute Engine instance.
-# We recommend machine type n1-highcpu-16 (16 vCPUs, 14.4 GB memory).
-# Use a windows boot disk with container support such as
-# "Windows Server version 1803 Datacenter Core for Containers".
-# Give it a name, then click "Create".
-
-# VM setup:
-# In the Compute Engine menu, select "VM Instances". Click on the VM name you chose before.
-# Click "Set Windows Password" to choose a username and password.
-# Click RDP to open a remote desktop via browser, using the username and password.
-# In the Windows command prompt start an elevated powershell by inputing
-# "powershell -Command "Start-Process PowerShell -Verb RunAs" followed by Enter.
-# Download and execute this script from GitHub, passing the token (mandatory), tags (optional)
-# and number of agents (optional) as args:
-# ```
-# Invoke-WebRequest -Uri https://raw.githubusercontent.com/angular/angular/master/.buildkite/provision-windows-buildkite.ps1 -OutFile provision.ps1
-# .\provision.ps1 -token "MY_TOKEN" -tags "windows=true,another_tag=true" -agents 4
-# ```
-# The VM should restart and be fully configured.
-
-# Creating extra VMs
-# You can create an image of the current VM by following the instructions below.
-# https://cloud.google.com/compute/docs/instances/windows/creating-windows-os-image
-# Then create a new VM and choose "Custom images".
-
-
-# Script proper.
-
-# Get the token and tags from arguments.
-param (
-  [Parameter(Mandatory=$true)][string]$token,
-  [string]$tags = ""
-  [Int]$agents = 1
-)
-
-# Allow HTTPS
-[Net.ServicePointManager]::SecurityProtocol = "tls12, tls11, tls"
-
-# Helper to add to PATH.
-# Will take current PATH so avoid running it after anything to modifies only the powershell session path.
-function Add-Path ([string]$newPathItem) {
-  $Env:Path+= ";" +  $newPathItem + ";"
-  [Environment]::SetEnvironmentVariable("Path",$env:Path, [System.EnvironmentVariableTarget]::Machine)
-}
-
-# Install Git for Windows
-Write-Host "Installing Git for Windows."
-Invoke-WebRequest -Uri https://github.com/git-for-windows/git/releases/download/v2.19.1.windows.1/Git-2.19.1-64-bit.exe -OutFile git.exe
-.\git.exe /VERYSILENT /NORESTART /NOCANCEL /SP- /CLOSEAPPLICATIONS /RESTARTAPPLICATIONS /COMPONENTS="icons,ext\reg\shellhere,assoc,assoc_sh" /DIR="C:\git"
-Add-Path "C:\git\bin"
-Remove-Item git.exe
-
-# Download NSSM (https://nssm.cc/) to run the BuildKite agent as a service.
-Write-Host "Downloading NSSM."
-Invoke-WebRequest -Uri https://nssm.cc/ci/nssm-2.24-101-g897c7ad.zip -OutFile nssm.zip
-Expand-Archive -Path nssm.zip -DestinationPath C:\nssm
-Add-Path "C:\nssm\nssm-2.24-101-g897c7ad\win64"
-Remove-Item nssm.zip
-
-# Run the BuildKite agent install script
-Write-Host "Installing BuildKite agent."
-$env:buildkiteAgentToken = $token
-$env:buildkiteAgentTags = $tags
-Set-ExecutionPolicy Bypass -Scope Process -Force
-iex ((New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/buildkite/agent/master/install.ps1'))
-
-# Configure the BuildKite agent clone and timestamp behavior
-Add-Content C:\buildkite-agent\buildkite-agent.cfg "`ngit-clone-flags=--config core.autocrlf=input --config core.eol=lf --config core.longpaths=true --config core.symlinks=true`n"
-Add-Content C:\buildkite-agent\buildkite-agent.cfg "`ntimestamp-lines=true`n"
-
-# Register the BuildKite agent service using NSSM, so that it persists through restarts and is
-# restarted if the process dies.
-for ($i=1; $i -le $agents; $i++)
-{
-  $agentName = "buildkite-agent-$i"
-  Write-Host "Registering $agentName as a service."
-  nssm.exe install $agentName "C:\buildkite-agent\bin\buildkite-agent.exe" "start"
-  nssm.exe set $agentName AppStdout "C:\buildkite-agent\$agentName.log"
-  nssm.exe set $agentName AppStderr "C:\buildkite-agent\$agentName.log"
-  nssm.exe status $agentName
-  nssm.exe start $agentName
-  nssm.exe status $agentName
-}
-
-# Restart the machine.
-Restart-Computer

.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 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`
+- 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`
 - 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/bazel.rc

@@ -16,6 +16,10 @@ test --test_tag_filters=-manual
 # (e.g. /etc/bazel.bazelrc vs. tools/bazel.rc)
 build --announce_rc
 
+# Create dist/bin symlink to $(bazel info bazel-bin)
+# We use this when uploading artifacts after the build finishes
+build --symlink_prefix=dist/
+
 # Workaround https://github.com/bazelbuild/bazel/issues/3645
 # Bazel doesn't calculate the memory ceiling correctly when running under Docker.
 # Limit Bazel to consuming resources that fit in CircleCI "xlarge" class

.circleci/config.yml

@@ -7,47 +7,41 @@
 # To validate changes, use an online parser, eg.
 # http://yaml-online-parser.appspot.com/
 
-# 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
+# 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.6.0
+var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.6.0
 
 # Define common ENV vars
-var_4: &define_env_vars
+var_3: &define_env_vars
+  run: echo "export PROJECT_ROOT=$(pwd)" >> $BASH_ENV
+
+# See remote cache documentation in /docs/BAZEL.md
+var_4: &setup-bazel-remote-cache
   run:
-    name: Define environment variables
-    command: ./.circleci/env.sh
+    name: Start up bazel remote cache proxy
+    command: ~/bazel-remote-proxy -backend circleci://
+    background: true
 
 var_5: &setup_bazel_remote_execution
   run:
     name: "Setup bazel RBE 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"
+    command: openssl aes-256-cbc -d -in .circleci/gcp_token -k "${CIRCLE_PROJECT_REPONAME}" -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
-var_6: &job_defaults
+anchor_1: &job_defaults
   working_directory: ~/ng
   docker:
-  - image: *default_docker_image
+    - image: *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
-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
+anchor_2: &post_checkout
+  post: git pull --ff-only origin "refs/pull/${CIRCLE_PULL_REQUEST//*pull\//}/merge"
 
 version: 2
 jobs:
@@ -57,70 +51,51 @@ jobs:
     steps:
       - checkout:
           <<: *post_checkout
-      - restore_cache:
-          key: *cache_key
-      - *define_env_vars
-      - *setup_circleci_bazel_config
-      - *yarn_install
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
 
+      # 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
-      - restore_cache:
-          key: *cache_key
-      - *define_env_vars
-      - *setup_circleci_bazel_config
-      - *yarn_install
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
 
+      - run: bazel info release
+      - run: bazel run @nodejs//:yarn
+      # Use bazel query so that we explicitly ask for all buildable targets to be built as well
+      # This avoids waiting for the slowest build target to finish before running the first test
+      # See https://github.com/bazelbuild/bazel/issues/4257
+      # NOTE: Angular developers should typically just bazel build //packages/... or bazel test //packages/...
       # Setup remote execution and run RBE-compatible tests.
       - *setup_bazel_remote_execution
-      - run: yarn bazel test //... --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only,-local
+      - run: bazel query --output=label //... | xargs bazel test --build_tag_filters=-ivy-only --test_tag_filters=-manual,-ivy-only,-local
       # Now run RBE incompatible tests locally.
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - run: yarn bazel test //... --build_tag_filters=-ivy-only,local --test_tag_filters=-ivy-only,local
+      - run: bazel query --output=label //... | xargs bazel test --build_tag_filters=-ivy-only,local --test_tag_filters=-manual,-ivy-only,local
 
-      - save_cache:
-          key: *cache_key
-          paths:
-            - "node_modules"
-            - "~/bazel_repository_cache"
-
-  # Temporary job to test what will happen when we flip the Ivy flag to true
-  test_ivy_aot:
-    <<: *job_defaults
-    resource_class: xlarge
-    steps:
-      - checkout:
-          <<: *post_checkout
-      - restore_cache:
-          key: *cache_key
-      - *define_env_vars
-      - *setup_circleci_bazel_config
-      - *yarn_install
-      - *setup_bazel_remote_execution
-
-        # We need to explicitly specify the --symlink_prefix option because otherwise we would
-        # not be able to easily find the output bin directory when uploading artifacts for size
-        # measurements.
-      - run: yarn test-ivy-aot //... --symlink_prefix=dist/
-
-        # Publish bundle artifacts which will be used to calculate the size change. **Note**: Make
-        # sure that the size plugin from the Angular robot fetches the artifacts from this CircleCI
-        # job (see .github/angular-robot.yml). Additionally any artifacts need to be stored with the
-        # following path format: "{projectName}/{context}/{fileName}". This format is necessary
-        # because otherwise the bot is not able to pick up the artifacts from CircleCI. See:
-        # https://github.com/angular/github-robot/blob/master/functions/src/plugins/size.ts#L392-L394
+      # 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.
+      # The destination keys need be format {projectName}/{context}/{fileName} so that the github-robot can process them for size calculations
+      # projectName should remain consistant to group files
+      # context and fileName can be almost anything (within usual URI rules)
+      # There should only be exactly 2 forward slashes in the path
+      # This is so they're backwards compatiable with the existing data we have on bundle sizes
       - store_artifacts:
           path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js
           destination: core/hello_world/bundle
@@ -133,131 +108,39 @@ jobs:
       - store_artifacts:
           path: dist/bin/packages/core/test/bundling/todo/bundle.min.js.br
           destination: core/todo/bundle.br
-
-  test_aio:
+      - save_cache:
+          key: *cache_key
+          paths:
+            - "node_modules"
+            - "~/bazel_repository_cache"
+  # Temporary job to test what will happen when we flip the Ivy flag to true
+  test_ivy_jit:
     <<: *job_defaults
-    docker:
-      # Needed because the AIO tests and the PWA score test depend on Chrome being available.
-      - image: *browsers_docker_image
+    resource_class: xlarge
     steps:
+      - *define_env_vars
       - 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: 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: yarn --cwd aio test --watch=false
-        # Run e2e tests
-      - run: yarn --cwd aio e2e
-        # Run unit tests for Firebase redirects
-      - run: yarn --cwd aio redirects-test
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
 
-  deploy_aio:
+      - run: bazel run @yarn//:yarn
+      - *setup_bazel_remote_execution
+      - run: bazel query --output=label //... | xargs bazel test --define=compile=jit --build_tag_filters=ivy-jit --test_tag_filters=-manual,ivy-jit
+
+  test_ivy_aot:
     <<: *job_defaults
-    docker:
-    # Needed because before deploying the deploy-production script runs the PWA score tests.
-    - image: *browsers_docker_image
+    resource_class: xlarge
     steps:
+      - *define_env_vars
       - checkout:
           <<: *post_checkout
-      - restore_cache:
-          key: *cache_key
-      - *define_env_vars
-        # Deploy angular.io to production (if necessary)
-      - run: setPublicVar CI_STABLE_BRANCH "$(npm info @angular/core dist-tags.latest | sed -r 's/^\s*([0-9]+\.[0-9]+)\.[0-9]+.*$/\1.x/')"
-      - run: yarn --cwd aio deploy-production
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
 
-  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:
-      - checkout:
-          <<: *post_checkout
-      - restore_cache:
-          key: *cache_key
-      - attach_workspace:
-          at: dist
-      - *define_env_vars
-        # Build aio (with local Angular packages)
-      - run: yarn --cwd aio build-local --progress=false
-        # Run PWA-score tests
-        # (Run before unit and e2e tests, which destroy the `dist/` directory.)
-      - run: yarn --cwd aio test-pwa-score-localhost $CI_AIO_MIN_PWA_SCORE
-        # Run unit tests
-      - run: yarn --cwd aio test --watch=false
-        # Run e2e tests
-      - run: yarn --cwd aio e2e
+      - run: bazel run @yarn//:yarn
+      - *setup_bazel_remote_execution
+      - run: bazel query --output=label //... | xargs bazel test --define=compile=local --build_tag_filters=ivy-local --test_tag_filters=-manual,ivy-local
 
-  test_aio_tools:
-    <<: *job_defaults
-    steps:
-      - checkout:
-          <<: *post_checkout
-      - restore_cache:
-          key: *cache_key
-      - attach_workspace:
-          at: dist
-      - *define_env_vars
-        # Install
-      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
-      - run: yarn --cwd aio extract-cli-command-docs
-        # Run tools tests
-      - run: yarn --cwd aio tools-test
-      - run: ./aio/aio-builds-setup/scripts/test.sh
-
-  test_docs_examples_0:
-    <<: *job_defaults
-    docker:
-      # Needed because the example e2e tests depend on Chrome.
-      - image: *browsers_docker_image
-    steps:
-      - checkout:
-          <<: *post_checkout
-      - restore_cache:
-          key: *cache_key
-      - attach_workspace:
-          at: dist
-      - *define_env_vars
-        # Install root
-      - *yarn_install
-        # Install aio
-      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
-        # Run examples tests
-      - 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:
-      - checkout:
-          <<: *post_checkout
-      - restore_cache:
-          key: *cache_key
-      - attach_workspace:
-          at: dist
-      - *define_env_vars
-        # Install root
-      - *yarn_install
-        # Install aio
-      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
-        # Run examples tests
-      - 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`.
+  # This job should only be run on PR builds, where `CIRCLE_PR_NUMBER` is defined.
   aio_preview:
     <<: *job_defaults
     environment:
@@ -267,32 +150,28 @@ jobs:
           <<: *post_checkout
       - restore_cache:
           key: *cache_key
-      - *define_env_vars
-      - *yarn_install
-      - run: ./aio/scripts/build-artifacts.sh $AIO_SNAPSHOT_ARTIFACT_PATH $CI_PULL_REQUEST $CI_COMMIT
+      - run: yarn install --frozen-lockfile --non-interactive
+      - run: ./aio/scripts/build-artifacts.sh $AIO_SNAPSHOT_ARTIFACT_PATH $CIRCLE_PR_NUMBER $CIRCLE_SHA1
       - store_artifacts:
           path: *aio_preview_artifact_path
           # The `destination` needs to be kept in synch with the value of
           # `AIO_ARTIFACT_PATH` in `aio/aio-builds-setup/Dockerfile`
           destination: aio/dist/aio-snapshot.tgz
-      - run: node ./aio/scripts/create-preview $CIRCLE_BUILD_NUM
 
-  # This job should only be run on PR builds, where `CI_PULL_REQUEST` is not `false`.
+  # This job should only be run on PR builds, where `CIRCLE_PR_NUMBER` is defined.
   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:
       - checkout:
           <<: *post_checkout
       - restore_cache:
           key: *cache_key
-      - *define_env_vars
       - run: yarn install --cwd aio --frozen-lockfile --non-interactive
       - run:
           name: Wait for preview and run tests
-          command: node aio/scripts/test-preview.js $CI_PULL_REQUEST $CI_COMMIT $CI_AIO_MIN_PWA_SCORE
+          command: |
+            source "./scripts/ci/env.sh" print
+            xvfb-run --auto-servernum node aio/scripts/test-preview.js $CIRCLE_PR_NUMBER $CIRCLE_SHA1 $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,15 +184,12 @@ jobs:
     <<: *job_defaults
     resource_class: xlarge
     steps:
+      - *define_env_vars
       - checkout:
           <<: *post_checkout
-      - restore_cache:
-          key: *cache_key
-      - *define_env_vars
-      - *setup_circleci_bazel_config
-      - *yarn_install
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
+      - run: bazel run @nodejs//:yarn
       - *setup_bazel_remote_execution
-
       - run: scripts/build-packages-dist.sh
 
       # Save the npm packages from //packages/... for other workflow jobs to read
@@ -322,7 +198,8 @@ jobs:
           root: dist
           paths:
             - packages-dist
-            - packages-dist-ivy-aot
+            - packages-dist-ivy-jit
+            - packages-dist-ivy-local
 
   # We run the integration tests outside of Bazel for now.
   # They are a separate workflow job so that they can be easily re-run.
@@ -332,41 +209,35 @@ 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
-      - *define_env_vars
-      - run: ./integration/run_tests.sh
+      - run: xvfb-run --auto-servernum ./integration/run_tests.sh
 
   # This job updates the content of repos like github.com/angular/core-builds
   # for every green build on angular/angular.
   publish_snapshot:
     <<: *job_defaults
     steps:
-      - checkout:
-          <<: *post_checkout
-      - *define_env_vars
       # See below - ideally this job should not trigger for non-upstream builds.
       # But since it does, we have to check this condition.
       - run:
           name: Skip this job for Pull Requests and Fork builds
           # Note, `|| true` on the end makes this step always exit 0
           command: '[[
-              "$CI_PULL_REQUEST" != "false"
-              || "$CI_REPO_OWNER" != "angular"
-              || "$CI_REPO_NAME" != "angular"
+              -v CIRCLE_PR_NUMBER
+              || "$CIRCLE_PROJECT_USERNAME" != "angular"
+              || "$CIRCLE_PROJECT_REPONAME" != "angular"
           ]] && circleci step halt || true'
+      - checkout:
+          <<: *post_checkout
       - attach_workspace:
           at: dist
       # CircleCI has a config setting to force SSH for all github connections
@@ -380,23 +251,16 @@ 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:
       - checkout:
           <<: *post_checkout
       - restore_cache:
           key: *cache_key
-      - *define_env_vars
       - run:
           name: Run tests against the deployed apps
-          command: ./aio/scripts/test-production.sh $CI_AIO_MIN_PWA_SCORE
-      - run:
-          name: Notify caretaker about failure
-          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
+          command: |
+            source "./scripts/ci/env.sh" print
+            xvfb-run --auto-servernum ./aio/scripts/test-production.sh $AIO_MIN_PWA_SCORE
 
 workflows:
   version: 2
@@ -404,24 +268,9 @@ workflows:
     jobs:
       - lint
       - test
+      - test_ivy_jit
       - test_ivy_aot
       - build-packages-dist
-      - test_aio
-      - deploy_aio:
-          requires:
-            - test_aio
-      - test_aio_local:
-          requires:
-            - build-packages-dist
-      - test_aio_tools:
-          requires:
-            - build-packages-dist
-      - test_docs_examples_0:
-          requires:
-            - build-packages-dist
-      - test_docs_examples_1:
-          requires:
-            - build-packages-dist
       - aio_preview:
           # Only run on PR builds. (There can be no previews for non-PR builds.)
           filters:
@@ -441,12 +290,9 @@ 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
@@ -461,3 +307,7 @@ workflows:
             branches:
               only:
                 - master
+
+notify:
+  webhooks:
+    - url: https://ngbuilds.io/circle-build

.circleci/env-helpers.inc.sh

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

@@ -1,35 +0,0 @@
-#!/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;

.circleci/trigger-webhook.js

@@ -1,107 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Usage (cli):
- * ```
- * node create-preview <build-number> <job-name> <webhook-url>
- * ```
- *
- * Usage (JS):
- * ```js
- * require('./trigger-webhook').
- *   triggerWebhook(buildNumber, jobName, webhookUrl).
- *   then(...);
- * ```
- *
- * Triggers a notification webhook with CircleCI specific info.
- *
- * It can be used for notifying external servers and trigger operations based on CircleCI job status
- * (e.g. triggering the creation of a preview based on previously stored build atrifacts).
- *
- * The body of the sent payload is of the form:
- * ```json
- * {
- *   "payload": {
- *     "build_num": ${buildNumber}
- *     "build_parameters": {
- *       "CIRCLE_JOB": "${jobName}"
- *     }
- *   }
- * }
- * ```
- *
- * When used from JS, it returns a promise which resolves to an object of the form:
- * ```json
- * {
- *   "statucCode": ${statusCode},
- *   "responseText": "${responseText}"
- * }
- * ```
- *
- * NOTE:
- * - When used from the cli, the command will exit with an error code if the response's status code
- *   is outside the [200, 400) range.
- * - When used from JS, the returned promise will be resolved, even if the response's status code is
- *   outside the [200, 400) range. It is up to the caller to decide how this should be handled.
- */
-
-// Imports
-const {request} = require('https');
-
-// Exports
-module.exports = {
-  triggerWebhook,
-};
-
-// Run
-if (require.resolve === module) {
-  _main(process.argv.slice(2));
-}
-
-// Helpers
-function _main(args) {
-  triggerWebhook(...args).
-    then(({statusCode, responseText}) => (200 <= statusCode && statusCode < 400) ?
-      console.log(`Status: ${statusCode}\n${responseText}`) :
-      Promise.reject(new Error(`Request failed (status: ${statusCode}): ${responseText}`))).
-    catch(err => {
-      console.error(err);
-      process.exit(1);
-    });
-}
-
-function postJson(url, data) {
-  return new Promise((resolve, reject) => {
-    const opts = {method: 'post', headers: {'Content-Type': 'application/json'}};
-    const onResponse = res => {
-      const statusCode = res.statusCode || -1;
-      let responseText = '';
-
-      res.
-        on('error', reject).
-        on('data', d => responseText += d).
-        on('end', () => resolve({statusCode, responseText}));
-    };
-
-    request(url, opts, onResponse).
-      on('error', reject).
-      end(JSON.stringify(data));
-  });
-}
-
-async function triggerWebhook(buildNumber, jobName, webhookUrl) {
-  if (!buildNumber || !jobName || !webhookUrl || isNaN(buildNumber)) {
-    throw new Error(
-        'Missing or invalid arguments.\n' +
-        'Expected: buildNumber (number), jobName (string), webhookUrl (string)');
-  }
-
-  const data = {
-    payload: {
-      build_num: +buildNumber,
-      build_parameters: {CIRCLE_JOB: jobName},
-    },
-  };
-
-  return postJson(webhookUrl, data);
-}

.github/ISSUE_TEMPLATE.md

@@ -1,10 +1,59 @@
-🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+<!--
+PLEASE HELP US PROCESS GITHUB ISSUES FASTER BY PROVIDING THE FOLLOWING INFORMATION.
 
-Please help us process issues more efficiently by filing an
-issue using one of the following templates:
+ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION.
+-->
 
-https://github.com/angular/angular/issues/new/choose
+## 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>
 
-Thank you!
+## Current behavior
+<!-- Describe how the issue manifests. -->
 
-🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
+
+## Expected behavior
+<!-- Describe what the desired behavior would be. -->
+
+
+## Minimal reproduction of the problem with instructions
+<!--
+For bug reports please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the problem via
+https://stackblitz.com or similar (you can use this template as a starting point: https://stackblitz.com/fork/angular-gitter).
+-->
+
+## What is the motivation / use case for changing the behavior?
+<!-- Describe the motivation or the concrete use case. -->
+
+
+## Environment
+
+<pre><code>
+Angular version: X.Y.Z
+<!-- Check whether this is still an issue in the most recent Angular version -->
+
+Browser:
+- [ ] Chrome (desktop) version XX
+- [ ] Chrome (Android) version XX
+- [ ] Chrome (iOS) version XX
+- [ ] Firefox version XX
+- [ ] Safari (desktop) version XX
+- [ ] Safari (iOS) version XX
+- [ ] IE version XX
+- [ ] Edge version XX
+ 
+For Tooling issues:
+- Node version: XX  <!-- run `node --version` -->
+- Platform:  <!-- Mac, Linux, Windows -->
+
+Others:
+<!-- Anything else relevant?  Operating system version, IDE, package manager, HTTP server, ... -->
+</code></pre>

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

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

@@ -1,32 +0,0 @@
----
-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
-
-### Relevant 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

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

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

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

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

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

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

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

@@ -4,7 +4,7 @@
 size:
   disabled: false
   maxSizeIncrease: 2000
-  circleCiStatusName: "ci/circleci: test_ivy_aot"
+  circleCiStatusName: "ci/circleci: test"
 
 # options for the merge plugin
 merge:
@@ -39,7 +39,6 @@ merge:
       - "packages/**"
     # list of patterns to ignore for the files changed by the PR
     exclude:
-      - "packages/bazel/*.bzl"
       - "packages/language-service/**"
       - "**/.gitignore"
       - "**/.gitkeep"
@@ -50,7 +49,6 @@ 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.
@@ -126,23 +124,3 @@ triage:
     -
       - "type: RFC / Discussion / question"
       - "comp: *"
-
-# options for the triage PR plugin
-triagePR:
-  # set to true to disable
-  disabled: false
-  # number of the milestone to apply when the PR has not been triaged yet
-  needsTriageMilestone: 83,
-  # number of the milestone to apply when the PR is triaged
-  defaultMilestone: 82,
-  # arrays of labels that determine if a PR has been triaged by the caretaker
-  l1TriageLabels:
-    -
-      - "comp: *"
-  # arrays of labels that determine if a PR has been fully triaged
-  l2TriageLabels:
-    -
-      - "type: *"
-      - "effort*"
-      - "risk*"
-      - "comp: *"

.gitignore

@@ -1,8 +1,7 @@
 .DS_STORE
 
 /dist/
-/bazel-*
-/integration/bazel/bazel-*
+bazel-*
 e2e_test.*
 node_modules
 bower_components
@@ -15,6 +14,7 @@ pubspec.lock
 .settings/
 *.swo
 modules/.settings
+.bazelrc
 .vscode
 modules/.vscode
 
@@ -30,7 +30,3 @@ yarn-error.log
 
 # rollup-test output
 /modules/rollup-test/dist/
-
-# User specific bazel settings
-.bazelrc.user
-

.pullapprove.yml

@@ -87,10 +87,10 @@ groups:
       files:
         include:
           - "WORKSPACE"
-          - ".bazel*"
           - "*.bazel"
           - "*.bzl"
           - "packages/bazel/*"
+          - "tools/bazel.rc"
           - "/docs/BAZEL.md"
     users:
       - alexeagle #primary
@@ -98,7 +98,6 @@ groups:
       - IgorMinar #fallback
       - mhevery
       - vikerman #fallback
-      - kara
 
   build-and-ci:
     conditions:
@@ -109,9 +108,9 @@ groups:
           - "*.lock"
           - "tools/*"
         exclude:
-          - "aio/*"
-          - "packages/core/test/bundling/*"
+          - "tools/bazel.rc"
           - "tools/public_api_guard/*"
+          - "aio/*"
     users:
       - IgorMinar #primary
       - alexeagle
@@ -212,7 +211,6 @@ groups:
       - mhevery #fallback
       - IgorMinar #fallback
       - jenniferfell #docs only
-      - kara
 
   compiler/i18n:
     conditions:
@@ -225,7 +223,6 @@ groups:
       - IgorMinar #fallback
       - mhevery #fallback
       - jenniferfell #docs only
-      - kara
 
   compiler:
     conditions:
@@ -237,7 +234,6 @@ groups:
       - mhevery
       - IgorMinar #fallback
       - jenniferfell #docs only
-      - kara
 
   compiler-cli/ngtools:
     conditions:
@@ -247,7 +243,6 @@ groups:
       - hansl
       - filipesilva #fallback
       - IgorMinar #fallback
-      - kara
 
   compiler-cli:
     conditions:
@@ -262,7 +257,6 @@ groups:
       - alxhub
       - IgorMinar #fallback
       - mhevery #fallback
-      - kara
 
   common:
     conditions:
@@ -275,7 +269,6 @@ groups:
       - pkozlowski-opensource #primary
       - IgorMinar #fallback
       - mhevery #fallback
-      - kara
 
   forms:
     conditions:
@@ -284,9 +277,6 @@ groups:
         - "aio/content/guide/forms.md"
         - "aio/content/examples/forms/*"
         - "aio/content/images/guide/forms/*"
-        - "aio/content/guide/forms-overview.md"
-        - "aio/content/examples/forms-overview/*"
-        - "aio/content/images/guide/forms-overview/*"
         - "aio/content/guide/form-validation.md"
         - "aio/content/examples/form-validation/*"
         - "aio/content/images/guide/form-validation/*"
@@ -341,7 +331,6 @@ groups:
       - IgorMinar #fallback
       - mhevery #fallback
       - jenniferfell #docs only
-      - kara
 
   testing:
     conditions:
@@ -375,7 +364,6 @@ groups:
       - IgorMinar #fallback
       - mhevery #fallback
       - jenniferfell #docs only
-      - kara
 
   platform-browser:
     conditions:
@@ -385,7 +373,6 @@ groups:
       - mhevery #primary
       # needs secondary
       - IgorMinar #fallback
-      - kara
 
   platform-server:
     conditions:
@@ -408,7 +395,6 @@ groups:
       - mhevery #primary
       # needs secondary
       - IgorMinar #fallback
-      - kara
 
   service-worker:
     conditions:
@@ -442,7 +428,6 @@ groups:
       - IgorMinar #fallback
       - mhevery #fallback
       - jenniferfell #docs only
-      - kara
 
   benchpress:
     conditions:

.travis.yml

@@ -30,6 +30,14 @@ env:
     # GITHUB_TOKEN_ANGULAR=<github token, a personal access token of the angular-builds account, account access in valentine>
     # This is needed for the e2e Travis matrix task to publish packages to github for continuous packages delivery.
     - secure: "aCdHveZuY8AT4Jr1JoJB4LxZsnGWRe/KseZh1YXYe5UtufFCtTVHvUcLn0j2aLBF0KpdyS+hWf0i4np9jthKu2xPKriefoPgCMpisYeC0MFkwbmv+XlgkUbgkgVZMGiVyX7DCYXVahxIoOUjVMEDCbNiHTIrfEuyq24U3ok2tHc="
+    # FIREBASE_TOKEN
+    # This is needed for publishing builds to the "aio-staging" and "angular-io" firebase projects.
+    # This token was generated using the aio-deploy@angular.io account using `firebase login:ci` and password from valentine
+    - secure: "L5CyQmpwWtoR4Qi4xlWQh/cL1M6ZeJL4W4QAr4HdKFMgYt9h+Whqkymyh2NxwmCbPvWa7yUd+OiLQUDCY7L2VIg16hTwoe2CgYDyQA0BEwLzxtRrJXl93TfwMlrUx5JSIzAccD6D4sjtz8kSFMomK2Nls33xOXOukwyhVMjd0Cg="
+    # ANGULAR_PAYLOAD_FIREBASE_TOKEN
+    # This is for payload size data to "angular-payload-size" firebase project
+    # This token was generated using the payload@angular.io account using `firebase login:ci` and password from valentine
+    - secure: "SxotP/ymNy6uWAVbfwM9BlwETPEBpkRvU/F7fCtQDDic99WfQHzzUSQqHTk8eKk3GrGAOSL09vT0WfStQYEIGEoS5UHWNgOnelxhw+d5EnaoB8vQ0dKQBTK092hQg4feFprr+B/tCasyMV6mVwpUzZMbIJNn/Rx7H5g1bp+Gkfg="
   matrix:
     # Order: a slower build first, so that we don't occupy an idle travis worker waiting for others to complete.
     - CI_MODE=e2e
@@ -39,10 +47,16 @@ env:
     # - CI_MODE=browserstack_required
     - CI_MODE=saucelabs_optional
     - CI_MODE=browserstack_optional
+    - CI_MODE=aio_tools_test
+    - CI_MODE=aio
+    - CI_MODE=aio_local
+    - CI_MODE=aio_e2e AIO_SHARD=0
+    - CI_MODE=aio_e2e AIO_SHARD=1
 
 matrix:
   fast_finish: true
   allow_failures:
+    - env: "CI_MODE=aio_local"
     - env: "CI_MODE=saucelabs_optional"
     - env: "CI_MODE=browserstack_optional"
 
@@ -56,6 +70,8 @@ install:
 script:
   - ./scripts/ci/build.sh
   - ./scripts/ci/test.sh
+  # deploy is part of 'script' and not 'after_success' so that we fail the build if the deployment fails
+  - ./scripts/ci/deploy.sh
   - ./scripts/ci/angular.sh
   # all the scripts under this line will not quickly abort in case ${TRAVIS_TEST_RESULT} is 1 (job failure)
   - ./scripts/ci/cleanup.sh

BUILD.bazel

@@ -8,14 +8,26 @@ 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",
+)
+
+alias(
+    name = "node_modules",
+    actual = "@angular_deps//:node_modules",
+)
+
 filegroup(
     name = "web_test_bootstrap_scripts",
     # do not sort
     srcs = [
-        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
-        "@ngdeps//node_modules/zone.js:dist/zone.js",
-        "@ngdeps//node_modules/zone.js:dist/zone-testing.js",
-        "@ngdeps//node_modules/zone.js:dist/task-tracking.js",
+        "@angular_deps//:node_modules/reflect-metadata/Reflect.js",
+        "@angular_deps//:node_modules/zone.js/dist/zone.js",
+        "@angular_deps//:node_modules/zone.js/dist/zone-testing.js",
+        "@angular_deps//:node_modules/zone.js/dist/task-tracking.js",
         "//:test-events.js",
     ],
 )
@@ -23,29 +35,11 @@ filegroup(
 filegroup(
     name = "angularjs_scripts",
     srcs = [
-        "@ngdeps//node_modules/angular:angular.js",
-        "@ngdeps//node_modules/angular-1.5:angular.js",
-        "@ngdeps//node_modules/angular-1.6:angular.js",
-        "@ngdeps//node_modules/angular-mocks:angular-mocks.js",
-        "@ngdeps//node_modules/angular-mocks-1.5:angular-mocks.js",
-        "@ngdeps//node_modules/angular-mocks-1.6:angular-mocks.js",
+        "@angular_deps//:node_modules/angular-1.5/angular.js",
+        "@angular_deps//:node_modules/angular-1.6/angular.js",
+        "@angular_deps//:node_modules/angular-mocks-1.5/angular-mocks.js",
+        "@angular_deps//:node_modules/angular-mocks-1.6/angular-mocks.js",
+        "@angular_deps//:node_modules/angular-mocks/angular-mocks.js",
+        "@angular_deps//:node_modules/angular/angular.js",
     ],
 )
-
-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
-
-# A nodejs_binary for @angular/bazel/ngc-wrapped to use by default in
-# ng_module that depends on @npm//@angular/bazel instead of the
-# output of the //packages/bazel/src/ngc-wrapped ts_library rule. This
-# default is for downstream users that depend on the @angular/bazel npm
-# package. The generated @npm//@angular/bazel/ngc-wrapped target
-# does not work because it does not have the node `--expose-gc` flag
-# set which is required to support the call to `global.gc()`.
-nodejs_binary(
-    name = "@angular/bazel/ngc-wrapped",
-    configuration_env_vars = ["compile"],
-    data = ["@npm//@angular/bazel"],
-    entry_point = "@angular/bazel/src/ngc-wrapped/index.js",
-    install_source_map_support = False,
-    templated_args = ["--node_options=--expose-gc"],
-)

CHANGELOG.md

@@ -1,237 +1,12 @@
-<a name="7.2.0-beta.1"></a>
-# [7.2.0-beta.1](https://github.com/angular/angular/compare/7.1.0...7.2.0-beta.1) (2018-12-06)
-
-
-### Bug Fixes
-
-* **bazel:** do not throw error when writing tsickle externs ([#27200](https://github.com/angular/angular/issues/27200)) ([20a2bae](https://github.com/angular/angular/commit/20a2bae))
-* **bazel:** do not throw if ts compile action does not create esm5 outputs ([#27401](https://github.com/angular/angular/issues/27401)) ([c61a8b7](https://github.com/angular/angular/commit/c61a8b7))
-* **bazel:** ng_package cannot be run multiple times without clean ([#27200](https://github.com/angular/angular/issues/27200)) ([4f93749](https://github.com/angular/angular/commit/4f93749))
-* **bazel:** ng_package not generating UMD bundles on windows ([#27200](https://github.com/angular/angular/issues/27200)) ([7d59880](https://github.com/angular/angular/commit/7d59880))
-* **bazel:** ng_package should correctly map to source maps in secondary entry-points ([#27313](https://github.com/angular/angular/issues/27313)) ([eb17502](https://github.com/angular/angular/commit/eb17502)), closes [#25510](https://github.com/angular/angular/issues/25510)
-* **bazel:** Respect existing angular installation ([#27495](https://github.com/angular/angular/issues/27495)) ([4da739a](https://github.com/angular/angular/commit/4da739a))
-* **common:** expose request url in network error ([#27143](https://github.com/angular/angular/issues/27143)) ([1db53da](https://github.com/angular/angular/commit/1db53da)), closes [#27029](https://github.com/angular/angular/issues/27029)
-* **compiler-cli:** flatModuleIndex files not generated on windows with multiple input files ([#27200](https://github.com/angular/angular/issues/27200)) ([d3c08e7](https://github.com/angular/angular/commit/d3c08e7))
-* **core:** export a value for InjectFlags ([#27279](https://github.com/angular/angular/issues/27279)) ([23b06af](https://github.com/angular/angular/commit/23b06af)), closes [#27251](https://github.com/angular/angular/issues/27251)
-* **core:** More precise return type for `InjectableDecorator` ([#27360](https://github.com/angular/angular/issues/27360)) ([4b9948c](https://github.com/angular/angular/commit/4b9948c)), closes [#26942](https://github.com/angular/angular/issues/26942)
-* **forms:** apply unicode flag to pattern attribute when supported ([#20819](https://github.com/angular/angular/issues/20819)) ([3c34b8b](https://github.com/angular/angular/commit/3c34b8b))
-* **platform-server:** add [@angular](https://github.com/angular)/http to the list of peerDependencies ([#27307](https://github.com/angular/angular/issues/27307)) ([32c5be9](https://github.com/angular/angular/commit/32c5be9)), closes [#26154](https://github.com/angular/angular/issues/26154)
-* **router:** update URL after redirects when urlHandlingStrategy='eager' ([#27356](https://github.com/angular/angular/issues/27356)) ([11a8bd8](https://github.com/angular/angular/commit/11a8bd8)), closes [#27076](https://github.com/angular/angular/issues/27076)
-* **upgrade:** don't rely upon the runtime to resolve forward refs ([#27132](https://github.com/angular/angular/issues/27132)) ([a4462c2](https://github.com/angular/angular/commit/a4462c2))
-
-
-### Features
-
-* **bazel:** ng-new schematics with Bazel ([#27277](https://github.com/angular/angular/issues/27277)) ([06d4a0c](https://github.com/angular/angular/commit/06d4a0c))
-* **router:** add a Navigation type available during navigation ([#27198](https://github.com/angular/angular/issues/27198)) ([d40af0c](https://github.com/angular/angular/commit/d40af0c))
-* **router:** add pathParamsOrQueryParamsChange mode for runGuardsAndResolvers ([#27464](https://github.com/angular/angular/issues/27464)) ([d70a7f3](https://github.com/angular/angular/commit/d70a7f3)), closes [#26861](https://github.com/angular/angular/issues/26861) [#18253](https://github.com/angular/angular/issues/18253)
-* **router:** allow passing `state` to routerLink directives ([#27198](https://github.com/angular/angular/issues/27198)) ([73f6ed9](https://github.com/angular/angular/commit/73f6ed9)), closes [#24617](https://github.com/angular/angular/issues/24617)
-* **router:** allow passing state to `NavigationExtras` ([#27198](https://github.com/angular/angular/issues/27198)) ([67f4a5d](https://github.com/angular/angular/commit/67f4a5d))
-* **router:** restore whole  object when navigating back to a page managed by Angular router ([#27198](https://github.com/angular/angular/issues/27198)) ([2684249](https://github.com/angular/angular/commit/2684249))
-
-
-### BREAKING CHANGES
-
-* **bazel:** Bazel users: rules_angular_dependencies() will no longer install transitive dependencies of build_bazel_rules_nodejs and build_bazel_rules_typescript. User WORKSPACE files will now need to install rules_nodejs and rules_typescript transitive deps directly:
-
-```
-load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
-rules_typescript_dependencies()
-
-load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
-rules_nodejs_dependencies()
-```
-
-
-
-<a name="7.2.0-beta.0"></a>
-# [7.2.0-beta.0](https://github.com/angular/angular/compare/7.1.0...7.2.0-beta.0) (2018-11-28)
-
-
-### Bug Fixes
-
-* **common:** expose request url in network error ([#27143](https://github.com/angular/angular/issues/27143)) ([1db53da](https://github.com/angular/angular/commit/1db53da)), closes [#27029](https://github.com/angular/angular/issues/27029)
-* **upgrade:** don't rely upon the runtime to resolve forward refs ([#27132](https://github.com/angular/angular/issues/27132)) ([a4462c2](https://github.com/angular/angular/commit/a4462c2))
-
-
-
-<a name="7.1.1"></a>
-## [7.1.1](https://github.com/angular/angular/compare/7.1.0...7.1.1) (2018-11-28)
-
-
-### Bug Fixes
-
-* **core:** export a value for InjectFlags ([#27279](https://github.com/angular/angular/issues/27279)) ([bdf5f3e](https://github.com/angular/angular/commit/bdf5f3e)), closes [#27251](https://github.com/angular/angular/issues/27251)
-
-
-
-<a name="7.1.0"></a>
-# [7.1.0](https://github.com/angular/angular/compare/7.1.0-rc.0...7.1.0) (2018-11-21)
-
-
-### 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)
-* **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))
-* **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)
-* **compiler-cli:** add missing tslib dependency ([#27063](https://github.com/angular/angular/issues/27063)) ([c31e78f](https://github.com/angular/angular/commit/c31e78f))
-* **compiler-cli:** only pass canonical genfile paths to compiler host ([#27062](https://github.com/angular/angular/issues/27062)) ([0ada23a](https://github.com/angular/angular/commit/0ada23a))
-* **router:** add `relativeLinkResolution` to `recognize` operator ([#26990](https://github.com/angular/angular/issues/26990)) ([a752971](https://github.com/angular/angular/commit/a752971)), closes [#26983](https://github.com/angular/angular/issues/26983)
-
-
-### Features
-
-* **bazel:** Bazel workspace schematics ([#26971](https://github.com/angular/angular/issues/26971)) ([b07bd30](https://github.com/angular/angular/commit/b07bd30))
-* **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))
-* **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)
-* **router:** add pathParamsChange mode for runGuardsAndResolvers ([#26861](https://github.com/angular/angular/issues/26861)) ([bf6ac6c](https://github.com/angular/angular/commit/bf6ac6c)), closes [#18253](https://github.com/angular/angular/issues/18253)
-
-
-<a name="7.1.0-rc.0"></a>
-# [7.1.0-rc.0](https://github.com/angular/angular/compare/7.1.0-beta.2...7.1.0-rc.0) (2018-11-14)
-
-
-### Bug Fixes
-
-* **compiler-cli:** add missing tslib dependency ([#27063](https://github.com/angular/angular/issues/27063)) ([c31e78f](https://github.com/angular/angular/commit/c31e78f))
-* **compiler-cli:** only pass canonical genfile paths to compiler host ([#27062](https://github.com/angular/angular/issues/27062)) ([0ada23a](https://github.com/angular/angular/commit/0ada23a))
-* **router:** add `relativeLinkResolution` to `recognize` operator ([#26990](https://github.com/angular/angular/issues/26990)) ([a752971](https://github.com/angular/angular/commit/a752971)), closes [#26983](https://github.com/angular/angular/issues/26983)
-
-
-### Features
-
-* **router:** add pathParamsChange mode for runGuardsAndResolvers ([#26861](https://github.com/angular/angular/issues/26861)) ([bf6ac6c](https://github.com/angular/angular/commit/bf6ac6c)), closes [#18253](https://github.com/angular/angular/issues/18253)
-
-
-
-<a name="7.0.4"></a>
-## [7.0.4](https://github.com/angular/angular/compare/7.0.3...7.0.4) (2018-11-14)
-
-
-### Bug Fixes
-
-* **compiler-cli:** add missing tslib dependency ([#27063](https://github.com/angular/angular/issues/27063)) ([4348c47](https://github.com/angular/angular/commit/4348c47))
-* **compiler-cli:** only pass canonical genfile paths to compiler host ([#27062](https://github.com/angular/angular/issues/27062)) ([188e9ce](https://github.com/angular/angular/commit/188e9ce))
-* **router:** add `relativeLinkResolution` to `recognize` operator ([#26990](https://github.com/angular/angular/issues/26990)) ([d304427](https://github.com/angular/angular/commit/d304427)), closes [#26983](https://github.com/angular/angular/issues/26983)
-
-
-
-<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)
-
-
-
-
 <a name="7.0.0"></a>
 # [7.0.0](https://github.com/angular/angular/compare/7.0.0-rc.1...7.0.0) (2018-10-18)
 
 
 ### Release Highlights & Update instructions
 
-To learn about the release highlights and our new CLI-powered update workflow for your projects please check out the [v7 release announcement](https://blog.angular.io/version-7-of-angular-cli-prompts-virtual-scroll-drag-and-drop-and-more-c594e22e7b8c).
+Angular v7 is .
+
+To learn about the release highlights and our new CLI-powered update workflow for your projects please check out the [v7 release announcement](https://blog.angular.io/TODO).
 
 
 ### Dependency updates

README.md

@@ -13,10 +13,12 @@ Angular is a development platform for building mobile and desktop web applicatio
 
 [Get started in 5 minutes][quickstart].
 
+
 ## Changelog
 
 [Learn about the latest improvements][changelog]. 
 
+
 ## Want to help?
 
 Want to file a bug, contribute some code, or improve documentation? Excellent! Read up on our

WORKSPACE

@@ -1,42 +1,91 @@
 workspace(name = "angular")
 
-load(
-    "//packages/bazel:package.bzl",
-    "rules_angular_dependencies",
-    "rules_angular_dev_dependencies",
+#
+# Download Bazel toolchain dependencies as needed by build actions
+#
+http_archive(
+    name = "build_bazel_rules_typescript",
+    sha256 = "1626ee2cc9770af6950bfc77dffa027f9aedf330fe2ea2ee7e504428927bd95d",
+    strip_prefix = "rules_typescript-0.17.0",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.17.0.zip",
 )
 
-# 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
-rules_angular_dev_dependencies()
-
-# Install transitive deps of rules_typescript
 load("@build_bazel_rules_typescript//:package.bzl", "rules_typescript_dependencies")
+
 rules_typescript_dependencies()
 
-# Install transitive deps of rules_nodejs
-load("@build_bazel_rules_nodejs//:package.bzl", "rules_nodejs_dependencies")
-rules_nodejs_dependencies()
+http_archive(
+    name = "bazel_toolchains",
+    sha256 = "c3b08805602cd1d2b67ebe96407c1e8c6ed3d4ce55236ae2efe2f1948f38168d",
+    strip_prefix = "bazel-toolchains-5124557861ebf4c0b67f98180bff1f8551e0b421",
+    urls = [
+        "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/5124557861ebf4c0b67f98180bff1f8551e0b421.tar.gz",
+        "https://github.com/bazelbuild/bazel-toolchains/archive/5124557861ebf4c0b67f98180bff1f8551e0b421.tar.gz",
+    ],
+)
+
+http_archive(
+    name = "io_bazel_rules_sass",
+    sha256 = "dbe9fb97d5a7833b2a733eebc78c9c1e3880f676ac8af16e58ccf2139cbcad03",
+    strip_prefix = "rules_sass-1.11.0",
+    url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip",
+)
+
+# This commit matches the version of buildifier in angular/ngcontainer
+# If you change this, also check if it matches the version in the angular/ngcontainer
+# version in /.circleci/config.yml
+BAZEL_BUILDTOOLS_VERSION = "49a6c199e3fbf5d94534b2771868677d3f9c6de9"
+
+http_archive(
+    name = "com_github_bazelbuild_buildtools",
+    sha256 = "edf39af5fc257521e4af4c40829fffe8fba6d0ebff9f4dd69a6f8f1223ae047b",
+    strip_prefix = "buildtools-%s" % BAZEL_BUILDTOOLS_VERSION,
+    url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % BAZEL_BUILDTOOLS_VERSION,
+)
+
+# Fetching the Bazel source code allows us to compile the Skylark linter
+http_archive(
+    name = "io_bazel",
+    sha256 = "ace8cced3b21e64a8fdad68508e9b0644201ec848ad583651719841d567fc66d",
+    strip_prefix = "bazel-0.17.1",
+    url = "https://github.com/bazelbuild/bazel/archive/0.17.1.zip",
+)
+
+http_archive(
+    name = "io_bazel_skydoc",
+    sha256 = "7bfb5545f59792a2745f2523b9eef363f9c3e7274791c030885e7069f8116016",
+    strip_prefix = "skydoc-fe2e9f888d28e567fef62ec9d4a93c425526d701",
+    # TODO: switch to upstream when https://github.com/bazelbuild/skydoc/pull/103 is merged
+    url = "https://github.com/alexeagle/skydoc/archive/fe2e9f888d28e567fef62ec9d4a93c425526d701.zip",
+)
+
+# We have a source dependency on the Devkit repository, because it's built with
+# Bazel.
+# This allows us to edit sources and have the effect appear immediately without
+# re-packaging or "npm link"ing.
+# Even better, things like aspects will visit the entire graph including
+# ts_library rules in the devkit repository.
+http_archive(
+    name = "angular_cli",
+    sha256 = "8cf320ea58c321e103f39087376feea502f20eaf79c61a4fdb05c7286c8684fd",
+    strip_prefix = "angular-cli-6.1.0-rc.0",
+    url = "https://github.com/angular/angular-cli/archive/v6.1.0-rc.0.zip",
+)
+
+http_archive(
+    name = "org_brotli",
+    sha256 = "774b893a0700b0692a76e2e5b7e7610dbbe330ffbe3fe864b4b52ca718061d5a",
+    strip_prefix = "brotli-1.0.5",
+    url = "https://github.com/google/brotli/archive/v1.0.5.zip",
+)
 
 #
 # Point Bazel to WORKSPACEs that live in subdirectories
 #
-http_archive(
+
+local_repository(
     name = "rxjs",
-    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
-    strip_prefix = "package/src",
-    sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
+    path = "node_modules/rxjs/src",
 )
 
 # Point to the integration test workspace just so that Bazel doesn't descend into it
@@ -49,9 +98,10 @@ local_repository(
 #
 # Load and install our dependencies downloaded above.
 #
-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
 
-check_bazel_version("0.18.0", """
+load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
+
+check_bazel_version("0.17.0", """
 If you are on a Mac and using Homebrew, there is a breaking change to the installation in Bazel 0.16
 See https://blog.bazel.build/2018/08/22/bazel-homebrew.html
 
@@ -61,12 +111,7 @@ node_repositories(
     node_version = "10.9.0",
     package_json = ["//:package.json"],
     preserve_symlinks = True,
-    yarn_version = "1.12.1",
-)
-
-local_repository(
-    name = "npm",
-    path = "tools/npm_workspace",
+    yarn_version = "1.9.2",
 )
 
 load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
@@ -102,3 +147,14 @@ sass_repositories()
 load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories")
 
 skydoc_repositories()
+
+##################################
+# Prevent Bazel from trying to build rxjs under angular devkit
+local_repository(
+    name = "rxjs_ignore_nested_1",
+    path = "node_modules/@angular-devkit/core/node_modules/rxjs/src",
+)
+local_repository(
+    name = "rxjs_ignore_nested_2",
+    path = "node_modules/@angular-devkit/schematics/node_modules/rxjs/src",
+)

aio/.gitignore

@@ -44,3 +44,6 @@ protractor-results*.txt
 # System Files
 .DS_Store
 Thumbs.db
+
+# copied dependencies
+src/assets/js/lunr*

aio/README.md

@@ -41,6 +41,8 @@ Here are the most important tasks you might need to use:
   - `yarn example-e2e --filter=foo` - limit e2e tests to those containing the word "foo"
   - `yarn example-e2e --setup --local` - run e2e tests with the local version of Angular contained in the "dist" folder
 
+* `yarn build-ie-polyfills` - generates a js file of polyfills that can be loaded in Internet Explorer.
+
 ## Developing on Windows
 The `packages/` directory may contain Linux-specific symlinks, which are not recognized by Windows.
 These unresolved links cause the docs generation process to fail because it cannot locate certain files.
@@ -48,7 +50,7 @@ These unresolved links cause the docs generation process to fail because it cann
 > Hint: The following steps require administration rights or [Windows Developer Mode](https://docs.microsoft.com/en-us/windows/uwp/get-started/enable-your-device-for-development) enabled!
 
 To fix this problem, run `scripts/windows/create-symlinks.sh`. This command creates temporary files where the symlinks used to be. Make sure not to commit those files with your documentation changes.
-When you are done making and testing your documentation changes, you can restore the original symlinks and delete the temporary files by running `scripts/windows/remove-symlinks.sh`.
+When you are done making and testing your documentation changes, you can restore the original symlinks and delete the temporary files by running `scripts/windows/remove-symlinks.sh`. 
 
 It's necessary to remove the temporary files, because otherwise they're displayed as local changes in your git working copy and certain operations are blocked.
 

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

@@ -7,7 +7,7 @@ import {CircleCiApi} from '../common/circle-ci-api';
 import {GithubApi} from '../common/github-api';
 import {GithubPullRequests} from '../common/github-pull-requests';
 import {GithubTeams} from '../common/github-teams';
-import {assert, assertNotMissingOrEmpty, computeShortSha, Logger} from '../common/utils';
+import {assert, assertNotMissingOrEmpty, Logger} from '../common/utils';
 import {BuildCreator} from './build-creator';
 import {ChangedPrVisibilityEvent, CreatedBuildEvent} from './build-events';
 import {BuildRetriever} from './build-retriever';
@@ -144,10 +144,7 @@ export class PreviewServerFactory {
         const artifactPath = await buildRetriever.downloadBuildArtifact(buildNum, pr, sha, cfg.buildArtifactPath);
         const isPublic = await buildVerifier.getPrIsTrusted(pr);
         await buildCreator.create(pr, sha, artifactPath, isPublic);
-
         res.sendStatus(isPublic ? 201 : 202);
-        logger.log(`PR:${pr}, SHA:${computeShortSha(sha)}, Build:${buildNum} - ` +
-                   `Successfully created ${isPublic ? 'public' : 'non-public'} preview.`);
       } catch (err) {
         logger.error('CircleCI webhook error', err);
         respondWithError(res, err);

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

@@ -46,7 +46,7 @@
     "@types/shelljs": "^0.8.0",
     "@types/supertest": "^2.0.5",
     "nodemon": "^1.18.3",
-    "npm-run-all": "^4.1.5",
+    "npm-run-all": "^4.1.3",
     "supertest": "^3.1.0",
     "tslint": "^5.11.0",
     "tslint-jasmine-noSkipOrFocus": "^1.0.9",

aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock

@@ -129,7 +129,7 @@ ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
 
-ansi-styles@^3.2.1:
+ansi-styles@^3.2.0, ansi-styles@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
   dependencies:
@@ -384,7 +384,7 @@ chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.1, chalk@^2.3.0, chalk@^2.4.1:
+chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   dependencies:
@@ -532,10 +532,9 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^6.0.5:
+cross-spawn@^6.0.4:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
   dependencies:
     nice-try "^1.0.4"
     path-key "^2.0.1"
@@ -1631,17 +1630,16 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-run-all@^4.1.5:
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba"
-  integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ==
+npm-run-all@^4.1.3:
+  version "4.1.3"
+  resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.3.tgz#49f15b55a66bb4101664ce270cb18e7103f8f185"
   dependencies:
-    ansi-styles "^3.2.1"
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
+    ansi-styles "^3.2.0"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.4"
     memorystream "^0.3.1"
     minimatch "^3.0.4"
-    pidtree "^0.3.0"
+    ps-tree "^1.1.0"
     read-pkg "^3.0.0"
     shell-quote "^1.6.1"
     string.prototype.padend "^3.0.0"
@@ -1788,11 +1786,6 @@ pause-stream@0.0.11:
   dependencies:
     through "~2.3"
 
-pidtree@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.0.tgz#f6fada10fccc9f99bf50e90d0b23d72c9ebc2e6b"
-  integrity sha512-9CT4NFlDcosssyg8KVFltgokyKZIFjoBxw8CTGy+5F38Y1eQWrt8tRayiUOXE+zVKQnYu5BR8JjCtvK3BcnBhg==
-
 pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"

aio/aio-builds-setup/docs/misc--integrate-with-ci.md

@@ -3,7 +3,7 @@
 
 TODO (gkalpak): Add docs. Mention:
 - Testing on CI.
-  Relevant files: `aio/aio-builds-setup/scripts/test.sh`
+  Relevant files: `scripts/ci/test-aio.sh`, `aio/aio-builds-setup/scripts/test.sh`
 - Deploying from CI.
   Relevant files: `.circleci/config.yml`, `scripts/ci/deploy.sh`, `aio/scripts/build-artifacts.sh`,
   `aio/scripts/deploy-to-firebase.sh`

aio/content/cli/index.md

@@ -11,13 +11,13 @@ Install the CLI using the `npm` package manager:
 npm install -g @angular/cli
 </code-example>
 
-For details about changes between versions, and information about updating from previous releases,
+For details about changes between versions, and information about updating from previous releases, 
 see the Releases tab on GitHub: https://github.com/angular/angular-cli/releases
 
 ## Basic workflow
 
-Invoke the tool on the command line through the `ng` executable.
-Online help is available on the command line.
+Invoke the tool on the command line through the `ng` executable. 
+Online help is available on the command line. 
 Enter the following to list commands or options for a given command (such as [generate](cli/generate)) with a short description.
 
 <code-example format="." language="bash">
@@ -34,34 +34,35 @@ 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
 
-The [ng new](cli/new) command creates an *Angular workspace* folder and generates a new app skeleton.
+The [ng new](cli/new) command creates an *Angular workspace* folder and generates a new app skeleton. 
 A workspace can contain multiple apps and libraries.
-The initial app created by the [ng new](cli/new) command is at the top level of the workspace.
+The initial app created by the [ng new](cli/new) command is at the top level of the workspace. 
 When you generate an additional app or library in a workspace, it goes into a `projects/` subfolder.
 
-A newly generated app contains the source files for a root module, with a root component and template.
+A newly generated app contains the source files for a root module, with a root component and template. 
 Each app has a `src` folder that contains the logic, data, and assets.
 
-You can edit the generated files directly, or add to and modify them using CLI commands.
-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.
+You can edit the generated files directly, or add to and modify them using CLI commands. 
+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).
 
-### Workspace and project configuration
+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.
 
-A single workspace configuration file, `angular.json`, is created at the top level of the workspace.
-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.
+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.
 
 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 more about [Workspace Configuration](guide/workspace-config).
 * 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)*. -->
+
 
 ## CLI command-language syntax
 
@@ -71,20 +72,20 @@ Command syntax is shown as follows:
 
 * Most commands, and some options, have aliases. Aliases are shown in the syntax statement for each command.
 
-* Option names are prefixed with a double dash (--).
-    Option aliases are prefixed with a single dash (-).
+* Option names are prefixed with a double dash (--). 
+    Option aliases are prefixed with a single dash (-). 
     Arguments are not prefixed.
     For example: `ng build my-app -c production`
 
-* Typically, the name of a generated artifact can be given as an argument to the command or specified with the --name option.
+* Typically, the name of a generated artifact can be given as an argument to the command or specified with the --name option. 
 
-* Argument and option names can be given in either
-[camelCase or dash-case](guide/glossary#case-types).
+* Argument and option names can be given in either 
+[camelCase or dash-case](guide/glossary#case-types). 
 `--myOptionName` is equivalent to `--my-option-name`.
 
 ### Boolean and enumerated options
 
-Boolean options have two forms: `--thisOption` sets the flag, `--noThisOption` clears it.
+Boolean options have two forms: `--thisOption` sets the flag, `--noThisOption` clears it.  
 If neither option is supplied, the flag remains in its default state, as listed in the reference documentation.
 
 Allowed values are given with each enumerated option description, with the default value in **bold**.
@@ -95,6 +96,7 @@ Options that specify files can be given as absolute paths, or as paths relative
 
 ### Schematics
 
-The [ng generate](cli/generate) and  [ng add](cli/add) commands take as an argument the artifact or library to be generated or added to the current project.
-In addition to any general options, each artifact or library defines its own options in a *schematic*.
-Schematic options are supplied to the command in the same format as immediate command options.
+The [ng generate](cli/generate) and  [ng add](cli/add) commands take as an argument the artifact or library to be generated or added to the current project. 
+In addition to any general options, each artifact or library defines its own options in a *schematic*. 
+Schematic options are supplied to the command in the same format as immediate command options. 
+

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

@@ -1,6 +1,6 @@
 'use strict'; // necessary for es6 output in node
 
-import { browser, ExpectedConditions as EC } from 'protractor';
+import { browser } from 'protractor';
 import { logging } from 'selenium-webdriver';
 import * as openClose from './open-close.po';
 import * as statusSlider from './status-slider.po';
@@ -25,8 +25,6 @@ describe('Animation Tests', () => {
   });
 
   describe('Open/Close Component', () => {
-    const closedHeight = '100px';
-    const openHeight = '200px';
 
     beforeAll(async () => {
       await openCloseHref.click();
@@ -34,37 +32,37 @@ describe('Animation Tests', () => {
     });
 
     it('should be open', async () => {
+      let text = await openClose.getComponentText();
       const toggleButton = openClose.getToggleButton();
       const container = openClose.getComponentContainer();
-      let text = await container.getText();
 
       if (text.includes('Closed')) {
         await toggleButton.click();
-        await browser.wait(async () => await container.getCssValue('height') === openHeight, 2000);
+        sleepFor();
       }
 
-      text = await container.getText();
+      text = await openClose.getComponentText();
       const containerHeight = await container.getCssValue('height');
 
       expect(text).toContain('The box is now Open!');
-      expect(containerHeight).toBe(openHeight);
+      expect(containerHeight).toBe('200px');
     });
 
     it('should be closed', async () => {
+      let text = await openClose.getComponentText();
       const toggleButton = openClose.getToggleButton();
       const container = openClose.getComponentContainer();
-      let text = await container.getText();
 
       if (text.includes('Open')) {
         await toggleButton.click();
-        await browser.wait(async () => await container.getCssValue('height') === closedHeight, 2000);
+        sleepFor();
       }
 
-      text = await container.getText();
+      text = await openClose.getComponentText();
       const containerHeight = await container.getCssValue('height');
 
       expect(text).toContain('The box is now Closed!');
-      expect(containerHeight).toBe(closedHeight);
+      expect(containerHeight).toBe('100px');
     });
 
     it('should log animation events', async () => {
@@ -74,7 +72,8 @@ describe('Animation Tests', () => {
       await toggleButton.click();
 
       const logs = await browser.manage().logs().get(logging.Type.BROWSER);
-      const animationMessages = logs.filter(({ message }) => message.includes('Animation'));
+
+      const animationMessages = logs.filter(({ message }) => message.indexOf('Animation') !== -1 ? true : false);
 
       expect(animationMessages.length).toBeGreaterThan(0);
     });
@@ -90,16 +89,16 @@ describe('Animation Tests', () => {
     });
 
     it('should be inactive with an orange background', async () => {
+      let text = await statusSlider.getComponentText();
       const toggleButton = statusSlider.getToggleButton();
       const container = statusSlider.getComponentContainer();
-      let text = await container.getText();
 
       if (text === 'Active') {
         await toggleButton.click();
-        await browser.wait(async () => await container.getCssValue('backgroundColor') === inactiveColor, 2000);
+        sleepFor(2000);
       }
 
-      text = await container.getText();
+      text = await statusSlider.getComponentText();
       const bgColor = await container.getCssValue('backgroundColor');
 
       expect(text).toBe('Inactive');
@@ -107,16 +106,16 @@ describe('Animation Tests', () => {
     });
 
     it('should be active with a blue background', async () => {
+      let text = await statusSlider.getComponentText();
       const toggleButton = statusSlider.getToggleButton();
       const container = statusSlider.getComponentContainer();
-      let text = await container.getText();
 
       if (text === 'Inactive') {
         await toggleButton.click();
-        await browser.wait(async () => await container.getCssValue('backgroundColor') === activeColor, 2000);
+        sleepFor(2000);
       }
 
-      text = await container.getText();
+      text = await statusSlider.getComponentText();
       const bgColor = await container.getCssValue('backgroundColor');
 
       expect(text).toBe('Active');
@@ -164,7 +163,10 @@ describe('Animation Tests', () => {
       const hero = heroesList.get(0);
 
       await hero.click();
-      await browser.wait(async () => await heroesList.count() < total, 2000);
+      await sleepFor(100);
+      const newTotal = await heroesList.count();
+
+      expect(newTotal).toBeLessThan(total);
     });
   });
 
@@ -188,7 +190,10 @@ describe('Animation Tests', () => {
       const hero = heroesList.get(0);
 
       await hero.click();
-      await browser.wait(async () => await heroesList.count() < total, 2000);
+      await sleepFor(250);
+      const newTotal = await heroesList.count();
+
+      expect(newTotal).toBeLessThan(total);
     });
   });
 
@@ -208,14 +213,14 @@ describe('Animation Tests', () => {
     it('should filter down the list when a search is performed', async () => {
       const heroesList = filterStagger.getHeroesList();
       const total = await heroesList.count();
-
       const formInput = filterStagger.getFormInput();
+
       await formInput.sendKeys('Mag');
-
-      await browser.wait(async () => await heroesList.count() === 2, 2000);
-
+      await sleepFor(500);
       const newTotal = await heroesList.count();
+
       expect(newTotal).toBeLessThan(total);
+      expect(newTotal).toBe(2);
     });
   });
 
@@ -243,7 +248,10 @@ describe('Animation Tests', () => {
       const hero = heroesList.get(0);
 
       await hero.click();
-      await browser.wait(async () => await heroesList.count() < total, 2000);
+      await sleepFor(300);
+      const newTotal = await heroesList.count();
+
+      expect(newTotal).toBeLessThan(total);
     });
   });
 });

aio/content/examples/animations/e2e/src/open-close.po.ts

@@ -23,3 +23,11 @@ export function getComponentContainer() {
   const findContainer = () => by.css('div');
   return locate(getComponent(), findContainer());
 }
+
+export async function getComponentText() {
+  const findContainerText = () => by.css('div');
+  const contents = locate(getComponent(), findContainerText());
+  const componentText = await contents.getText();
+
+  return componentText;
+}

aio/content/examples/animations/e2e/src/status-slider.po.ts

@@ -18,3 +18,11 @@ export function getComponentContainer() {
   const findContainer = () => by.css('div');
   return locate(getComponent(), findContainer());
 }
+
+export async function getComponentText() {
+  const findContainerText = () => by.css('div');
+  const contents = locate(getComponent(), findContainerText());
+  const componentText = await contents.getText();
+
+  return componentText;
+}

aio/content/examples/dynamic-component-loader/src/app/ad-banner.component.ts

@@ -9,7 +9,7 @@ import { AdComponent } from './ad.component';
   selector: 'app-ad-banner',
   // #docregion ad-host
   template: `
-              <div class="ad-banner-example">
+              <div class="ad-banner">
                 <h3>Advertisements</h3>
                 <ng-template ad-host></ng-template>
               </div>

aio/content/examples/dynamic-component-loader/src/assets/sample.css

@@ -18,6 +18,6 @@
   color: black;
 }
 
-.ad-banner-example {
+.ad-banner {
   width: 400px;
 }

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

@@ -1,23 +1,12 @@
 'use strict'; // necessary for es6 output in node
 
-import { browser, by, element, ElementFinder, ExpectedConditions as EC } from 'protractor';
+import { browser, by, element } from 'protractor';
 
 /* tslint:disable:quotemark */
 describe('Elements', () => {
   const messageInput = element(by.css('input'));
   const popupButtons = element.all(by.css('button'));
 
-  // Helpers
-  const click = (elem: ElementFinder) => {
-    // Waiting for the element to be clickable, makes the tests less flaky.
-    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(''));
 
   describe('popup component', () => {
@@ -28,7 +17,7 @@ describe('Elements', () => {
     it('should be displayed on button click', () => {
       expect(popupComponent.isPresent()).toBe(false);
 
-      click(popupComponentButton);
+      popupComponentButton.click();
       expect(popupComponent.isPresent()).toBe(true);
     });
 
@@ -36,9 +25,7 @@ describe('Elements', () => {
       messageInput.clear();
       messageInput.sendKeys('Angular rocks!');
 
-      click(popupComponentButton);
-      waitForText(popupComponent);
-
+      popupComponentButton.click();
       expect(popupComponent.getText()).toContain('Popup: Angular rocks!');
     });
 
@@ -46,7 +33,7 @@ describe('Elements', () => {
       popupComponentButton.click();
       expect(popupComponent.isPresent()).toBe(true);
 
-      click(closeButton);
+      closeButton.click();
       expect(popupComponent.isPresent()).toBe(false);
     });
   });
@@ -59,7 +46,7 @@ describe('Elements', () => {
     it('should be displayed on button click', () => {
       expect(popupElement.isPresent()).toBe(false);
 
-      click(popupElementButton);
+      popupElementButton.click();
       expect(popupElement.isPresent()).toBe(true);
     });
 
@@ -67,9 +54,7 @@ describe('Elements', () => {
       messageInput.clear();
       messageInput.sendKeys('Angular rocks!');
 
-      click(popupElementButton);
-      waitForText(popupElement);
-
+      popupElementButton.click();
       expect(popupElement.getText()).toContain('Popup: Angular rocks!');
     });
 
@@ -77,7 +62,7 @@ describe('Elements', () => {
       popupElementButton.click();
       expect(popupElement.isPresent()).toBe(true);
 
-      click(closeButton);
+      closeButton.click();
       expect(popupElement.isPresent()).toBe(false);
     });
   });

aio/content/examples/forms/src/app/hero-form/hero-form.component.html

@@ -72,15 +72,15 @@
     <h2>You submitted the following:</h2>
     <div class="row">
       <div class="col-xs-3">Name</div>
-      <div class="col-xs-9">{{ model.name }}</div>
+      <div class="col-xs-9  pull-left">{{ model.name }}</div>
     </div>
     <div class="row">
       <div class="col-xs-3">Alter Ego</div>
-      <div class="col-xs-9">{{ model.alterEgo }}</div>
+      <div class="col-xs-9 pull-left">{{ model.alterEgo }}</div>
     </div>
     <div class="row">
       <div class="col-xs-3">Power</div>
-      <div class="col-xs-9">{{ model.power }}</div>
+      <div class="col-xs-9 pull-left">{{ model.power }}</div>
     </div>
     <br>
     <button class="btn btn-primary" (click)="submitted=false">Edit</button>

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 Syntax');
+    expect(bound.getText()).toContain('Template alert("0wned") Syntax');
     let bold = element(By.css('.e2e-inner-html-bound b'));
     expect(bold.getText()).toContain('Syntax');
   });

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

@@ -7,8 +7,7 @@
 	box-sizing: border-box;
 }
 h3 {
-  text-align: center;
-  margin-bottom: 0;
+  text-align: center; margin-bottom: 0;
 }
 [class*='col-'] {
   padding-right: 20px;

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

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

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

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

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

@@ -16,8 +16,7 @@ a {
   box-sizing: border-box;
 }
 h3 {
-  text-align: center;
-  margin-bottom: 0;
+  text-align: center; margin-bottom: 0;
 }
 h4 {
   position: relative;

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

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

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

@@ -16,8 +16,7 @@ a {
   box-sizing: border-box;
 }
 h3 {
-  text-align: center;
-  margin-bottom: 0;
+  text-align: center; margin-bottom: 0;
 }
 h4 {
   position: relative;

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

@@ -3,7 +3,7 @@
   border-bottom: 1px solid gray;
   border-left: 1px solid gray;
   border-right: 1px solid gray;
-  width: 195px;
+  width:195px;
   height: 16px;
   padding: 5px;
   background-color: white;

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

@@ -2,7 +2,7 @@
   <h4>Hero Search</h4>
 
   <!-- #docregion input -->
-  <input #searchBox id="search-box" (input)="search(searchBox.value)" />
+  <input #searchBox id="search-box" (keyup)="search(searchBox.value)" />
   <!-- #enddocregion input -->
 
   <ul class="search-result">

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(_ => this.log('fetched heroes')),
+        tap(heroes => this.log('fetched heroes')),
         // #docregion getHeroes-2
         catchError(this.handleError('getHeroes', []))
       );

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

@@ -1,11 +1,7 @@
 // #docregion , init
 import { InMemoryDbService } from 'angular-in-memory-web-api';
 import { Hero } from './hero';
-import { Injectable } from '@angular/core';
 
-@Injectable({
-  providedIn: 'root',
-})
 export class InMemoryDataService implements InMemoryDbService {
   createDb() {
     const heroes = [

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

@@ -16,8 +16,7 @@ a {
   box-sizing: border-box;
 }
 h3 {
-  text-align: center;
-  margin-bottom: 0;
+  text-align: center; margin-bottom: 0;
 }
 h4 {
   position: relative;

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

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

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

@@ -3,7 +3,7 @@
   border-bottom: 1px solid gray;
   border-left: 1px solid gray;
   border-right: 1px solid gray;
-  width: 195px;
+  width:195px;
   height: 16px;
   padding: 5px;
   background-color: white;

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

@@ -1,7 +1,7 @@
 <div id="search-component">
   <h4>Hero Search</h4>
 
-  <input #searchBox id="search-box" (input)="search(searchBox.value)" />
+  <input #searchBox id="search-box" (keyup)="search(searchBox.value)" />
 
   <ul class="search-result">
     <li *ngFor="let hero of heroes | async" >

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, ElementArrayFinder, ElementFinder } from 'protractor';
+import { browser, element, by, ElementFinder } from 'protractor';
 
 // Angular E2E Testing Guide:
 // https://docs.angularjs.org/guide/e2e-testing
@@ -20,12 +20,6 @@ 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');
     });
@@ -34,16 +28,13 @@ 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);
     });
 
@@ -60,7 +51,6 @@ 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',
@@ -76,16 +66,10 @@ 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');
-      waitForCount(phoneList, 1);
 
-      let nexusPhone = phoneList.first();
-      let detailLink = nexusPhone.all(by.css('a')).first()
-
-      detailLink.click();
+      element.all(by.css('.phones li a')).first().click();
       expect(browser.getLocationAbsUrl()).toBe('/phones/nexus-s');
     });
 

aio/content/file-not-found.md

@@ -3,7 +3,7 @@
 <div class="nf-container l-flex-wrap flex-center">
     <img src="assets/images/support/angular-404.svg" width="300" height="300"/>
     <div class="nf-response l-flex-wrap">
-        <h1 class="no-anchor no-toc">Page Not Found</h1>
+        <h1 class="no-toc">Page Not Found</h1>
         <p>We're sorry. The page you are looking for cannot be found.</p>
     </div>
 </div>

aio/content/guide/architecture-modules.md

@@ -56,9 +56,7 @@ A component and its template together define a *view*. A component can contain a
 When you create a component, it's associated directly with a single view, called the *host view*. The host view can be the root of a view hierarchy, which can contain *embedded views*, which are in turn the host views of other components. Those components can be in the same NgModule, or can be imported from other NgModules. Views in the tree can be nested to any depth.
 
 <div class="alert is-helpful">
-
-**Note:** The hierarchical structure of views is a key factor in the way Angular detects and responds to changes in the DOM and app data.
-
+    **Note:** The hierarchical structure of views is a key factor in the way Angular detects and responds to changes in the DOM and app data. 
 </div>
 
 ## NgModules and JavaScript modules

aio/content/guide/architecture-services.md

@@ -48,7 +48,7 @@ Similarly, use the `@Injectable()` decorator to indicate that a component or oth
 
 * An injector creates dependencies, and maintains a *container* of dependency instances that it reuses if possible.
 
-* A *provider* is an object that tells an injector how to obtain or create a dependency.
+* A *provider* is an object that tell an injector how to obtain or create a dependency.
 
 For any dependency that you need in your app, you must register a provider with the app's injector, 
 so that the injector can use the provider to create new instances. 

aio/content/guide/build.md

@@ -32,11 +32,11 @@ For example:
 
 The base file `environment.ts`, contains the default environment settings. For example:
 
-```
+<code-example language="none" class="code-shell">
 export const environment = {
   production: false
 };
-```
+</code-example>
 
 The `build` command uses this as the build target when no environment is specified. 
 You can add further variables, either as additional properties on the environment object, or as separate objects. 
@@ -144,11 +144,7 @@ You can add additional configurations as required. To add a staging environment,
 You can add more configuration options to this target environment as well. 
 Any option that your build supports can be overridden in a build target configuration.
 
-To build using the staging configuration, run the following command:
-
-<code-example language="sh" class="code-shell">
- ng build --configuration=staging
-</code-example>
+To build using the staging configuration, run `ng build --configuration=staging`.
 
 You can also configure the `serve` command to use the targeted build configuration if you add it to the "serve:configurations" section of `angular.json`:
 
@@ -272,7 +268,7 @@ Each budget entry is a JSON object with the following properties:
 The CLI uses [Autoprefixer](https://github.com/postcss/autoprefixer) to ensure compatibility with different browser and browser versions. 
 You may find it necessary to target specific browsers or exclude certain browser versions from your build.
 
-Internally, Autoprefixer relies on a library called [Browserslist](https://github.com/browserslist/browserslist) to figure out which browsers to support with prefixing. 
+Internally, Autoprefixer relies on a library called [Browserslist(https://github.com/ai/browserslist)] to figure out which browsers to support with prefixing. 
 Browserlist looks for configuration options in a `browserlist` property of the package configuration file, or in a configuration file named `.browserslistrc`. 
 Autoprefixer looks for the Browserlist configuration when it prefixes your CSS. 
 
@@ -291,7 +287,7 @@ Autoprefixer looks for the Browserlist configuration when it prefixes your CSS.
  last 2 versions
 ```
 
-See the [browserslist repo](https://github.com/browserslist/browserslist) for more examples of how to target specific browsers and versions.
+See the [browserslist repo](https://github.com/ai/browserslist) for more examples of how to target specific browsers and versions.
 
 <div class="alert is-helpful">
 Backward compatibility

aio/content/guide/deployment.md

@@ -1,19 +1,19 @@
 # Deployment
 
 When you are ready to deploy your Angular application to a remote server, you have various options for
-deployment.
+deployment. 
 
 {@a dev-deploy}
 {@a copy-files}
 
 ## Simplest deployment possible
 
-For the simplest deployment, create a production build and copy the output directory to a web server.
+For the simplest deployment, build for development and copy the output directory to a web server.
 
-1. Start with the production build:
+1. Start with the development build:
 
   <code-example language="none" class="code-shell">
-    ng build --prod
+    ng build
   </code-example>
 
 
@@ -22,7 +22,8 @@ For the simplest deployment, create a production build and copy the output direc
 3. Configure the server to redirect requests for missing files to `index.html`.
 Learn more about server-side redirects [below](#fallback).
 
-This is the simplest production-ready deployment of your application.
+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).
 
 {@a deploy-to-github}
 
@@ -30,7 +31,7 @@ This is the simplest production-ready deployment of your application.
 
 Another simple way to deploy your Angular app is to use [GitHub Pages](https://help.github.com/articles/what-is-github-pages/).
 
-1. You need to [create a GitHub account](https://github.com/join) if you don't have one, and then [create a repository](https://help.github.com/articles/create-a-repo/) for your project.
+1. You need to [create a GitHub account](https://github.com/join) if you don't have one, and then [create a repository](https://help.github.com/articles/create-a-repo/) for your project. 
 Make a note of the user name and project name in GitHub.
 
 1. Build your project using Github project name, with the Angular CLI command [`ng build`](cli/build) and the options shown here:
@@ -38,9 +39,9 @@ Make a note of the user name and project name in GitHub.
      ng build --prod --output-path docs --base-href <project_name>
     </code-example>
 
-1. When the build is complete, make a copy of `docs/index.html` and name it `docs/404.html`.
+1. When the build is complete, make a copy of `docs/index.html` and name it `docs/404.html`. 
 
-1. Commit your changes and push.
+1. Commit your changes and push. 
 
 1. On the GitHub project page, configure it to [publish from the docs folder](https://help.github.com/articles/configuring-a-publishing-source-for-github-pages/#publishing-your-github-pages-site-from-a-docs-folder-on-your-master-branch).
 
@@ -96,6 +97,51 @@ 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/):
@@ -184,9 +230,19 @@ Read about how to enable CORS for specific servers at
 
 {@a optimize}
 
-## Production optimizations
+## Optimize for production
 
-The `--prod` _meta-flag_ engages the following build optimization features.
+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.
 
 * [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_.
@@ -195,22 +251,25 @@ The `--prod` _meta-flag_ engages the following build optimization features.
 * Uglification: rewrites code to use short, cryptic variable and function names.
 * Dead code elimination: removes unreferenced modules and much unused code.
 
-See [`ng build`](cli/build) for more about CLI build options and what they do.
+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 runtime production mode
+### Enable production mode
 
-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:
+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_ makes it run faster by disabling development specific checks such as the dual change detection cycles.
+Switching to _production mode_ can make it run faster by disabling development specific checks such as the dual change detection cycles.
 
-When you enable production builds via `--prod` command line flag, the runtime production mode is enabled as well.
+Building for production (or appending the `--environment=prod` flag) enables _production mode_
+Look at the CLI-generated `main.ts` to see how this works.
 
 {@a lazy-loading}
 
@@ -234,7 +293,7 @@ If you do that, the module will be loaded immediately.
 
 The bundling configuration must take lazy loading into consideration.
 Because lazy-loaded modules aren't imported in JavaScript, bundlers exclude them by default.
-Bundlers don't know about the router configuration and can't create separate bundles for lazy-loaded modules.
+Bundlers don't know about the router configuration and can't create separate bundles for lazy-loaded modules. 
 You would have to create these bundles manually.
 
 The CLI runs the
@@ -329,7 +388,7 @@ for the missing files. Look at where it _tried_ to find those files and adjust t
 
 ## Building and serving for deployment
 
-When you are designing and developing applications, you typically use `ng serve` to build your app for fast, local, iterative development.
+When you are designing and developing applications, you typically use `ng serve` to build your app for fast, local, iterative development. 
 When you are ready to deploy, however, you must use the `ng build` command to build the app and deploy the build artifacts elsewhere.
 
 Both `ng build` and `ng serve` clear the output folder before they build the project, but only the `ng build` command writes the generated build artifacts to the output folder.
@@ -342,12 +401,12 @@ To output to a different folder, change the `outputPath` in `angular.json`.
 </div>
 
 The `ng serve` command builds, watches, and serves the application from local memory, using a local development server.
-When you have deployed your app to another server, however, you might still want to serve the app so that you can continue to see changes that you make in it.
+When you have deployed your app to another server, however, you might still want to serve the app so that you can continue to see changes that you make in it. 
 You can do this by adding the `--watch` option to the `ng build` command.
 
 ```
 ng build --watch
 ```
-Like the `ng serve` command, this regenerates output files when source files change.
+Like the `ng serve` command, this regenerates output files when source files change. 
 
 For complete details of the CLI commands, see the [CLI command reference](cli).

aio/content/guide/displaying-data.md

@@ -357,7 +357,7 @@ big chunks of HTML with many data bindings.
 
 
 Try it out. Because the array has four items, the message should appear.
-Go back into <code>app.component.ts</code> and delete or comment out one of the elements from the hero array.
+Go back into <code>app.component.ts"</code> and delete or comment out one of the elements from the hero array.
 The browser should refresh automatically and the message should disappear.
 
 

aio/content/guide/dynamic-component-loader.md

@@ -192,7 +192,7 @@ Here are two sample components and the `AdComponent` interface for reference:
  The final ad banner looks like this:
 
 <figure>
-  <img src="generated/images/guide/dynamic-component-loader/ads-example.gif" alt="Ads">
+  <img src="generated/images/guide/dynamic-component-loader/ads.gif" alt="Ads">
 </figure>
 
 

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>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>
+  <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>
 </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 `CustomerDashboardComponent`:
+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`:
 
 <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,15 +20,16 @@ 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 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). |
+| `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/).  |
 | `node_modules`         | Provides [npm packages](guide/npm-packages) to the entire 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. |
+| `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. |
+| `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 a [CLI configuration context](guide/workspace-config). 
+All projects within a workspace share this configuration context. 
 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
@@ -39,9 +40,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://angularconsole.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>
 
@@ -103,6 +104,18 @@ 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/forms-overview.md

@@ -1,21 +1,21 @@
 # Introduction to forms in Angular
 
-Handling user input with forms is the cornerstone of many common applications. Applications use forms to enable users to log in, to update a profile, to enter sensitive information, and to perform many other data-entry tasks. 
+Handling user input with forms is the cornerstone of many common applications. Applications use forms to enable users log in, to update a profile, to enter sensitive information, and to perform many other data-entry tasks. 
 
 Angular provides two different approaches to handling user input through forms: reactive and template-driven. Both capture user input events from the view, validate the user input, create a form model and data model to update, and provide a way to track changes. 
 
-Reactive and template-driven forms process and manage form data differently. Each offers different advantages.
+Reactive and template-driven forms differ, however, in how they do the work of processing and managing forms and form data. Each offers different advantages.
 
 **In general:**
 
-* **Reactive forms** are more robust: they're more scalable, reusable, and testable. If forms are a key part of your application, or you're already using reactive patterns for building your application, use reactive forms.
-* **Template-driven forms** are useful for adding a simple form to an app, such as an email list signup form. They're easy to add to an app, but they don't scale as well as reactive forms. If you have very basic form requirements and logic that can be managed solely in the template, use template-driven forms.
+* **Reactive forms** are more robust: they are more scalable, reusable, and testable. If forms are a key part of your application, or you're already using reactive patterns for building your application, use reactive forms.
+* **Template-driven forms** are useful for adding a simple form to an app, such as an email list signup form. They are easy to add to an app, but they do not scale as well as reactive forms. If you have very basic form requirements and logic that can be managed solely in the template, use template-driven forms.
 
-This guide provides information to help you decide which type of form works best for your situation. It introduces the common building blocks used by both approaches. It also summarizes the key differences between the two approaches, and demonstrates those differences in the context of setup, data flow, and testing.
+This guide provides information to help you decide which approach works best for your situation. It introduces the common building blocks used by both approaches. It also summarizes the key differences between the two approaches, and demonstrates those differences in the context of setup, data flow, and testing.
 
-<div class="alert is-helpful">
+<div class="alert is-important">
 
-**Note:** For complete information about each kind of form, see [Reactive Forms](guide/reactive-forms) and [Template-driven Forms](guide/forms).
+*Note:* For complete information about each kind of form, see the [Reactive Forms](guide/reactive-forms) and [Template-driven Forms](guide/forms) guides.
 
 </div>
 
@@ -30,7 +30,7 @@ The table below summarizes the key differences between reactive and template-dri
 
 ||Reactive|Template-driven|
 |--- |--- |--- |
-|Setup (form model)|More explicit, created in component class|Less explicit, created by directives|
+|Setup (form model)|More explicit, created in the component class.|Less explicit, created by the directives.|
 |Data model|Structured|Unstructured|
 |Predictability|Synchronous|Asynchronous|
 |Form validation|Functions|Directives|
@@ -41,41 +41,35 @@ The table below summarizes the key differences between reactive and template-dri
 
 Both reactive and template-driven forms share underlying building blocks. 
 
+- A `FormControl` instance that tracks the value and validation status of an individual form control.
+- A `FormGroup` instance that tracks the same values and status for a collection of form controls.
+- A `FormArray` instance that tracks the same values and status for an array of form controls.
+- A `ControlValueAccessor` that creates a bridge between Angular `FormControl` instances and native DOM elements.
 
-* `FormControl` tracks the value and validation status of an individual form control.
+How these control instances are created and managed with reactive and template-driven forms is introduced in the [form model setup](#setup-the-form-model) section below and detailed further in the [data flow section](#data-flow-in-forms) of this guide.
 
-* `FormGroup` tracks the same values and status for a collection of form controls.
+## Setup: The form model
 
-* `FormArray` tracks the same values and status for an array of form controls.
-
-* `ControlValueAccessor` creates a bridge between Angular `FormControl` instances and native DOM elements.
-
-See the [Form model setup](#setup-the-form-model) section below for an introduction to how these control instances are created and managed with reactive and template-driven forms. Further details are provided in the [data flow section](#data-flow-in-forms) of this guide.
-
-{@a setup-the-form-model}
-
-## Form model setup
-
-Reactive and template-driven forms both use a form model to track value changes between Angular forms and form input elements. The examples below show how the form model is defined and created.
+Reactive and template-driven forms both use a form model to track value changes between Angular forms and form input elements.  The examples below show how the form model is defined and created.
 
 ### Setup in reactive forms
 
-Here's a component with an input field for a single control implemented using reactive forms.
+Here is a component with an input field for a single control implemented using reactive forms.
 
 <code-example path="forms-overview/src/app/reactive/favorite-color/favorite-color.component.ts">
 </code-example>
 
-The source of truth provides the value and status of the form element at a given point in time. In reactive forms, the form model is the source of truth. In the example above, the form model is the `FormControl` instance.
+The source of truth provides the value and status of the form element at a given point in time. In reactive forms, the form model is source of truth. The form model in the above example is the `FormControl` instance.
 
 <figure>
   <img src="generated/images/guide/forms-overview/key-diff-reactive-forms.png" alt="Reactive forms key differences">
 </figure>
 
-With reactive forms, the form model is explicitly defined in the component class. The reactive form directive (in this case, `FormControlDirective`) then links the existing `FormControl` instance to a specific form element in the view using a value accessor (`ControlValueAccessor` instance). 
+With reactive forms, the form model is explicitly defined in the component class. The reactive form directive (in this case, `FormControlDirective`) then links the existing form control instance to a specific form element in the view using a value accessor (instance of `ControlValueAccessor`). 
 
 ### Setup in template-driven forms
 
-Here's the same component with an input field for a single control implemented using template-driven forms.
+Here is the same component with an input field for a single control implemented using template-driven forms.
 
 <code-example path="forms-overview/src/app/template/favorite-color/favorite-color.component.ts">
 </code-example>
@@ -86,25 +80,23 @@ In template-driven forms, the source of truth is the template.
   <img src="generated/images/guide/forms-overview/key-diff-td-forms.png" alt="Template-driven forms key differences">
 </figure>
 
-The abstraction of the form model promotes simplicity over structure. The template-driven form directive `NgModel` is responsible for creating and managing the `FormControl` instance for a given form element. It's less explicit, but you no longer have direct control over the form model. 
-
-{@a data-flow-in-forms}
+The abstraction of the form model promotes simplicity over structure. The template-driven form directive `NgModel` is responsible for creating and managing the form control instance for a given form element. It is less explicit, but you no longer have direct control over the form model. 
 
 ## Data flow in forms
 
-When building forms in Angular, it's important to understand how the framework handles data flowing from the user or from programmatic changes. Reactive and template-driven forms follow two different strategies when handling form input. The data flow examples below begin with the favorite color input field example from above, and then show how changes to favorite color are handled in reactive forms compared to template-driven forms.
+When building forms in Angular, it's important to understand how the framework handles data flowing from the user or from programmatic changes. Reactive and template-driven forms follow two different strategies when handling form input. The data flow examples below begin with the favorite color input field example from above, and they show how changes to favorite color are handled in reactive forms compared to template-driven forms.
 
 ### Data flow in reactive forms
 
-As described above, in reactive forms each form element in the view is directly linked to a form model (`FormControl` instance). Updates from the view to the model and from the model to the view are synchronous and aren't dependent on the UI rendered. The diagrams below use the same favorite color example to demonstrate how data flows when an input field's value is changed from the view and then from the model.
+As described above, in reactive forms each form element in the view is directly linked to a form model (`FormControl` instance). Updates from the view to model and model to view are synchronous and not dependent on the UI rendered. The diagrams below use the same favorite color example to demonstrate how data flows when an input field's value is changed from the view and then from the model.
 
 <figure>
   <img src="generated/images/guide/forms-overview/dataflow-reactive-forms-vtm.png" alt="Reactive forms data flow - view to model" width="100%">
 </figure>
 
-The steps below outline the data flow from view to model.
+The steps below outline the view to model data flow.
 
-1. The user types a value into the input element, in this case the favorite color *Blue*.
+1. The end user types a value into the input element, in this case the favorite color "Blue".
 1. The form input element emits an "input" event with the latest value.
 1. The control value accessor listening for events on the form input element immediately relays the new value to the `FormControl` instance.
 1. The `FormControl` instance emits the new value through the `valueChanges` observable.
@@ -114,37 +106,37 @@ The steps below outline the data flow from view to model.
   <img src="generated/images/guide/forms-overview/dataflow-reactive-forms-mtv.png" alt="Reactive forms data flow - model to view" width="100%">
 </figure>
 
-The steps below outline the data flow from model to view.
+The steps below outline the model to view data flow.
 
-1. The user calls the `favoriteColorControl.setValue()` method, which updates the `FormControl` value.
+1. The `favoriteColorControl.setValue()` method is called, which updates the `FormControl` value.
 1. The `FormControl` instance emits the new value through the `valueChanges` observable.
 1. Any subscribers to the `valueChanges` observable receive the new value.
 1. The control value accessor on the form input element updates the element with the new value.
 
 ### Data flow in template-driven forms
 
-In template-driven forms, each form element is linked to a directive that manages the form model internally. The diagrams below use the same favorite color example to demonstrate how data flows when an input field's value is changed from the view and then from the model.
+In template-driven forms, each form element is linked to a directive that manages the form model internally. The diagrams below uses the same favorite color example to demonstrate how data flows when an input field's value is changed from the view and then from the model.
 
 <figure>
-  <img src="generated/images/guide/forms-overview/dataflow-td-forms-vtm.png" alt="Template-driven forms data flow - view to model" width="100%">
+  <img src="generated/images/guide/forms-overview/dataflow-td-forms-vtm.png" alt="Template-driven forms view to model data flow" width="100%">
 </figure>
 
-The steps below outline the data flow from view to model when the input value changes from *Red* to *Blue*.
+The steps below outline the view to model data flow.
 
-1. The user types *Blue* into the input element.
-1. The input element emits an "input" event with the value *Blue*.
+1. The end user types "Blue" into the input element.
+1. The input element emits an "input" event with the value "Blue".
 1. The control value accessor attached to the input triggers the `setValue()` method on the `FormControl` instance.
 1. The `FormControl` instance emits the new value through the `valueChanges` observable.
 1. Any subscribers to the `valueChanges` observable receive the new value.
-1. The control value accessor also calls the `NgModel.viewToModelUpdate()` method which emits an `ngModelChange` event.
-1. Because the component template uses two-way data binding for the `favoriteColor` property, the `favoriteColor` property in the component 
-is updated to the value emitted  by the `ngModelChange` event (*Blue*).
+1. The control value accessor also calls the `NgModel.viewToModel()` method which emits an `ngModelChange` event.
+1. Because the component template uses two-way data binding for the `favoriteColor`, the `favoriteColor` property in the component 
+is updated to the value emitted  by the `ngModelChange` event ("Blue").
 
 <figure>
-  <img src="generated/images/guide/forms-overview/dataflow-td-forms-mtv.png" alt="Template-driven forms data flow - model to view" width="100%">
+  <img src="generated/images/guide/forms-overview/dataflow-td-forms-mtv.png" alt="Template-driven forms model to view data flow" width="100%">
 </figure>
 
-The steps below outline the data flow from model to view when the `favoriteColor` changes from *Blue* to *Red*.
+The steps below outline the model to view data flow.
 
 1. The `favoriteColor` value is updated in the component.
 1. Change detection begins.
@@ -158,117 +150,110 @@ The steps below outline the data flow from model to view when the `favoriteColor
 
 ## Form validation
 
-Validation is an integral part of managing any set of forms. Whether you're checking for required fields or querying an external API for an existing username, Angular provides a set of built-in validators as well as the ability to create custom validators.
+Validation is an integral part of managing any set of forms. Whether you’re checking for required fields or querying an external API for an existing username, Angular provides a set of built-in validators as well as the ability to create custom validators.
 
 * **Reactive forms** define custom validators as **functions** that receive a control to validate.
 * **Template-driven forms** are tied to template **directives**, and must provide custom validator directives that wrap validation functions.
 
-For more information, see [Form Validation](guide/form-validation).
+For more on form validation, see the [Form Validation](guide/form-validation) guide.
 
 ## Testing 
 
-Testing plays a large part in complex applications and a simpler testing strategy is useful when validating that your forms function correctly. Reactive forms and template-driven forms have different levels of reliance on rendering the UI to perform assertions based on form control and form field changes. The following examples demonstrate the process of testing forms with reactive and template-driven forms.
+Testing also plays a large part in complex applications and an easier testing strategy is always welcomed. One difference in testing reactive forms and template-driven forms is their reliance on rendering the UI in order to perform assertions based on form control and form field changes. The following examples demonstrate the process of testing forms with reactive and template-driven forms.
 
 ### Testing reactive forms
 
-Reactive forms provide a relatively easy testing strategy because they provide synchronous access to the form and data models, and they can be tested without rendering the UI. In these tests, status and data are queried and manipulated through the control without interacting with the change detection cycle.
+Reactive forms provide a relatively easy testing strategy because they provide synchronous access to the form and data models, and they can be tested without rendering the UI. In these set of tests, controls and data are queried and manipulated through the control without interacting with the change detection cycle.
 
-The following tests use the favorite color components mentioned earlier to verify the data flows from view to model and model to view for a reactive form.
+The following tests use the favorite color components mentioned earlier to verify the view to model and model to view data flows for a reactive form.
 
-The following test verifies the data flow from view to model.
+The following test verifies the view to model data flow:
 
 <code-example path="forms-overview/src/app/reactive/favorite-color/favorite-color.component.spec.ts" region="view-to-model" header="Favorite color test - view to model">
 </code-example>
 
-Here are the steps performed in the view to model test.
+The steps performed in the view to model test.
 
 1. Query the view for the form input element, and create a custom "input" event for the test.
-1. Set the new value for the input to *Red*, and dispatch the "input" event on the form input element.
-1. Assert that the component's `favoriteColorControl` value matches the value from the input.
+1. Set the new value for the input is set to *Red*, and dispatch the "input" event on the form input element.
+1. Assert that the `favoriteColor` `FormControl` instance value matches the value from the input.
 
-The following test verifies the data flow from model to view.
+The following test verifies the model to view data flow:
 
 <code-example path="forms-overview/src/app/reactive/favorite-color/favorite-color.component.spec.ts" region="model-to-view" header="Favorite color test - model to view">
 </code-example>
 
-Here are the steps performed in the model to view test.
+The steps performed in the model to view test.
 
-1. Use the `favoriteColorControl`, a `FormControl` instance, to set the new value.
+1. Use the `favoriteColor` `FormControl` instance to set the new value.
 1. Query the view for the form input element.
 1. Assert that the new value set on the control matches the value in the input.
 
 ### Testing template-driven forms
 
-Writing tests with template-driven forms requires a detailed knowledge of the change detection process and an understanding of how directives run on each cycle to ensure that elements are queried, tested, or changed at the correct time.
+Writing tests with template-driven forms requires more detailed knowledge of the change detection process and how directives run on each cycle to ensure elements are queried, tested, or changed at the correct time.
 
-The following tests use the favorite color components mentioned earlier to verify the data flows from view to model and model to view for a template-driven form.
+The following tests use the favorite color components mentioned earlier to verify the view to model and model to view data flows for a template-driven form.
 
-The following test verifies the data flow from view to model.
+The following test verifies the view to model data flow:
 
 <code-example path="forms-overview/src/app/template/favorite-color/favorite-color.component.spec.ts" region="view-to-model" header="Favorite color test - view to model">
 </code-example>
 
-Here are the steps performed in the view to model test.
+The steps performed in the view to model test.
 
 1. Query the view for the form input element, and create a custom "input" event for the test.
-1. Set the new value for the input to *Red*, and dispatch the "input" event on the form input element.
+1. Set the new value for the input is set to *Red*, and dispatch the "input" event on the form input element.
 1. Run change detection through the test fixture.
 1. Assert that the component `favoriteColor` property value matches the value from the input.
 
-The following test verifies the data flow from model to view.
+The following test verifies the model to view data flow:
 
 <code-example path="forms-overview/src/app/template/favorite-color/favorite-color.component.spec.ts" region="model-to-view" header="Favorite color test - model to view">
 </code-example>
 
-Here are the steps performed in the model to view test.
+The steps performed in the model to view test.
 
-1. Use the component instance to set the value of the `favoriteColor` property.
+1. Use the component instance to set the value of `favoriteColor` property.
 1. Run change detection through the test fixture.
-1. Use the `tick()` method to simulate the passage of time within the `fakeAsync()` task.
+1. Use the `tick()` method to simulate passage of time within the `fakeAsync()` task.
 1. Query the view for the form input element.
-1. Assert that the input value matches the value of the `favoriteColor` property in the component instance.
+1. Assert that the input value matches the `favoriteColor` value property in the component instance.
 
 ## Mutability
 
-The change tracking method plays a role in the efficiency of your application.
+How changes are tracked plays a role in the efficiency of your application.
 
-
-* **Reactive forms** keep the data model pure by providing it as an immutable data structure. Each time a change is triggered on the data model, the `FormControl` instance returns a new data model rather than updating the existing data model. This gives you the ability to track unique changes to the data model through the control's observable. This provides one way for change detection to be more efficient because it only needs to update on unique changes. It also follows reactive patterns that integrate with observable operators to transform data.
-
-* **Template-driven** forms rely on mutability with two-way data binding to update the data model in the component as changes are made in the template. Because there are no unique changes to track on the data model when using two-way data binding, change detection is less efficient at determining when updates are required.
+- **Reactive forms** keep the data model pure by providing it as an immutable data structure. Each time a change is triggered on the data model, the `FormControl` instance returns a new data model rather than updating the data model directly. This gives you the ability track unique changes to the data model through the control's observable. This allows change detection to be more efficient because it only needs to update on unique changes. It also follows reactive patterns that integrate with observable operators to transform data.
+- **Template-driven** forms rely on mutability with two-way data binding to update the data model in the component as changes are made in the template. Because there are no unique changes to track on the data model when using two-way data binding, change detection is less efficient at determining when updates are required.
 
 The difference is demonstrated in the examples above using the **favorite color** input element. 
 
-
-* With reactive forms, the **`FormControl` instance** always returns a new value when the control's value is updated.
-
-* With template-driven forms, the **favorite color property** is always modified to its new value.
+- With reactive forms, the **`FormControl` instance** always returns a new value when the control's value is updated.
+- With template-driven forms, the **favorite color property** is always modified to its new value.
 
 ## Scalability
 
 If forms are a central part of your application, scalability is very important. Being able to reuse form models across components is critical.
 
+- **Reactive forms** make creating large scale forms easier by providing access to low-level APIs and synchronous access to the form model.
+- **Template-driven** forms focus on simple scenarios, are not as reusable, abstract away the low-level APIs and access to the form model is  provided asynchronously. The abstraction with template-driven forms surfaces in testing also, where testing reactive forms requires less setup and no dependence on the change detection cycle when updating and validating the form and data models during testing.
 
-* **Reactive forms** provide access to low-level APIs and synchronous access to the form model, making creating large-scale forms easier.
+## Final Thoughts
 
-* **Template-driven** forms focus on simple scenarios, are not as reusable, abstract away the low-level APIs, and provide asynchronous access to the form model. The abstraction with template-driven forms also surfaces in testing, where testing reactive forms requires less setup and no dependence on the change detection cycle when updating and validating the form and data models during testing.
-
-## Final thoughts
-
-Choosing a strategy begins with understanding the strengths and weaknesses of the options presented. Low-level API and form model access, predictability, mutability, straightforward validation and testing strategies, and scalability are all important considerations in choosing the infrastructure you use to build your forms in Angular. Template-driven forms are similar to patterns in AngularJS, but they have limitations given the criteria of many modern, large-scale Angular apps. Reactive forms minimize these limitations. Reactive forms integrate with reactive patterns already present in other areas of the Angular architecture, and complement those requirements well. 
-
-## Next steps
+Choosing a strategy begins with understanding the strengths and weaknesses of the options presented. Low-level API and form model access, predictability, mutability, straightforward validation and testing strategies, and scalability are all important consideration in choosing the infrastructure you use when building your forms in Angular. Template-driven forms are similar to patterns in AngularJS, but they have limitations given the criteria of many modern, large-scale Angular apps. Reactive forms integrate with reactive patterns already present in other areas of the Angular architecture, and complement those requirements well. Those limitations are alleviated with reactive forms.
 
+## Next Steps
 
+The following guides are the next steps in the learning process.
 
 To learn more about reactive forms, see the following guides:
 
 * [Reactive Forms](guide/reactive-forms)
 * [Form Validation](guide/form-validation#reactive-form-validation)
-* [Dynamic Forms](guide/dynamic-form)
+* [Dynamic forms](guide/dynamic-form)
 
 To learn more about template-driven forms, see the following guides:
 
-* [Template-driven Forms](guide/forms#template-driven-forms)
+* [Template-driven Forms](guide/forms)
 * [Form Validation](guide/form-validation#template-driven-validation)
-

aio/content/guide/glossary.md

@@ -317,30 +317,6 @@ Within Angular, use [NgModules](guide/glossary#ngmodule) to make public parts av
 
 {@a F}
 
-{@a form-control}
-
-## form control
-
-A instance of `FormControl`, which is a fundamental building block for Angular forms. Together with `FormGroup` and `FormArray`, tracks the value, validation, and status of a form input element.
-
-Read more forms in the [Introduction to forms in Angular](guide/forms-overview).
-
-{@a form-model}
-
-## form model
-
-The "source of truth" for the value and validation status of a form input element at a given point in time. When using [reactive forms](guide/glossary#reactive-forms), the form model is created explicitly in the component class. When using [template-driven forms](guide/glossary#template-driven-forms), the form model is implicitly created by directives.
-
-Learn more about reactive and template-driven forms in the [Introduction to forms in Angular](guide/forms-overview).
-
-{@a form-validation}
-
-## form validation
-
-A check that runs when form values change and reports whether the given values are correct and complete, according to the defined constraints. Reactive forms apply [validator functions](guide/form-validation#adding-to-reactive-forms). Template-driven forms use [validator directives](guide/form-validation#adding-to-template-driven-forms).
-
-
-To learn more, see [Form Validation](guide/form-validation).
 
 {@a G}
 
@@ -349,14 +325,6 @@ To learn more, see [Form Validation](guide/form-validation).
 
 {@a I}
 
-
-{@a immutability}
-
-## immutability
-
-The ability to alter the state of a value after its creation. [Reactive forms](guide/glossary#reactive-forms) perform immutable changes in that
-each change to the data model produces a new data model rather than modifying the existing one. [Template-driven forms](guide/glossary#template-driven-forms) perform mutable changes with `NgModel` and [two-way data binding](guide/glossary#data-binding) to modify the existing data model in place.
-
 {@a injectable}
 
 ## injectable
@@ -607,15 +575,14 @@ Learn more in [Dependency Injection](guide/dependency-injection).
 A framework for building Angular forms through code in a component.
 The alternative is a [template-driven form](guide/glossary#template-driven-forms).
 
-When using reactive forms:
+When building reactive forms:
 
-* The "source of truth", the form model, is defined in the component class.
-* Validation is set up through validation functions rather than valdation directives.
-* Each control is explicitly created in the component class by creating a `FormControl` instance manually or with `FormBuilder`.
+* The "source of truth" is the component. The validation is defined using code in the component.
+* Each control is explicitly created in the component class with `new FormControl()` or with `FormBuilder`.
 * The template input elements do *not* use `ngModel`.
-* The associated Angular directives are prefixed with `form`, such as `formControl`, `formGroup`, and `formControlName`.
+* The associated Angular directives are prefixed with `Form`, such as `FormGroup()`, `FormControl()`, and `FormControlName()`.
 
-The alternative is a template-driven form. For an introduction and comparison of both forms approaches, see [Introduction to Angular Forms](guide/forms-overview).
+Reactive forms are powerful, flexible, and a good choice for more complex data-entry form scenarios, such as dynamic generation of form controls.
 
 {@a router}
 {@a router-module}
@@ -730,14 +697,16 @@ Additional templates, represented by `TemplateRef` objects, can define alternati
 A format for building Angular forms using HTML forms and input elements in the view.
 The alternative format uses the [reactive forms](guide/glossary#reactive-forms) framework.
 
-When using template-driven forms:
+When building template-driven forms:
 
 * The "source of truth" is the template. The validation is defined using attributes on the individual input elements.
 * [Two-way binding](guide/glossary#data-binding) with `ngModel` keeps the component model synchronized with the user's entry into the input elements.
 * Behind the scenes, Angular creates a new control for each input element, provided you have set up a `name` attribute and two-way binding for each input.
 * The associated Angular directives are prefixed with `ng` such as `ngForm`, `ngModel`, and `ngModelGroup`.
 
-The alternative is a reactive form. For an introduction and comparison of both forms approaches, see [Introduction to Angular Forms](guide/forms-overview).
+Template-driven forms are convenient, quick, and simple. They are a good choice for many basic data-entry form scenarios.
+
+Read about how to build template-driven forms in [Forms](guide/forms).
 
 {@a template-expression}
 

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 configuration settings.
+  * With [AOT](guide/i18n#merge-aot), you pass the information as a configuration
   * With [JIT](guide/i18n#merge-jit), you provide the information at bootstrap time.
 
 

aio/content/guide/npm-packages.md

@@ -1,141 +1,173 @@
-# Workspace npm dependencies
+# Npm Packages
 
-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/).
+ The [**Angular CLI**](https://cli.angular.io/), Angular applications, and Angular itself depend upon features and functionality provided by libraries that are available as [**npm**](https://docs.npmjs.com/) packages.
 
-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.
-
-Alternatively, you can use the [yarn client](https://yarnpkg.com/) for downloading and installing npm packages. 
+You can download and install these npm packages with the [**npm client**](https://docs.npmjs.com/cli/install), which runs as a Node.js® application.
 
+The [**yarn client**](https://yarnpkg.com/en/) is a popular alternative for downloading and installing npm packages.
+The Angular CLI uses `yarn` by default to install npm packages when you create a new project.
 
 <div class="alert is-helpful">
 
-See [Getting Started](guide/quickstart#prerequisites) for information about the required versions and installation of Node.js and npm.
+Node.js and npm are essential to Angular development.
 
-If you already have projects running on your machine that use other versions of Node.js and npm, consider using [nvm](https://github.com/creationix/nvm) to manage the multiple versions of Node.js and npm. 
+[Get them now](https://docs.npmjs.com/getting-started/installing-node "Installing Node.js and updating npm")
+if they're not already installed on your machine.
+
+**Verify that you are running Node.js `v8.x` or higher and npm `5.x` or higher**
+by running the commands `node -v` and `npm -v` in a terminal/console window.
+Older versions produce errors.
+
+Consider using [nvm](https://github.com/creationix/nvm) for managing multiple
+versions of Node.js and npm. You may need [nvm](https://github.com/creationix/nvm) if
+you already have projects running on your machine that use other versions of Node.js and npm.
 
 </div>
 
+## _package.json_
 
-## `package.json`
+Both `npm` and `yarn` install packages that are identified in a [**package.json**](https://docs.npmjs.com/files/package.json) file.
 
-Both `npm` and `yarn` install the packages that are identified in a [`package.json`](https://docs.npmjs.com/files/package.json) file.
+The CLI `ng new` command creates a default `package.json` file for your project.
+This `package.json` specifies _a starter set of packages_ that work well together and 
+jointly support many common application scenarios.
 
-The CLI command `ng new` creates a `package.json` file when it creates the new workspace. 
-This `package.json` is used by all projects in the workspace, including the initial app project that is  created by the CLI when it creates the workspace.   
+You will add packages to `package.json` as your application evolves.
+You may even remove some.
 
-Initially, this `package.json` includes _a starter set of packages_, some of which are required by Angular and others that support common application scenarios.
-You add packages to `package.json` as your application evolves. 
-You may even remove some. 
+This guide focuses on the most important packages in the starter set.
 
-The `package.json` is organized into two groups of packages:
+#### *dependencies* and *devDependencies*
 
-* [Dependencies](guide/npm-packages#dependencies) are essential to *running* applications.
-* [DevDependencies](guide/npm-packages#dev-dependencies) are only necessary to *develop* applications.
-
-<div class="alert is-helpful">
-
-**Library developers:** By default, the CLI command [`ng generate library`](cli/generate) creates a `package.json` for the new library. That `package.json` is used when publishing the library to npm.
-For more information, see the CLI wiki page [Library Support](https://github.com/angular/angular-cli/wiki/stories-create-library). 
-</div>
+The `package.json` includes two sets of packages,
+[dependencies](guide/npm-packages#dependencies) and [devDependencies](guide/npm-packages#dev-dependencies).
 
+The *dependencies* are essential to *running* the application.
+The *devDependencies* are only necessary to *develop* the application.
 
 {@a dependencies}
-## Dependencies
-
-The packages listed in the `dependencies` section of `package.json` are essential to *running* applications. 
 
+## *Dependencies*
 The `dependencies` section of `package.json` contains:
 
-* [**Angular packages**](#angular-packages): Angular core and optional modules; their package names begin `@angular/`.
+* **Angular packages**: Angular core and optional modules; their package names begin `@angular/`.
 
-* [**Support packages**](#support-packages): 3rd party libraries that must be present for Angular apps to run.
+* **Support packages**: 3rd party libraries that must be present for Angular apps to run.
 
-* [**Polyfill packages**](#polyfills): Polyfills plug gaps in a browser's JavaScript implementation.
+* **Polyfill packages**: Polyfills plug gaps in a browser's JavaScript implementation.
 
-To add a new dependency, use the [`ng add`](cli/add) command.
+### Angular Packages
 
-{@a angular-packages}
-### Angular packages
+**@angular/animations**: Angular's animations library makes it easy to define and apply animation effects such as page and list transitions.
+Read about it in the [Animations guide](guide/animations).
 
-The following Angular packages are included as dependencies in the default `package.json` file for a new Angular workspace.
-For a complete list of Angular packages, see the [API reference](http://angular.io/api?type=package). 
+**@angular/common**: The commonly needed services, pipes, and directives provided by the Angular team.
+The [`HttpClientModule`](guide/http) is also here, in the '@angular/common/http' subfolder.
 
-Package name                               | Description
-----------------------------------------   | --------------------------------------------------
-[**@angular/animations**](api/animations) | Angular's animations library makes it easy to define and apply animation effects such as page and list transitions. For more information, see the [Animations guide](guide/animations).
-[**@angular/common**](api/common) | The commonly-needed services, pipes, and directives provided by the Angular team. The [`HttpClientModule`](api/common/http/HttpClientModule) is also here, in the [`@angular/common/http`](api/common/http) subfolder. For more information, see the [HttpClient guide](guide/http).
-**@angular/compiler** | Angular's template compiler. It understands templates and can convert them to code that makes the application run and render. Typically you don’t interact with the compiler directly; rather, you use it indirectly via `platform-browser-dynamic` when JIT compiling in the browser. For more information, see the [Ahead-of-time Compilation guide](guide/aot-compiler).
-[**@angular/core**](api/core) | Critical runtime parts of the framework that are needed by every application. Includes all metadata decorators, `Component`, `Directive`,  dependency injection, and the component lifecycle hooks.
-[**@angular/forms**](api/forms) | Support for both [template-driven](guide/forms) and [reactive forms](guide/reactive-forms). For information about choosing the best forms approach for your app, see [Introduction to forms](guide/forms-overview).
-[**@angular/http**](api/http) | Angular's legacy HTTP client, which was deprecated in version 5.0 in favor of [@angular/common/http](api/common/http).
-[**@angular/<br />platform&#8209;browser**](api/platform-browser) | Everything DOM and browser related, especially the pieces that help render into the DOM. This package also includes the `bootstrapModuleFactory()` method for bootstrapping applications for production builds that pre-compile with [AOT](guide/aot-compiler).
-[**@angular/<br />platform&#8209;browser&#8209;dynamic**](api/platform-browser-dynamic) | Includes [providers](api/core/Provider) and methods to compile and run the app on the client using the [JIT compiler](guide/aot-compiler).
-[**@angular/router**](api/router) | The router module navigates among your app pages when the browser URL changes. For more information, see [Routing and Navigation](guide/router).
+**@angular/core**: Critical runtime parts of the framework needed by every application.
+Includes all metadata decorators, `Component`, `Directive`,  dependency injection, and the component lifecycle hooks.
 
+**@angular/compiler**: Angular's *Template Compiler*.
+It understands templates and can convert them to code that makes the application run and render.
+Typically you don’t interact with the compiler directly; rather, you use it indirectly via `platform-browser-dynamic` when [JIT compiling](guide/aot-compiler) in the browser.
 
-{@a support-packages}
-### Support packages
+**@angular/forms**: support for both [template-driven](guide/forms) and [reactive forms](guide/reactive-forms).
 
-The following support packages are included as dependencies in the default `package.json` file for a new Angular workspace. 
+**@angular/http**: Angular's old, deprecated, HTTP client.
 
+**@angular/platform-browser**: Everything DOM and browser related, especially
+the pieces that help render into the DOM.
+This package also includes the `bootstrapModuleFactory()` method
+for bootstrapping applications for production builds that pre-compile with [AOT](guide/aot-compiler).
 
-Package name                               | Description
-----------------------------------------   | --------------------------------------------------
-[**rxjs**](https://github.com/ReactiveX/rxjs) | Many Angular APIs return [_observables_](guide/glossary#observable). RxJS is an implementation of the proposed [Observables specification](https://github.com/tc39/proposal-observable) currently before the [TC39](https://www.ecma-international.org/memento/tc39-m.htm) committee, which determines standards for the JavaScript language.
-[**zone.js**](https://github.com/angular/zone.js) | Angular relies on zone.js to run Angular's change detection processes when native JavaScript operations raise events.  Zone.js is an implementation of a [specification](https://gist.github.com/mhevery/63fdcdf7c65886051d55) currently before the [TC39](http://www.ecma-international.org/memento/TC39.htm) committee that determines standards for the JavaScript language.
+**@angular/platform-browser-dynamic**: Includes [Providers](api/core/Provider)
+and methods to compile and run the app on the client 
+using the [JIT compiler](guide/aot-compiler).
 
+**@angular/router**: The [router module](/guide/router) navigates among your app pages when the browser URL changes.
+
+**@angular/upgrade**: Set of utilities for upgrading AngularJS applications to Angular.
 
 {@a polyfills}
+
 ### Polyfill packages
 
 Many browsers lack native support for some features in the latest HTML standards,
 features that Angular requires.
-[_Polyfills_](https://en.wikipedia.org/wiki/Polyfill) can emulate the missing features.
+"[Polyfills](https://en.wikipedia.org/wiki/Polyfill)" can emulate the missing features.
 The [Browser Support](guide/browser-support) guide explains which browsers need polyfills and 
 how you can add them.
 
-The `package.json` for a new Angular workspace installs the [core-js](https://github.com/zloirock/core-js) package, 
+The default `package.json` installs the **[core-js](https://github.com/zloirock/core-js)** package
 which polyfills missing features for several popular browser.
 
+### Support packages
+
+**[rxjs](https://github.com/benlesh/RxJS)**: Many Angular APIs return _observables_. RxJS is an implementation of the proposed [Observables specification](https://github.com/zenparsing/es-observable) currently before the
+[TC39](http://www.ecma-international.org/memento/TC39.htm) committee that determines standards for the JavaScript language.
+
+
+**[zone.js](https://github.com/angular/zone.js)**: Angular relies on zone.js to run Angular's change detection processes when native JavaScript operations raise events.  Zone.js is an implementation of a [specification](https://gist.github.com/mhevery/63fdcdf7c65886051d55) currently before the
+[TC39](http://www.ecma-international.org/memento/TC39.htm) committee that determines standards for the JavaScript language.
+
 
 {@a dev-dependencies}
 
-## DevDependencies
+## *DevDependencies*
 
-The packages listed in the `devDependencies` section of `package.json` help you develop the application on your local machine. You don't deploy them with the production application.
+The packages listed in the *devDependencies* section of the `package.json` help you develop the application on your local machine.
 
-To add a new `devDependency`, use either one of the following commands:
+You don't deploy them with the production application although there is no harm in doing so.
 
-<code-example language="sh" class="code-shell">
-  npm install --dev &lt;package-name&gt;
-</code-example>
-
-<code-example language="sh" class="code-shell">
-  yarn add --dev &lt;package-name&gt;
-</code-example>
-
-The following `devDependencies` are provided in the default `package.json` file for a new Angular workspace. 
+**[@angular/cli](https://github.com/angular/angular-cli/)**: The Angular CLI tools.
 
 
-Package name                               | Description
-----------------------------------------   | -----------------------------------
-[**@angular&#8209;devkit/<br />build&#8209;angular**](https://github.com/angular/angular-cli/) | The Angular build tools.
-[**@angular/cli**](https://github.com/angular/angular-cli/) | The Angular CLI tools.
-**@angular/<br />compiler&#8209;cli** | The Angular compiler, which is invoked by the Angular CLI's `ng build` and `ng serve` commands.
-**@angular/<br />language&#8209;service** | The [Angular language service](guide/language-service) analyzes component templates and provides type and error information that TypeScript-aware editors can use to improve the developer's experience. For example, see the [Angular language service extension for VS Code](https://marketplace.visualstudio.com/items?itemName=Angular.ng-template).
-**@types/... ** | TypeScript definition files for 3rd party libraries such as Jasmine and Node.js.
-[**codelyzer**](https://www.npmjs.com/package/codelyzer) | A linter for Angular apps whose rules conform to the Angular [style guide](guide/styleguide).
-**jasmine/... ** | Packages to support the [Jasmine](https://jasmine.github.io/) test library.
-**karma/... ** | Packages to support the [karma](https://www.npmjs.com/package/karma) test runner.
-[**protractor**](https://www.npmjs.com/package/protractor) | An end-to-end (e2e) framework for Angular apps. Built on top of [WebDriverJS](https://github.com/SeleniumHQ/selenium/wiki/WebDriverJs).
-[**ts-node**](https://www.npmjs.com/package/ts-node) | TypeScript execution environment and REPL for Node.js.
-[**tslint**](https://www.npmjs.com/package/tslint) | A static analysis tool that checks TypeScript code for readability, maintainability, and functionality errors.
-[**typescript**](https://www.npmjs.com/package/typescript) | The TypeScript language server, including the *tsc* TypeScript compiler.
+**[@angular/compiler-cli](https://github.com/angular/angular/blob/master/packages/compiler-cli/README.md)**: The Angular compiler, which is invoked by the Angular CLI's `build` and `serve` commands.
 
 
-## Related information
+**[@angular/language-service](https://github.com/angular/angular-cli/)**: The Angular language service analyzes component templates and provides type and error information that TypeScript-aware editors can use to improve the developer's experience.
+For example, see the [Angular language service extension for VS Code](https://marketplace.visualstudio.com/items?itemName=Angular.ng-template)
 
- For information about how the Angular CLI handles packages see the following guides: 
- 
- * [Building and serving](guide/build) describes how packages come together to create a development build.
- * [Deployment](guide/deployment) describes how packages come together to create a production build.
+
+**@types/... **: TypeScript definition files for 3rd party libraries such as Jasmine and Node.js.
+
+
+**[codelyzer](https://www.npmjs.com/package/codelyzer)**: A linter for Angular apps whose rules conform to the Angular [style guide](guide/styleguide).
+
+
+**jasmine/... **: packages to support the [Jasmine](https://jasmine.github.io/) test library.
+
+
+**karma/... **: packages to support the [karma](https://www.npmjs.com/package/karma) test runner.
+
+
+**[protractor](https://www.npmjs.com/package/protractor)**: an end-to-end (e2e) framework for Angular apps. 
+Built on top of [WebDriverJS](https://github.com/SeleniumHQ/selenium/wiki/WebDriverJs).
+
+
+**[ts-node](https://www.npmjs.com/package/ts-node)**: TypeScript execution environment and REPL for Node.js.
+
+
+**[tslint](https://www.npmjs.com/package/tslint)**: a static analysis tool that checks TypeScript code for readability, maintainability, and functionality errors.
+
+
+**[typescript](https://www.npmjs.com/package/typescript)**:
+the TypeScript language server, including the *tsc* TypeScript compiler.
+
+
+## So many packages! So many files!
+
+The default `package.json` installs more packages than you'll need for your project.
+
+A given package may contain tens, hundreds, even thousands of files,
+all of them in your local machine's `node_modules` directory.
+The sheer volume of files is intimidating, 
+
+You can remove packages that you don't need but how can you be sure that you won't need it?
+As a practical matter, it's better to install a package you don't need than worry about it.
+Extra packages and package files on your local development machine are harmless.
+
+By default the Angular CLI build process bundles into a single file just the few "vendor" library files that your application actually needs.
+The browser downloads this bundle, not the original package files.
+
+See the [Deployment](guide/deployment) to learn more.

aio/content/guide/releases.md

@@ -65,34 +65,68 @@ Disclaimer: The dates are offered as general guidance and may be adjusted by us
 
 The following table contains our current target release dates for the next two major versions of Angular: 
 
- Date                   | Stable Release | Compatibility 
- ---------------------- | -------------- | -------------
+ Date                   | Stable Release | Compatibility
+ ---------------------- | -------------- | ----------------
+ September/October 2018 | 7.0.0          | ^6.0.0
  March/April 2019       | 8.0.0          | ^7.0.0
- September/October 2019 | 9.0.0          | ^8.0.0
 
  Compatibility note: The primary goal of the backward compatibility promise is to ensure that changes in the core framework and tooling don't break the existing ecosystem of components and applications and don't put undue upgrade/migration burden on Angular application and component authors.
 
 
 {@a lts}
 {@a support}
-## Support policy and schedule
+## Support policy
 
 All of our major releases are supported for 18 months. 
 
-* 6 months of *active support*, during which regularly-scheduled updates and patches are released.
+* 6 months of active support, during which regularly-scheduled updates and patches are released, as described above in [Release frequency](#frequency "Release frequency").
 
-* 12 months of *long-term support (LTS)*, during which only critical fixes and security patches are released.
+* 12 months of long-term support (LTS). During the LTS period, only critical fixes and security patches will be released.
 
-The following table provides the support status and key dates for Angular version 5.0.0 and higher. 
+The following table provides the support status and key dates for Angular version 4.0.0 and higher. 
 
+<style>
 
-Version | Status | Released     | Active Ends  | LTS Ends
-------- | ------ | ------------ | ------------ | ------------ 
-^7.0.0  | Active | Oct 18, 2018 | Apr 18, 2019 | Apr 18, 2020
-^6.0.0  | LTS    | May 3, 2018  | Nov 3, 2018  | Nov 3, 2019
-^5.0.0  | LTS    | Nov 1, 2017  | May 1, 2018  | May 1, 2019
+    td, th {vertical-align: top}
+
+</style>
+
+<table>
+
+    <tr>
+        <th>Version</th>
+        <th>Status</th>
+        <th>Release Date</th>
+        <th>LTS Start Date</th>
+        <th>LTS End Date</th>
+    </tr>
+
+    <tr>
+        <td>^4.0.0</td>
+        <td>LTS</td>
+        <td>March 23, 2017</td>
+        <td>September 23, 2017</td>
+        <td>September 23, 2018</td>
+    </tr>
+
+    <tr>
+        <td>^5.0.0</td>
+        <td>LTS</td>
+        <td>November 1, 2017</td>
+        <td>May 1, 2018</td>
+        <td>May 1, 2019</td>
+    </tr>
+
+    <tr>
+        <td>^6.0.0</td>
+        <td>Active</td>
+        <td>May 3, 2018</td>
+        <td>November 3, 2018</td>
+        <td>November 3, 2019</td>
+    </tr>
+
+</table>
 
-LTS for Angular version ^4.0.0 ended on September 23, 2018.
 
 
 {@a deprecation}

aio/content/guide/router.md

@@ -3066,13 +3066,11 @@ 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. When
-doing so inside a guard, the guard should return `false`;
+**Note:** The guard can also tell the router to navigate elsewhere, effectively canceling the current navigation.
 
 </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 `<b>` element.
+tag but keeps safe content such as the text content of the `<script>` tag and the `<b>` element.
 
 
 <figure>

aio/content/guide/service-worker-config.md

@@ -161,15 +161,7 @@ This section defines the policy by which matching requests will be cached.
 For example, the string `3d12h` will cache content for up to three and a half days.
 
 #### `timeout`
-This duration string specifies the network timeout. The network timeout is how long the Angular service worker will wait for the network to respond before using a cached response, if configured to do so. `timeout` is a duration string, using the following unit suffixes:
-
-* `d`: days
-* `h`: hours
-* `m`: minutes
-* `s`: seconds
-* `u`: milliseconds
-
-For example, the string `5s30u` will translate to five seconds and 30 milliseconds of network timeout.
+This duration string specifies the network timeout. The network timeout is how long the Angular service worker will wait for the network to respond before using a cached response, if configured to do so.
 
 #### `strategy`
 

aio/content/guide/service-worker-intro.md

@@ -31,7 +31,7 @@ Installing the Angular service worker is as simple as including an `NgModule`. I
 
 ## Prerequisites
 
-Your application must run in a web browser that supports service workers. Currently, service workers are supported in the latest versions of Chrome, Firefox, Edge, Safari, Opera, UC Browser (Android version) and Samsung Internet. Browsers like IE and Opera Mini do not provide the support. To learn more about other browsers that are service worker ready, see the [Can I Use](https://caniuse.com/#feat=serviceworkers) page and [MDN docs](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API).
+Your application must run in a web browser that supports service workers. Currently, the latest versions of Chrome and Firefox are supported. To learn about other browsers that are service worker ready, see the [Can I Use](http://caniuse.com/#feat=serviceworkers) page.
 
 ## Related resources
 

aio/content/guide/testing.md

@@ -23,7 +23,7 @@ Just run the [`ng test`](cli/test) CLI command:
 </code-example>
 
 The `ng test` command builds the app in _watch mode_,
-and launches the [karma test runner](https://karma-runner.github.io).
+and launches the [karma test runner](https://karma-runner.github.io/1.0/index.html).
 
 The console output looks a bit like this:
 
@@ -184,13 +184,13 @@ You'll need to push a new commit to trigger a build.
 
 When the CLI commands `ng test` and `ng e2e` are generally running the CI tests in your environment, you might still need to adjust your configuration to run the Chrome browser tests.
 
-There are configuration files for both the [Karma JavaScript test runner](https://karma-runner.github.io/latest/config/configuration-file.html) 
+There are configuration files for both the [Karma JavaScript test runner](http://karma-runner.github.io/2.0/config/configuration-file.html) 
 and [Protractor](https://www.protractortest.org/#/api-overview) end-to-end testing tool, 
 which  you must adjust to start Chrome without sandboxing.
 
 We'll be using [Headless Chrome](https://developers.google.com/web/updates/2017/04/headless-chrome#cli) in these examples.
 
-* In the Karma configuration file, `karma.conf.js`, add a custom launcher called ChromeHeadlessCI below browsers:
+* In the Karma configuration file, `karma.conf.js`, add a custom launcher called ChromeNoSandbox below browsers:
 ```
 browsers: ['Chrome'],
 customLaunchers: {
@@ -259,7 +259,7 @@ The code coverage percentages let you estimate how much of your code is tested.
 If your team decides on a set minimum amount to be unit tested, you can enforce this minimum with the Angular CLI. 
 
 For example, suppose you want the code base to have a minimum of 80% code coverage. 
-To enable this, open the [Karma](https://karma-runner.github.io) test platform configuration file, `karma.conf.js`, and add the following in the `coverageIstanbulReporter:` key.
+To enable this, open the [Karma](http://karma-runner.github.io/0.13/index.html) test platform configuration file, `karma.conf.js`, and add the following in the `coverageIstanbulReporter:` key.
 
 ```
 coverageIstanbulReporter: {
@@ -684,7 +684,7 @@ and returns a [`ComponentFixture`](#component-fixture).
 
 Do not re-configure `TestBed` after calling `createComponent`.
 
-The `createComponent` method freezes the current `TestBed` definition,
+The `createComponent` method freezes the current `TestBed`definition,
 closing it to further configuration.
 
 You cannot call any more `TestBed` configuration methods, not `configureTestingModule()`,
@@ -1010,7 +1010,7 @@ _compiles the app before running the tests_.
 
 However, if you run the tests in a **non-CLI environment**,
 tests of this component may fail.
-For example, if you run the `BannerComponent` tests in a web coding environment such as [plunker](https://plnkr.co/), you'll see a message like this one:
+For example, if you run the `BannerComponent` tests in a web coding environment such as [plunker](http://plnkr.co/), you'll see a message like this one:
 
 <code-example language="sh" class="code-shell" hideCopy>
 Error: This test module uses the component BannerComponent
@@ -1489,7 +1489,7 @@ While the `async()` and `fakeAsync()` functions greatly
 simplify Angular asynchronous testing,
 you can still fall back to the traditional technique
 and pass `it` a function that takes a
-[`done` callback](https://jasmine.github.io/2.0/introduction.html#section-Asynchronous_Support).
+[`done` callback](http://jasmine.github.io/2.0/introduction.html#section-Asynchronous_Support).
 
 You can't call `done()` in `async()` or `fakeAsync()` functions, because the `done parameter`
 is `undefined`.

aio/content/guide/universal.md

@@ -62,7 +62,7 @@ Your app may have to launch faster to engage these users before they decide to d
 
 With Angular Universal, you can generate landing pages for the app that look like the complete app.
 The pages are pure HTML, and can display even if JavaScript is disabled.
-The pages don't handle browser events, but they _do_ support navigation through the site using [`routerLink`](guide/router#router-link).
+The pages don't handle browser events, but they _do_ support navigation through the site using `[routerLink](guide/router#router-link)`.
 
 In practice, you'll serve a static version of the landing page to hold the user's attention.
 At the same time, you'll load the full Angular app behind it. 

aio/content/guide/upgrade-performance.md

@@ -281,28 +281,22 @@ 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).<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 Angular Components from AngularJS Code](guide/upgrade#using-angular-components-from-angularjs-code).
 - [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).<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()`._
+- [Making Angular Dependencies Injectable to AngularJS](guide/upgrade#making-angular-dependencies-injectable-to-angularjs).
 
 <div class="alert is-important">
 
   While it is possible to downgrade injectables, downgraded injectables will not be available until
-  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.
+  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.
 
   For example, it is _OK_ to use a downgraded service in an upgraded component that is only used
-  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.
+  from Angular components, but it is _not OK_ to use it in an AngularJS component that may be used
+  independently of Angular.
 
 </div>
 

aio/content/guide/workspace-config.md

@@ -1,135 +0,0 @@
-# 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/events.html

@@ -13,6 +13,24 @@
     </tr>
     </thead>
     <tbody>
+    <!-- AngularMix -->
+    <tr>
+        <th><a href="https://angularmix.com/" title="AngularMix">AngularMix</a></th>
+        <td>Orlando, Florida</td>
+        <td>October 10-12, 2018</td>
+    </tr>
+    <!-- ReactiveConf -->
+    <tr>
+      <th><a href="https://reactiveconf.com/" title="ReactiveConf">ReactiveConf</a></th>
+      <td>Prague, Czech Republic</td>
+      <td>October 29-31, 2018</td>
+    </tr>
+    <!-- AngularConnect-->
+    <tr>
+      <th><a href="http://angularconnect.com" title="AngularConnect">AngularConnect</a></th>
+      <td>London, United Kingdom</td>
+      <td>November 5-7, 2018</td>
+    </tr>
     </tbody>
   </table>
 
@@ -26,53 +44,11 @@
     </tr>
     </thead>
     <tbody>
-      <!-- ReactiveConf -->
-      <tr>
-        <th><a href="https://reactiveconf.com/" title="ReactiveConf">ReactiveConf</a></th>
-        <td>Prague, Czech Republic</td>
-        <td>October 29-31, 2018</td>
-      </tr>
-      <!-- AngularConnect-->
-      <tr>
-        <th><a href="http://angularconnect.com" title="AngularConnect">AngularConnect</a></th>
-        <td>London, United Kingdom</td>
-        <td>November 5-7, 2018</td>
-      </tr>
-      <!-- AngularMix -->
-      <tr>
-        <th><a href="https://angularmix.com/" title="AngularMix">AngularMix</a></th>
-        <td>Orlando, Florida</td>
-        <td>October 10-12, 2018</td>
-    </tr>
-    <!-- Angular Conf Australia-->
+    <!-- AngularConnect-->
     <tr>
-      <th><a href="https://www.angularconf.com.au/" title="Angular Conf Australia">Angular Conf Australia</a></th>
-      <td>Melbourne, Australia</td>
-      <td>Jun 22, 2018</td>
-    </tr>
-    <!-- ngJapan-->
-    <tr>
-      <th><a href="https://ngjapan.org/en.html" title="ng-japan">ng-japan</a></th>
-      <td>Tokyo, Japan</td>
-      <td>Jun 16, 2018</td>
-    </tr>
-    <!-- WeRDevs-->
-    <tr>
-      <th><a href="https://www.wearedevelopers.com/" title="WeAreDevs">WeAreDevelopers</a></th>
-      <td>Vienna, Austria</td>
-      <td>May 16-18, 2018</td>
-    </tr>
-    <!-- ngconf 2018-->
-    <tr>
-      <th><a href="https://www.ng-conf.org/" title="ng-conf">ng-conf</a></th>
-      <td>Salt Lake City, Utah</td>
-      <td>April 18-20, 2018</td>
-    </tr>
-    <!-- ngVikings-->
-    <tr>
-      <th><a href="https://ngvikings.org/" title="ngVikings">ngVikings</a></th>
-      <td>Helsinki, Finland</td>
-      <td>March 1-2, 2018</td>
+      <th><a href="http://angularconnect.com" title="AngularConnect">AngularConnect</a></th>
+      <td>London, United Kingdom</td>
+      <td>November 7-8, 2017</td>
     </tr>
     <!-- ngAtlanta-->
     <tr>
@@ -80,6 +56,36 @@
       <td>Atlanta, Georgia</td>
       <td>January 30, 2018</td>
     </tr>
+    <!-- ngVikings-->
+    <tr>
+      <th><a href="https://ngvikings.org/" title="ngVikings">ngVikings</a></th>
+      <td>Helsinki, Finland</td>
+      <td>March 1-2, 2018</td>
+    </tr>
+    <!-- ngconf 2018-->
+    <tr>
+      <th><a href="https://www.ng-conf.org/" title="ng-conf">ng-conf</a></th>
+      <td>Salt Lake City, Utah</td>
+      <td>April 18-20, 2018</td>
+    </tr>
+    <!-- WeRDevs-->
+    <tr>
+      <th><a href="https://www.wearedevelopers.com/" title="WeAreDevs">WeAreDevelopers</a></th>
+      <td>Vienna, Austria</td>
+      <td>May 16-18, 2018</td>
+    </tr>
+    <!-- ngJapan-->
+    <tr>
+      <th><a href="https://ngjapan.org/en.html" title="ng-japan">ng-japan</a></th>
+      <td>Tokyo, Japan</td>
+      <td>Jun 16, 2018</td>
+    </tr>
+    <!-- Angular Conf Australia-->
+    <tr>
+      <th><a href="https://www.angularconf.com.au/" title="Angular Conf Australia">Angular Conf Australia</a></th>
+      <td>Melbourne, Australia</td>
+      <td>Jun 22, 2018</td>
+    </tr>
     </tbody>
   </table>
 </article>

aio/content/marketing/resources.json

@@ -22,12 +22,6 @@
             "rev": true,
             "title": "Made with Angular",
             "url": "https://www.madewithangular.com/"
-          },
-          "angular-subreddit": {
-            "desc": "An Angular-dedicated subreddit.",
-            "rev": true,
-            "title": "Angular Subreddit",
-            "url": "https://www.reddit.com/r/Angular2/"
           }
         }
       },
@@ -155,13 +149,6 @@
             "rev": true,
             "title": "AngularCommerce",
             "url": "https://github.com/NodeArt/angular-commerce"
-          },
-          "ngx-api-utils": {
-            "desc": "ngx-api-utils is a lean library of utilities and helpers to quickly integrate any HTTP API (REST, Ajax, and any other) with Angular.",
-            "logo": "",
-            "rev": true,
-            "title": "ngx-api-utils",
-            "url": "https://github.com/ngx-api-utils/ngx-api-utils"
           }
         }
       },
@@ -224,7 +211,7 @@
             "logo": "https://cloud.githubusercontent.com/assets/1016365/10639063/138338bc-7806-11e5-8057-d34c75f3cafc.png",
             "rev": true,
             "title": "Angular Universal",
-            "url": "https://angular.io/guide/universal"
+            "url": "https://github.com/angular/universal"
           },
           "c1": {
             "desc": "Lightweight development only Node.js® server",
@@ -286,13 +273,6 @@
             "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/"
           }
         }
       },
@@ -382,7 +362,7 @@
             "logo": "",
             "rev": true,
             "title": "Angular Material",
-            "url": "https://material.angular.io/"
+            "url": "https://github.com/angular/material2"
           },
           "mcc": {
             "desc": "Material components made by the community",
@@ -397,12 +377,6 @@
             "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

@@ -1,5 +1,7 @@
 <h1>Test Code Page</h1>
 
+<p>Current location is <current-location></current-location></p>
+
 <h2>&lt;code-tabs&gt;</h2>
 
 <p>No linenums at code-tabs level</p>
@@ -118,20 +120,3 @@ 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,18 +513,12 @@
         {
           "url": "guide/file-structure",
           "title": "Project File Structure",
-          "tooltip": "How your Angular workspace looks on your filesystem."
+          "tooltip": "How your Angular workspace looks in 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",
-          "tooltip": "Description of npm packages required at development time and at runtime."
+          "title": "Packages",
+          "tooltip": "Explanation of npm packages installed into a project by default."
         },
         {
           "url": "guide/typescript-configuration",
@@ -582,15 +576,31 @@
       "title": "Release Information",
       "tooltip": "Angular release practices, updating, and upgrading.",
       "children": [
-        {
-          "url": "guide/updating",
-           "title": "Keeping Up-to-Date",
-           "tooltip": "Information about updating Angular applications and libraries to the latest version."
-       },
         {
           "url": "guide/releases",
           "title": "Angular Releases",
           "tooltip": "Angular versioning, release, support, and deprecation policies and practices."
+        },
+        {
+           "url": "guide/updating",
+            "title": "Keeping Up-to-Date",
+            "tooltip": "Information about updating Angular applications and libraries to the latest version."
+        },
+        {
+          "title": "Upgrading from AngularJS",
+          "tooltip": "Incrementally upgrade an AngularJS application to Angular.",
+          "children": [
+            {
+              "url": "guide/upgrade",
+              "title": "Upgrading Instructions",
+              "tooltip": "Incrementally upgrade an AngularJS application to Angular."
+            },
+            {
+              "url": "guide/ajs-quick-reference",
+              "title": "AngularJS-Angular Concepts",
+              "tooltip": "Learn how AngularJS concepts and techniques map to Angular."
+            }
+          ]
         }
       ]
     },
@@ -738,7 +748,6 @@
   ],
 
   "docVersions": [
-    { "title": "v6", "url": "https://v6.angular.io" },
     { "title": "v5", "url": "https://v5.angular.io" },
     { "title": "v4", "url": "https://v4.angular.io" },
     { "title": "v2", "url": "https://v2.angular.io" },

aio/content/tutorial/toh-pt0.md

@@ -19,7 +19,7 @@ To set up your development environment, follow these instructions in [Getting St
 
 <div class="alert is-helpful">
 
-**Note:** You do not need to complete the entire Getting Started. After you complete the above two sections of Getting Started, your environment is set up. Continue below to create the Tour of Heroes workspace and an initial app project.
+**Note:**: You do not need to complete the entire Getting Started. After you complete the above two sections of Getting Started, your environment is set up. Continue below to create the Tour of Heroes workspace and an initial app project.
 </div>
 
 

aio/content/tutorial/toh-pt6.md

@@ -77,13 +77,8 @@ _after importing the `HttpClientModule`_,
 The `forRoot()` configuration method takes an `InMemoryDataService` class
 that primes the in-memory database.
 
-The class `src/app/in-memory-data.service.ts` is generated by the following command:
-
-<code-example language="sh" class="code-shell">
-  ng generate service InMemoryData
-</code-example>
-
-This class has the following content:
+The _Tour of Heroes_ sample creates such a class 
+`src/app/in-memory-data.service.ts` which has the following content:
 
 <code-example path="toh-pt6/src/app/in-memory-data.service.ts" region="init" header="src/app/in-memory-data.service.ts" linenums="false"></code-example>
 
@@ -251,7 +246,7 @@ Here is the final version of `getHeroes` with the `tap` that logs the operation.
 
 Most web APIs support a _get by id_ request in the form `:baseURL/:id`.
 
-Here, the _base URL_ is the `heroesURL` defined in the [Heroes and HTTP](tutorial/toh-pt6#heroes-and-http) section (`api/heroes`) and _id_ is
+Here, the _base URL_ is the `heroesURL` defined in the [Heroes and HTTP](http://localhost:4800/tutorial/toh-pt6#heroes-and-http) section (`api/heroes`) and _id_ is
 the number of the hero that you want to retrieve. For example, `api/heroes/11`.
 
 Add a `HeroService.getHero()` method to make that request:
@@ -466,7 +461,7 @@ Replace the generated `HeroSearchComponent` _template_ with a text box and a lis
 Add private CSS styles to `hero-search.component.css`
 as listed in the [final code review](#herosearchcomponent) below.
 
-As the user types in the search box, an *input* event binding calls the component's `search()`
+As the user types in the search box, a *keyup* event binding calls the component's `search()`
 method with the new search box value.
 
 {@a asyncpipe}
@@ -516,7 +511,7 @@ You can also push values into that `Observable` by calling its `next(value)` met
 as the `search()` method does.
 
 The `search()` method is called via an _event binding_ to the
-textbox's `input` event.
+textbox's `keystroke` event.
 
 <code-example path="toh-pt6/src/app/hero-search/hero-search.component.html" region="input"></code-example>
 

aio/ngsw-config.json

@@ -12,13 +12,13 @@
           "/app/search/search-worker.js",
           "/assets/images/favicons/favicon.ico",
           "/assets/js/*.js",
-          "/generated/lunr.min.js",
           "/*.css",
           "/*.js"
         ],
         "urls": [
           "https://fonts.googleapis.com/**",
-          "https://fonts.gstatic.com/s/**"
+          "https://fonts.gstatic.com/s/**",
+          "https://maxcdn.bootstrapcdn.com/**"
         ]
       }
     }, {

aio/package.json

@@ -7,7 +7,7 @@
   "license": "MIT",
   "scripts": {
     "preinstall": "node ../tools/yarn/check-yarn.js",
-    "postinstall": "node tools/cli-patches/patch.js",
+    "postinstall": "node tools/cli-patches/patch.js && uglifyjs node_modules/lunr/lunr.js -c -m -o src/assets/js/lunr.min.js --source-map",
     "aio-use-local": "node tools/ng-packages-installer overwrite . --debug",
     "aio-use-npm": "node tools/ng-packages-installer restore .",
     "aio-check-local": "node tools/ng-packages-installer check .",
@@ -18,20 +18,18 @@
     "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 1c01b91c6",
+    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js a2129510d7d57d1c02bec563872adf0204e11a2f",
     "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",
     "e2e": "ng e2e --no-webdriver-update",
     "presetup": "yarn --cwd .. install && yarn install --frozen-lockfile && yarn ~~check-env && yarn ~~clean-generated && yarn boilerplate:remove",
     "setup": "yarn aio-use-npm && yarn example-use-npm",
-    "postsetup": "yarn ~~build-ie-polyfills && yarn ~~minify-lunr && yarn boilerplate:add && yarn extract-cli-command-docs && yarn docs",
+    "postsetup": "yarn boilerplate:add && yarn build-ie-polyfills && yarn extract-cli-command-docs && yarn docs",
     "presetup-local": "yarn presetup",
     "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",
@@ -61,32 +59,31 @@
     "generate-stackblitz": "node ./tools/stackblitz-builder/generateStackblitz",
     "generate-zips": "node ./tools/example-zipper/generateZips",
     "build-404-page": "node scripts/build-404-page",
+    "build-ie-polyfills": "yarn webpack-cli src/ie-polyfills.js -o src/generated/ie-polyfills.min.js --mode production",
     "update-webdriver": "webdriver-manager update --standalone false --gecko false $CHROMEDRIVER_VERSION_ARG",
     "~~check-env": "node scripts/check-environment",
     "~~clean-generated": "node --eval \"require('shelljs').rm('-rf', 'src/generated')\"",
     "~~build": "ng build",
     "post~~build": "yarn build-404-page",
-    "~~build-ie-polyfills": "webpack-cli src/ie-polyfills.js -o src/generated/ie-polyfills.min.js --mode production",
-    "~~http-server": "http-server",
-    "~~minify-lunr": "uglifyjs node_modules/lunr/lunr.js -c -m -o src/generated/lunr.min.js --source-map"
+    "~~http-server": "http-server"
   },
   "engines": {
     "node": ">=10.9.0 <11.0.0",
-    "yarn": ">=1.10.1 <1.13.0"
+    "yarn": ">=1.9.2 <2.0.0"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^7.0.0",
-    "@angular/cdk": "7.0.0",
-    "@angular/common": "^7.0.0",
-    "@angular/core": "^7.0.0",
-    "@angular/elements": "^7.0.0",
-    "@angular/forms": "^7.0.0",
-    "@angular/material": "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/animations": "^7.0.0-rc.1",
+    "@angular/cdk": "7.0.0-rc.1",
+    "@angular/common": "^7.0.0-rc.1",
+    "@angular/core": "^7.0.0-rc.1",
+    "@angular/elements": "^7.0.0-rc.1",
+    "@angular/forms": "^7.0.0-rc.1",
+    "@angular/material": "7.0.0-rc.1",
+    "@angular/platform-browser": "^7.0.0-rc.1",
+    "@angular/platform-browser-dynamic": "^7.0.0-rc.1",
+    "@angular/router": "^7.0.0-rc.1",
+    "@angular/service-worker": "^7.0.0-rc.1",
     "@webcomponents/custom-elements": "^1.2.0",
     "classlist.js": "^1.1.20150312",
     "core-js": "^2.4.1",
@@ -96,27 +93,27 @@
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.10.0",
-    "@angular/cli": "^7.0.1",
-    "@angular/compiler": "^7.0.0",
-    "@angular/compiler-cli": "^7.0.0",
-    "@angular/language-service": "^7.0.0",
+    "@angular-devkit/build-angular": "~0.9.0-rc.1",
+    "@angular/cli": "^7.0.0-rc.2",
+    "@angular/compiler": "^7.0.0-rc.1",
+    "@angular/compiler-cli": "^7.0.0-rc.1",
+    "@angular/language-service": "^7.0.0-rc.1",
     "@types/jasmine": "^2.5.52",
     "@types/jasminewd2": "^2.0.4",
     "@types/node": "~6.0.60",
     "archiver": "^1.3.0",
-    "canonical-path": "1.0.0",
+    "canonical-path": "^0.0.2",
     "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.12",
+    "dgeni-packages": "^0.26.9",
     "entities": "^1.1.1",
     "eslint": "^3.19.0",
     "eslint-plugin-jasmine": "^2.2.0",
-    "firebase-tools": "^5.1.1",
+    "firebase-tools": "^3.2.1",
     "fs-extra": "^2.1.2",
     "globby": "^6.1.0",
     "hast-util-is-element": "^1.0.0",
@@ -142,7 +139,7 @@
     "lighthouse": "^3.2.1",
     "lodash": "^4.17.4",
     "lunr": "^2.1.0",
-    "npm-run-all": "^4.1.5",
+    "npm-run-all": "^4.1.3",
     "protractor": "^5.2.0",
     "rehype": "^6.0.0",
     "rehype-slug": "^2.0.0",
@@ -154,7 +151,7 @@
     "tree-kill": "^1.1.0",
     "ts-node": "^3.3.0",
     "tslint": "~5.9.1",
-    "typescript": "^3.1.3",
+    "typescript": "^3.1.2",
     "uglify-js": "^3.0.15",
     "unist-util-filter": "^0.2.1",
     "unist-util-source": "^1.0.1",

aio/scripts/_payload-limits.json

@@ -2,9 +2,10 @@
   "aio": {
     "master": {
       "uncompressed": {
-        "runtime": 3713,
-        "main": 500343,
-        "polyfills": 53926
+        "runtime": 3173,
+        "main": 494475,
+        "polyfills": 53926,
+        "prettify": 14917
       }
     }
   }

aio/scripts/build-artifacts.sh

@@ -2,23 +2,24 @@
 
 set -eu -o pipefail
 
-readonly relativeOutputPath=$1
-readonly prNumber=$2
-readonly prLastSha=$3
-readonly inputDir=dist/
-readonly outputFile=$PROJECT_ROOT/$relativeOutputPath
-readonly deployedUrl=https://pr${prNumber}-${prLastSha:0:7}.ngbuilds.io/
+source "`dirname $0`/../../scripts/ci/env.sh" print
+
+readonly INPUT_DIR=dist/
+readonly OUTPUT_FILE=$PROJECT_ROOT/$1
+readonly PR_NUMBER=$2
+readonly PR_LAST_SHA=$3
+readonly deployedUrl=https://pr${PR_NUMBER}-${PR_LAST_SHA:0:7}.ngbuilds.io/
 
 (
   cd $PROJECT_ROOT/aio
 
   # Build and store the app
-  yarn build --progress=false
+  yarn build
 
   # Set deployedUrl as parameter in the opensearch description
   # deployedUrl must end with /
   yarn set-opensearch-url $deployedUrl
 
-  mkdir -p "`dirname $outputFile`"
-  tar --create --gzip --directory "$inputDir" --file "$outputFile" .
+  mkdir -p "`dirname $OUTPUT_FILE`"
+  tar --create --gzip --directory "$INPUT_DIR" --file "$OUTPUT_FILE" .
 )

aio/scripts/create-preview.js

@@ -1,37 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * Usage:
- *   node create-preview <build-number>
- *
- * Triggers the preview server to initiate the preview creation process for the specified CircleCI
- * build number. It must be called _after_ the build artifacts have been created and stored on
- * CircleCI.
- */
-
-// Imports
-const {triggerWebhook} = require('../../.circleci/trigger-webhook');
-
-// Constants
-const JOB_NAME = 'aio_preview';
-const WEBHOOK_URL = 'https://ngbuilds.io/circle-build';
-
-// Input
-const buildNumber = process.argv[2];
-
-// Run
-triggerWebhook(buildNumber, JOB_NAME, WEBHOOK_URL).
-  then(({statusCode, responseText}) => isSuccess(statusCode) ?
-    console.log(`Status: ${statusCode}\n${responseText}`) :
-    Promise.reject(new Error(`Request failed (status: ${statusCode}): ${responseText}`))).
-  catch(err => {
-    console.error(err);
-    process.exit(1);
-  });
-
-// Helpers
-function isSuccess(statusCode) {
-  // Getting a 409 response from the preview server means that the preview has already been created
-  // for the corresponding PR/SHA, so our objective has been accomplished.
-  return (200 <= statusCode && statusCode < 400) || (statusCode === 409);
-}

aio/scripts/deploy-to-firebase.sh

@@ -1,41 +1,35 @@
 #!/usr/bin/env bash
 
-# WARNING: CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN should NOT be printed.
+# WARNING: FIREBASE_TOKEN should NOT be printed.
 set +x -eu -o pipefail
 
-# Do not deploy if we are running in a fork.
-if [[ "$CI_REPO_OWNER/$CI_REPO_NAME" != "angular/angular" ]]; then
-  echo "Skipping deploy because this is not angular/angular."
-  exit 0
-fi
-
-# Do not deploy if this is a PR. PRs are deployed in the `aio_preview` CircleCI job.
-if [[ $CI_PULL_REQUEST != "false" ]]; then
+# Only deploy if this not a PR. PRs are deployed early in `build.sh`.
+if [[ $TRAVIS_PULL_REQUEST != "false" ]]; then
   echo "Skipping deploy because this is a PR build."
   exit 0
 fi
 
 # Do not deploy if the current commit is not the latest on its branch.
-readonly latestCommit=$(git ls-remote origin $CI_BRANCH | cut -c1-40)
-if [[ $CI_COMMIT != $latestCommit ]]; then
-  echo "Skipping deploy because $CI_COMMIT is not the latest commit ($latestCommit)."
+readonly LATEST_COMMIT=$(git ls-remote origin $TRAVIS_BRANCH | cut -c1-40)
+if [[ $TRAVIS_COMMIT != $LATEST_COMMIT ]]; then
+  echo "Skipping deploy because $TRAVIS_COMMIT is not the latest commit ($LATEST_COMMIT)."
   exit 0
 fi
 
 # The deployment mode is computed based on the branch we are building
-if [[ $CI_BRANCH == master ]]; then
+if [[ $TRAVIS_BRANCH == master ]]; then
   readonly deployEnv=next
-elif [[ $CI_BRANCH == $CI_STABLE_BRANCH ]]; then
+elif [[ $TRAVIS_BRANCH == $STABLE_BRANCH ]]; then
   readonly deployEnv=stable
 else
   # Extract the major versions from the branches, e.g. the 4 from 4.3.x
-  readonly majorVersion=${CI_BRANCH%%.*}
-  readonly majorVersionStable=${CI_STABLE_BRANCH%%.*}
+  readonly majorVersion=${TRAVIS_BRANCH%%.*}
+  readonly majorVersionStable=${STABLE_BRANCH%%.*}
 
   # Do not deploy if the major version is not less than the stable branch major version
   if [[ !( "$majorVersion" < "$majorVersionStable" ) ]]; then
-    echo "Skipping deploy of branch \"$CI_BRANCH\" to firebase."
-    echo "We only deploy archive branches with the major version less than the stable branch: \"$CI_STABLE_BRANCH\""
+    echo "Skipping deploy of branch \"${TRAVIS_BRANCH}\" to firebase."
+    echo "We only deploy archive branches with the major version less than the stable branch: \"${STABLE_BRANCH}\""
     exit 0
   fi
 
@@ -52,9 +46,9 @@ else
   )
 
   # Do not deploy as it is not the latest branch for the given major version
-  if [[ $CI_BRANCH != $mostRecentMinorVersion ]]; then
-    echo "Skipping deploy of branch \"$CI_BRANCH\" to firebase."
-    echo "There is a more recent branch with the same major version: \"$mostRecentMinorVersion\""
+  if [[ $TRAVIS_BRANCH != $mostRecentMinorVersion ]]; then
+    echo "Skipping deploy of branch \"${TRAVIS_BRANCH}\" to firebase."
+    echo "There is a more recent branch with the same major version: \"${mostRecentMinorVersion}\""
     exit 0
   fi
 
@@ -65,21 +59,21 @@ case $deployEnv in
   next)
     readonly projectId=aio-staging
     readonly deployedUrl=https://next.angular.io/
-    readonly firebaseToken=$CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN
+    readonly firebaseToken=$FIREBASE_TOKEN
     ;;
   stable)
     readonly projectId=angular-io
     readonly deployedUrl=https://angular.io/
-    readonly firebaseToken=$CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN
+    readonly firebaseToken=$FIREBASE_TOKEN
     ;;
   archive)
     readonly projectId=v${majorVersion}-angular-io
     readonly deployedUrl=https://v${majorVersion}.angular.io/
-    readonly firebaseToken=$CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN
+    readonly firebaseToken=$FIREBASE_TOKEN
     ;;
 esac
 
-echo "Git branch        : $CI_BRANCH"
+echo "Git branch        : $TRAVIS_BRANCH"
 echo "Build/deploy mode : $deployEnv"
 echo "Firebase project  : $projectId"
 echo "Deployment URL    : $deployedUrl"
@@ -93,7 +87,7 @@ fi
   cd "`dirname $0`/.."
 
   # Build the app
-  yarn build-for $deployEnv --progress=false
+  yarn build-for $deployEnv
 
   # Include any mode-specific files
   cp -rf src/extra-files/$deployEnv/. dist/
@@ -106,9 +100,9 @@ fi
   yarn payload-size
 
   # Deploy to Firebase
-  yarn firebase use "$projectId" --token "$firebaseToken"
-  yarn firebase deploy --message "Commit: $CI_COMMIT" --non-interactive --token "$firebaseToken"
+  firebase use "$projectId" --token "$firebaseToken"
+  firebase deploy --message "Commit: $TRAVIS_COMMIT" --non-interactive --token "$firebaseToken"
 
   # Run PWA-score tests
-  yarn test-pwa-score "$deployedUrl" "$CI_AIO_MIN_PWA_SCORE"
+  yarn test-pwa-score "$deployedUrl" "$AIO_MIN_PWA_SCORE"
 )

aio/scripts/deploy-to-firebase.test.sh

@@ -1,8 +1,6 @@
 #!/usr/bin/env bash
 set +x -eu -o pipefail
 
-readonly deployToFirebaseDryRun="`dirname $0`/deploy-to-firebase.sh --dry-run"
-
 function check {
   if [[ $1 == $2 ]]; then
     echo Pass
@@ -16,38 +14,11 @@ function check {
   exit 1
 }
 
-(
-  echo ===== master - skip deploy - not angular
-  actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=angular
-    export CI_REPO_NAME=notangular
-    $deployToFirebaseDryRun
-  )
-  expected="Skipping deploy because this is not angular/angular."
-  check "$actual" "$expected"
-)
-
-(
-  echo ===== master - skip deploy - angular fork
-  actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=notangular
-    export CI_REPO_NAME=angular
-    $deployToFirebaseDryRun
-  )
-  expected="Skipping deploy because this is not angular/angular."
-  check "$actual" "$expected"
-)
-
 (
   echo ===== master - skip deploy - pull request
   actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=angular
-    export CI_REPO_NAME=angular
-    export CI_PULL_REQUEST=true
-    $deployToFirebaseDryRun
+    export TRAVIS_PULL_REQUEST=true
+    `dirname $0`/deploy-to-firebase.sh --dry-run
   )
   expected="Skipping deploy because this is a PR build."
   check "$actual" "$expected"
@@ -56,14 +27,11 @@ function check {
 (
   echo ===== master - deploy success
   actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=angular
-    export CI_REPO_NAME=angular
-    export CI_PULL_REQUEST=false
-    export CI_BRANCH=master
-    export CI_COMMIT=$(git ls-remote origin master | cut -c1-40)
-    export CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN=XXXXX
-    $deployToFirebaseDryRun
+    export TRAVIS_PULL_REQUEST=false
+    export TRAVIS_BRANCH=master
+    export TRAVIS_COMMIT=$(git ls-remote origin master | cut -c-40)
+    export FIREBASE_TOKEN=XXXXX
+    `dirname $0`/deploy-to-firebase.sh --dry-run
   )
   expected="Git branch        : master
 Build/deploy mode : next
@@ -75,13 +43,10 @@ Deployment URL    : https://next.angular.io/"
 (
   echo ===== master - skip deploy - commit not HEAD
   actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=angular
-    export CI_REPO_NAME=angular
-    export CI_PULL_REQUEST=false
-    export CI_BRANCH=master
-    export CI_COMMIT=DUMMY_TEST_COMMIT
-    $deployToFirebaseDryRun
+    export TRAVIS_PULL_REQUEST=false
+    export TRAVIS_BRANCH=master
+    export TRAVIS_COMMIT=DUMMY_TEST_COMMIT
+    `dirname $0`/deploy-to-firebase.sh --dry-run
   )
   expected="Skipping deploy because DUMMY_TEST_COMMIT is not the latest commit ($(git ls-remote origin master | cut -c1-40))."
   check "$actual" "$expected"
@@ -90,15 +55,12 @@ Deployment URL    : https://next.angular.io/"
 (
   echo ===== stable - deploy success
   actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=angular
-    export CI_REPO_NAME=angular
-    export CI_PULL_REQUEST=false
-    export CI_BRANCH=4.3.x
-    export CI_STABLE_BRANCH=4.3.x
-    export CI_COMMIT=$(git ls-remote origin 4.3.x | cut -c1-40)
-    export CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN=XXXXX
-    $deployToFirebaseDryRun
+    export TRAVIS_PULL_REQUEST=false
+    export TRAVIS_BRANCH=4.3.x
+    export STABLE_BRANCH=4.3.x
+    export TRAVIS_COMMIT=$(git ls-remote origin 4.3.x | cut -c-40)
+    export FIREBASE_TOKEN=XXXXX
+    `dirname $0`/deploy-to-firebase.sh --dry-run
   )
   expected="Git branch        : 4.3.x
 Build/deploy mode : stable
@@ -110,14 +72,11 @@ Deployment URL    : https://angular.io/"
 (
   echo ===== stable - skip deploy - commit not HEAD
   actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=angular
-    export CI_REPO_NAME=angular
-    export CI_PULL_REQUEST=false
-    export CI_BRANCH=4.3.x
-    export CI_STABLE_BRANCH=4.3.x
-    export CI_COMMIT=DUMMY_TEST_COMMIT
-    $deployToFirebaseDryRun
+    export TRAVIS_PULL_REQUEST=false
+    export TRAVIS_BRANCH=4.3.x
+    export STABLE_BRANCH=4.3.x
+    export TRAVIS_COMMIT=DUMMY_TEST_COMMIT
+    `dirname $0`/deploy-to-firebase.sh --dry-run
   )
   expected="Skipping deploy because DUMMY_TEST_COMMIT is not the latest commit ($(git ls-remote origin 4.3.x | cut -c1-40))."
   check "$actual" "$expected"
@@ -126,15 +85,12 @@ Deployment URL    : https://angular.io/"
 (
   echo ===== archive - deploy success
   actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=angular
-    export CI_REPO_NAME=angular
-    export CI_PULL_REQUEST=false
-    export CI_BRANCH=2.4.x
-    export CI_STABLE_BRANCH=4.3.x
-    export CI_COMMIT=$(git ls-remote origin 2.4.x | cut -c1-40)
-    export CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN=XXXXX
-    $deployToFirebaseDryRun
+    export TRAVIS_PULL_REQUEST=false
+    export TRAVIS_BRANCH=2.4.x
+    export STABLE_BRANCH=4.3.x
+    export TRAVIS_COMMIT=$(git ls-remote origin 2.4.x | cut -c-40)
+    export FIREBASE_TOKEN=XXXXX
+    `dirname $0`/deploy-to-firebase.sh --dry-run
   )
   expected="Git branch        : 2.4.x
 Build/deploy mode : archive
@@ -146,15 +102,12 @@ Deployment URL    : https://v2.angular.io/"
 (
   echo ===== archive - skip deploy - commit not HEAD
   actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=angular
-    export CI_REPO_NAME=angular
-    export CI_PULL_REQUEST=false
-    export CI_BRANCH=2.4.x
-    export CI_STABLE_BRANCH=4.3.x
-    export CI_COMMIT=DUMMY_TEST_COMMIT
-    export CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN=XXXXX
-    $deployToFirebaseDryRun
+    export TRAVIS_PULL_REQUEST=false
+    export TRAVIS_BRANCH=2.4.x
+    export STABLE_BRANCH=4.3.x
+    export TRAVIS_COMMIT=DUMMY_TEST_COMMIT
+    export FIREBASE_TOKEN=XXXXX
+    `dirname $0`/deploy-to-firebase.sh --dry-run
   )
   expected="Skipping deploy because DUMMY_TEST_COMMIT is not the latest commit ($(git ls-remote origin 2.4.x | cut -c1-40))."
   check "$actual" "$expected"
@@ -163,15 +116,12 @@ Deployment URL    : https://v2.angular.io/"
 (
   echo ===== archive - skip deploy - major version too high, lower minor
   actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=angular
-    export CI_REPO_NAME=angular
-    export CI_PULL_REQUEST=false
-    export CI_BRANCH=2.1.x
-    export CI_STABLE_BRANCH=2.2.x
-    export CI_COMMIT=$(git ls-remote origin 2.1.x | cut -c-40)
-    export CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN=XXXXX
-    $deployToFirebaseDryRun
+    export TRAVIS_PULL_REQUEST=false
+    export TRAVIS_BRANCH=2.1.x
+    export STABLE_BRANCH=2.2.x
+    export TRAVIS_COMMIT=$(git ls-remote origin 2.1.x | cut -c-40)
+    export FIREBASE_TOKEN=XXXXX
+    `dirname $0`/deploy-to-firebase.sh --dry-run
   )
   expected="Skipping deploy of branch \"2.1.x\" to firebase.
 We only deploy archive branches with the major version less than the stable branch: \"2.2.x\""
@@ -181,15 +131,12 @@ We only deploy archive branches with the major version less than the stable bran
 (
   echo ===== archive - skip deploy - major version too high, higher minor
   actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=angular
-    export CI_REPO_NAME=angular
-    export CI_PULL_REQUEST=false
-    export CI_BRANCH=2.4.x
-    export CI_STABLE_BRANCH=2.2.x
-    export CI_COMMIT=$(git ls-remote origin 2.4.x | cut -c-40)
-    export CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN=XXXXX
-    $deployToFirebaseDryRun
+    export TRAVIS_PULL_REQUEST=false
+    export TRAVIS_BRANCH=2.4.x
+    export STABLE_BRANCH=2.2.x
+    export TRAVIS_COMMIT=$(git ls-remote origin 2.4.x | cut -c-40)
+    export FIREBASE_TOKEN=XXXXX
+    `dirname $0`/deploy-to-firebase.sh --dry-run
   )
   expected="Skipping deploy of branch \"2.4.x\" to firebase.
 We only deploy archive branches with the major version less than the stable branch: \"2.2.x\""
@@ -199,15 +146,12 @@ We only deploy archive branches with the major version less than the stable bran
 (
   echo ===== archive - skip deploy - minor version too low
   actual=$(
-    export BASH_ENV=/dev/null
-    export CI_REPO_OWNER=angular
-    export CI_REPO_NAME=angular
-    export CI_PULL_REQUEST=false
-    export CI_BRANCH=2.1.x
-    export CI_STABLE_BRANCH=4.3.x
-    export CI_COMMIT=$(git ls-remote origin 2.1.x | cut -c-40)
-    export CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN=XXXXX
-    $deployToFirebaseDryRun
+    export TRAVIS_PULL_REQUEST=false
+    export TRAVIS_BRANCH=2.1.x
+    export STABLE_BRANCH=4.3.x
+    export TRAVIS_COMMIT=$(git ls-remote origin 2.1.x | cut -c-40)
+    export FIREBASE_TOKEN=XXXXX
+    `dirname $0`/deploy-to-firebase.sh --dry-run
   )
   expected="Skipping deploy of branch \"2.1.x\" to firebase.
 There is a more recent branch with the same major version: \"2.4.x\""