docs: add changelog for 4.2.5

Closes #17632

.circleci/config.yml

@@ -1,31 +1,18 @@
-# Configuration file for https://circleci.com/gh/angular/angular
-
-# Note: YAML anchors allow an object to be re-used, reducing duplication.
-# The ampersand declares an alias for an object, then later the `<<: *name`
-# syntax dereferences it.
-# See http://blog.daemonl.com/2016/02/yaml.html
-# To validate changes, use an online parser, eg.
-# http://yaml-online-parser.appspot.com/
-
-# Settings common to each job
-anchor_1: &job_defaults
+defaults: &defaults
   working_directory: ~/ng
   docker:
     - image: angular/ngcontainer
 
-# After checkout, rebase on top of master.
-# Similar to travis behavior, but not quite the same.
-# See https://discuss.circleci.com/t/1662
-anchor_2: &post_checkout
-  post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
-
 version: 2
 jobs:
   lint:
-    <<: *job_defaults
+    <<: *defaults
     steps:
       - checkout:
-          <<: *post_checkout
+          # After checkout, rebase on top of master.
+          # Similar to travis behavior, but not quite the same.
+          # See https://discuss.circleci.com/t/1662
+          post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
       - restore_cache:
           key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }}
 
@@ -34,15 +21,14 @@ jobs:
       - run: ./node_modules/.bin/gulp lint
 
   build:
-    <<: *job_defaults
+    <<: *defaults
     steps:
-      - checkout:
-          <<: *post_checkout
+      - checkout
       - restore_cache:
           key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }}
 
-      - run: bazel run @build_bazel_rules_typescript_node//:bin/npm install
-      - run: bazel build packages/...
+      - run: bazel run @io_bazel_rules_typescript_node//:bin/npm install
+      - run: bazel build ...
       - save_cache:
           key: angular-{{ .Branch }}-{{ checksum "npm-shrinkwrap.json" }}
           paths:

.github/ISSUE_TEMPLATE.md

@@ -1,14 +1,14 @@
 <!--
 PLEASE HELP US PROCESS GITHUB ISSUES FASTER BY PROVIDING THE FOLLOWING INFORMATION.
 
-ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION.
+ISSUES MISSING IMPORTANT INFORMATION MIGHT BE CLOSED WITHOUT INVESTIGATION.
 -->
 
-## I'm submitting a...
+## 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 -->
+[ ] Regression (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 -->
 [ ] 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
@@ -32,7 +32,7 @@ https://plnkr.co or similar (you can use this template as a starting point: http
 <!-- Describe the motivation or the concrete use case. -->
 
 
-## Environment
+## Please tell us about your environment
 
 <pre><code>
 Angular version: X.Y.Z
@@ -49,8 +49,8 @@ Browser:
 - [ ] Edge version XX
  
 For Tooling issues:
-- Node version: XX  <!-- run `node --version` -->
-- Platform:  <!-- Mac, Linux, Windows -->
+- Node version: XX <!-- use `node --version` -->
+- Platform: <!-- Mac, Linux, Windows -->
 
 Others:
 <!-- Anything else relevant?  Operating system version, IDE, package manager, HTTP server, ... -->

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,5 +1,5 @@
 ## PR Checklist
-Please check if your PR fulfills the following requirements:
+Does please check if your PR fulfills the following requirements:
 
 - [ ] The commit message follows our guidelines: https://github.com/angular/angular/blob/master/CONTRIBUTING.md#commit
 - [ ] Tests for the changes have been added (for bug fixes / features)

.gitignore

@@ -2,7 +2,6 @@
 
 /dist/
 bazel-*
-e2e_test.*
 node_modules
 bower_components
 

.pullapprove.yml

@@ -8,11 +8,9 @@
 # alexeagle - Alex Eagle
 # alxhub - Alex Rickabaugh
 # chuckjaz - Chuck Jazdzewski
-# Foxandxss - Jesús Rodríguez
 # gkalpak - George Kalpakas
 # IgorMinar - Igor Minar
 # jasonaden - Jason Aden
-# juleskremer - Jules Kremer
 # kara - Kara Erickson
 # matsko - Matias Niemelä
 # mhevery - Misko Hevery
@@ -20,11 +18,10 @@
 # pkozlowski-opensource - Pawel Kozlowski
 # robwormald - Rob Wormald
 # tbosch - Tobias Bosch
-# tinayuangao - Tina Gao
 # vicb - Victor Berchet
 # vikerman - Vikram Subramanian
 # wardbell - Ward Bell
-
+# tinayuangao - Tina Gao
 
 version: 2
 
@@ -69,8 +66,8 @@ groups:
           - "*.lock"
           - "tools/*"
         exclude:
+          - "tools/@angular/tsc-wrapped/*"
           - "tools/public_api_guard/*"
-          - "tools/ngc-wrapped/*"
           - "aio/*"
     users:
       - IgorMinar #primary
@@ -96,7 +93,6 @@ groups:
         - "packages/core/*"
     users:
       - tbosch #primary
-      - chuckjaz
       - mhevery
       - vicb
       - IgorMinar #fallback
@@ -108,7 +104,6 @@ groups:
         - "packages/platform-browser/animations/*"
     users:
       - matsko #primary
-      - chuckjaz #fallback
       - mhevery #fallback
       - IgorMinar #fallback
 
@@ -136,9 +131,8 @@ groups:
   compiler-cli:
     conditions:
       files:
-        - "packages/tsc-wrapped/*"
+        - "tools/@angular/tsc-wrapped/*"
         - "packages/compiler-cli/*"
-        - "tools/ngc-wrapped/*"
     users:
       - alexeagle
       - chuckjaz
@@ -255,46 +249,10 @@ groups:
   angular.io:
     conditions:
       files:
-        include:
-          - "aio/*"
-        exclude:
-          - "aio/content/*"
+        - "aio/*"
     users:
-      - petebacondarwin #primary
-      - IgorMinar
+      - IgorMinar #primary
+      - petebacondarwin #secondary
       - gkalpak
-      - mhevery #fallback
-
-  angular.io-guide-and-tutorial:
-    conditions:
-      files:
-        include:
-          - "aio/content/*"
-        exclude:
-          - "aio/content/marketing/*"
-          - "aio/content/navigation.json"
-          - "aio/content/license.md"
-    users:
-      - juleskremer #primary
-      - Foxandxss
-      - stephenfluin
       - wardbell
-      - petebacondarwin
-      - gkalpak
-      - IgorMinar #fallback
-      - mhevery #fallback
-
-  angular.io-marketing:
-    conditions:
-      files:
-        include:
-          - "aio/content/marketing/*"
-          - "aio/content/navigation.json"
-          - "aio/content/license.md"
-    users:
-      - juleskremer #primary
-      - stephenfluin
-      - petebacondarwin
-      - gkalpak
-      - IgorMinar #fallback
       - mhevery #fallback

.travis.yml

@@ -1,12 +1,9 @@
 language: node_js
 sudo: false
-# force trusty as Google Chrome addon is not supported on Precise
-dist: trusty
 node_js:
   - '6.9.5'
 
 addons:
-  chrome: stable
 #  firefox: "38.0"
   apt:
     sources:
@@ -55,15 +52,14 @@ env:
     - CI_MODE=browserstack_optional
     - CI_MODE=docs_test
     - CI_MODE=aio
-    - CI_MODE=aio_e2e AIO_SHARD=0
-    - CI_MODE=aio_e2e AIO_SHARD=1
-    - CI_MODE=bazel
+    - CI_MODE=aio_e2e
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: "CI_MODE=saucelabs_optional"
     - env: "CI_MODE=browserstack_optional"
+    - env: "CI_MODE=aio_e2e"
 
 before_install:
   # source the env.sh script so that the exported variables are available to other scripts later on
@@ -80,4 +76,5 @@ script:
   - ./scripts/ci/angular.sh
   # all the scripts under this line will not quickly abort in case ${TRAVIS_TEST_RESULT} is 1 (job failure)
   - ./scripts/ci/cleanup.sh
-  - ./scripts/ci/print-logs.sh
+  # Disabled so we can debug Travis build failures on Master seeming to coming from printing logs
+  # - ./scripts/ci/print-logs.sh

BUILD

@@ -11,15 +11,8 @@ filegroup(
         # This won't scale in the general case.
         # TODO(alexeagle): figure out what to do
         "node_modules/typescript/**",
-        "node_modules/zone.js/**",
+        "node_modules/zone.js/**/*.d.ts",
         "node_modules/rxjs/**/*.d.ts",
-        "node_modules/rxjs/**/*.js",
         "node_modules/@types/**/*.d.ts",
-        "node_modules/tsickle/**",
-        "node_modules/hammerjs/**/*.d.ts",
-        "node_modules/protobufjs/**",
-        "node_modules/bytebuffer/**",
-        "node_modules/reflect-metadata/**",
-        "node_modules/minimist/**/*.js",
     ]),
 )

CONTRIBUTING.md

@@ -17,7 +17,7 @@ Help us keep Angular open and inclusive. Please read and follow our [Code of Con
 
 ## <a name="question"></a> Got a Question or Problem?
 
-Do not open issues for general support questions as we want to keep GitHub issues for bug reports and feature requests. You've got much better chances of getting your question answered on [Stack Overflow](https://stackoverflow.com/questions/tagged/angular) where the questions should be tagged with tag `angular`.
+Please, do not open issues for the general support questions as we want to keep GitHub issues for bug reports and feature requests. You've got much better chances of getting your question answered on [Stack Overflow](https://stackoverflow.com/questions/tagged/angular) where the questions should be tagged with tag `angular`.
 
 Stack Overflow is a much better place to ask questions since:
 
@@ -25,7 +25,7 @@ Stack Overflow is a much better place to ask questions since:
 - questions and answers stay available for public viewing so your question / answer might help someone else
 - Stack Overflow's voting system assures that the best answers are prominently visible.
 
-To save your and our time, we will systematically close all issues that are requests for general support and redirect people to Stack Overflow.
+To save your and our time we will be systematically closing all the issues that are requests for general support and redirecting people to Stack Overflow.
 
 If you would like to chat about the question in real-time, you can reach out via [our gitter channel][gitter].
 
@@ -206,7 +206,6 @@ The scope should be the name of the npm package affected (as perceived by person
 
 The following is the list of supported scopes:
 
-* **animations**
 * **common**
 * **compiler**
 * **compiler-cli**

README.md

@@ -3,21 +3,22 @@
 [![Join the chat at https://gitter.im/angular/angular](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular/angular?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 [![Issue Stats](http://issuestats.com/github/angular/angular/badge/pr?style=flat)](http://issuestats.com/github/angular/angular)
 [![Issue Stats](http://issuestats.com/github/angular/angular/badge/issue?style=flat)](http://issuestats.com/github/angular/angular)
-[![npm version](https://badge.fury.io/js/%40angular%2Fcore.svg)](https://www.npmjs.com/@angular/core)
-
+[![npm version](https://badge.fury.io/js/%40angular%2Fcore.svg)](https://badge.fury.io/js/%40angular%2Fcore)
 
 [![Sauce Test Status](https://saucelabs.com/browser-matrix/angular2-ci.svg)](https://saucelabs.com/u/angular2-ci)
-
 *Safari (7+), iOS (7+), Edge (14) and IE mobile (11) are tested on [BrowserStack][browserstack].*
 
-# Angular
+Angular
+=========
+
+Angular is a development platform for building mobile and desktop web applications using Typescript/JavaScript (JS) and other languages.
 
-Angular is a development platform for building mobile and desktop web applications using Typescript/JavaScript and other languages.
 
 ## Quickstart
 
 [Get started in 5 minutes][quickstart].
 
+
 ## Want to help?
 
 Want to file a bug, contribute some code, or improve documentation? Excellent! Read up on our

WORKSPACE

@@ -1,17 +1,11 @@
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
-   name = "build_bazel_rules_typescript",
+   name = "io_bazel_rules_typescript",
    remote = "https://github.com/bazelbuild/rules_typescript.git",
-   tag = "0.0.5",
+   commit = "3a8404d",
 )
 
-load("@build_bazel_rules_typescript//:defs.bzl", "node_repositories")
+load("@io_bazel_rules_typescript//:defs.bzl", "node_repositories")
 
 node_repositories(package_json = "//:package.json")
-
-git_repository(
-    name = "build_bazel_rules_angular",
-    remote = "https://github.com/bazelbuild/rules_angular.git",
-    tag = "0.0.1",
-)

aio/README.md

@@ -16,7 +16,6 @@ Here are the most important tasks you might need to use:
 * `yarn setup` - Install all the dependencies, boilerplate, plunkers, zips and runs dgeni on the docs.
 
 * `yarn start` - run a development web server that watches the files; then builds the doc-viewer and reloads the page, as necessary.
-* `yarn serve-and-sync` - run both the `docs-watch` and `start` in the same console.
 * `yarn lint` - check that the doc-viewer code follows our style rules.
 * `yarn test` - watch all the source files, for the doc-viewer, and run all the unit tests when any change.
 * `yarn e2e` - run all the e2e tests for the doc-viewer.
@@ -31,10 +30,6 @@ Here are the most important tasks you might need to use:
 * `yarn generate-plunkers` - generate the plunker files that are used by the `live-example` tags in the docs.
 * `yarn generate-zips` - generate the zip files from the examples. Zip available via the `live-example` tags in the docs.
 
-* `yarn example-e2e` - run all e2e tests for examples
-  - `yarn example-e2e -- --setup` - force webdriver update & other setup, then run tests
-  - `yarn example-e2e -- --filter=foo` - limit e2e tests to those containing the word "foo"
-
 * `yarn build-ie-polyfills` - generates a js file of polyfills that can be loaded in Internet Explorer.
 
 ## Using ServiceWorker locally

aio/aio-builds-setup/dockerbuild/nginx/aio-builds.conf

@@ -88,21 +88,6 @@ server {
     resolver 127.0.0.1;
   }
 
-  # Notify about PR changes
-  location "~^/pr-updated/?$" {
-    if ($request_method != "POST") {
-      add_header Allow "POST";
-      return 405;
-    }
-
-    proxy_pass_request_headers on;
-    proxy_redirect             off;
-    proxy_method               POST;
-    proxy_pass                 http://{{$AIO_UPLOAD_HOSTNAME}}:{{$AIO_UPLOAD_PORT}}$request_uri;
-
-    resolver 127.0.0.1;
-  }
-
   # Everything else
   location / {
     return 404;

aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/build-creator.ts

@@ -18,17 +18,45 @@ export class BuildCreator extends EventEmitter {
   }
 
   // Methods - Public
+  public changePrVisibility(pr: string, makePublic: boolean): Promise<void> {
+    const {oldPrDir, newPrDir} = this.getCandidatePrDirs(pr, makePublic);
+
+    return Promise.
+      all([this.exists(oldPrDir), this.exists(newPrDir)]).
+      then(([oldPrDirExisted, newPrDirExisted]) => {
+        if (!oldPrDirExisted) {
+          throw new UploadError(404, `Request to move non-existing directory '${oldPrDir}' to '${newPrDir}'.`);
+        } else if (newPrDirExisted) {
+          throw new UploadError(409, `Request to move '${oldPrDir}' to existing directory '${newPrDir}'.`);
+        }
+
+        return Promise.resolve().
+          then(() => shell.mv(oldPrDir, newPrDir)).
+          then(() => this.listShasByDate(newPrDir)).
+          then(shas => this.emit(ChangedPrVisibilityEvent.type, new ChangedPrVisibilityEvent(+pr, shas, makePublic))).
+          then(() => undefined);
+      }).
+      catch(err => {
+        if (!(err instanceof UploadError)) {
+          err = new UploadError(500, `Error while making PR ${pr} ${makePublic ? 'public' : 'hidden'}.\n${err}`);
+        }
+
+        throw err;
+      });
+  }
+
   public create(pr: string, sha: string, archivePath: string, isPublic: boolean): Promise<void> {
     // Use only part of the SHA for more readable URLs.
     sha = sha.substr(0, SHORT_SHA_LEN);
 
-    const {newPrDir: prDir} = this.getCandidatePrDirs(pr, isPublic);
+    const {oldPrDir: otherVisPrDir, newPrDir: prDir} = this.getCandidatePrDirs(pr, isPublic);
     const shaDir = path.join(prDir, sha);
     let dirToRemoveOnError: string;
 
     return Promise.resolve().
+      then(() => this.exists(otherVisPrDir)).
       // If the same PR exists with different visibility, update the visibility first.
-      then(() => this.updatePrVisibility(pr, isPublic)).
+      then(otherVisPrDirExisted => (otherVisPrDirExisted && this.changePrVisibility(pr, isPublic)) as any).
       then(() => Promise.all([this.exists(prDir), this.exists(shaDir)])).
       then(([prDirExisted, shaDirExisted]) => {
         if (shaDirExisted) {
@@ -56,36 +84,6 @@ export class BuildCreator extends EventEmitter {
       });
   }
 
-  public updatePrVisibility(pr: string, makePublic: boolean): Promise<boolean> {
-    const {oldPrDir: otherVisPrDir, newPrDir: targetVisPrDir} = this.getCandidatePrDirs(pr, makePublic);
-
-    return Promise.
-      all([this.exists(otherVisPrDir), this.exists(targetVisPrDir)]).
-      then(([otherVisPrDirExisted, targetVisPrDirExisted]) => {
-        if (!otherVisPrDirExisted) {
-          // No visibility change: Either the visibility is up-to-date or the PR does not exist.
-          return false;
-        } else if (targetVisPrDirExisted) {
-          // Error: Directories for both visibilities exist.
-          throw new UploadError(409, `Request to move '${otherVisPrDir}' to existing directory '${targetVisPrDir}'.`);
-        }
-
-        // Visibility change: Moving `otherVisPrDir` to `targetVisPrDir`.
-        return Promise.resolve().
-          then(() => shell.mv(otherVisPrDir, targetVisPrDir)).
-          then(() => this.listShasByDate(targetVisPrDir)).
-          then(shas => this.emit(ChangedPrVisibilityEvent.type, new ChangedPrVisibilityEvent(+pr, shas, makePublic))).
-          then(() => true);
-      }).
-      catch(err => {
-        if (!(err instanceof UploadError)) {
-          err = new UploadError(500, `Error while making PR ${pr} ${makePublic ? 'public' : 'hidden'}.\n${err}`);
-        }
-
-        throw err;
-      });
-  }
-
   // Methods - Protected
   protected exists(fileOrDir: string): Promise<boolean> {
     return new Promise(resolve => fs.access(fileOrDir, err => resolve(!err)));

aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/index-test.ts

@@ -1,31 +1,17 @@
 // Imports
 import {GithubPullRequests} from '../common/github-pull-requests';
-import {BUILD_VERIFICATION_STATUS, BuildVerifier} from '../upload-server/build-verifier';
-import {UploadError} from '../upload-server/upload-error';
-import * as c from './constants';
+import {BUILD_VERIFICATION_STATUS, BuildVerifier} from './build-verifier';
+import {UploadError} from './upload-error';
 
 // Run
 // TODO(gkalpak): Add e2e tests to cover these interactions as well.
 GithubPullRequests.prototype.addComment = () => Promise.resolve();
-BuildVerifier.prototype.getPrIsTrusted = (pr: number) => {
-  switch (pr) {
-    case c.BV_getPrIsTrusted_error:
-      // For e2e tests, fake an error.
-      return Promise.reject('Test');
-    case c.BV_getPrIsTrusted_notTrusted:
-      // For e2e tests, fake an untrusted PR (`false`).
-      return Promise.resolve(false);
-    default:
-      // For e2e tests, default to trusted PRs (`true`).
-      return Promise.resolve(true);
-  }
-};
 BuildVerifier.prototype.verify = (expectedPr: number, authHeader: string) => {
   switch (authHeader) {
-    case c.BV_verify_error:
+    case 'FAKE_VERIFICATION_ERROR':
       // For e2e tests, fake a verification error.
       return Promise.reject(new UploadError(403, `Error while verifying upload for PR ${expectedPr}: Test`));
-    case c.BV_verify_verifiedNotTrusted:
+    case 'FAKE_VERIFIED_NOT_TRUSTED':
       // For e2e tests, fake a `verifiedNotTrusted` verification status.
       return Promise.resolve(BUILD_VERIFICATION_STATUS.verifiedNotTrusted);
     default:
@@ -35,4 +21,4 @@ BuildVerifier.prototype.verify = (expectedPr: number, authHeader: string) => {
 };
 
 // tslint:disable-next-line: no-var-requires
-require('../upload-server/index');
+require('./index');

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

@@ -1,5 +1,4 @@
 // Imports
-import * as bodyParser from 'body-parser';
 import * as express from 'express';
 import * as http from 'http';
 import {GithubPullRequests} from '../common/github-pull-requests';
@@ -85,7 +84,6 @@ class UploadServerFactory {
 
   protected createMiddleware(buildVerifier: BuildVerifier, buildCreator: BuildCreator): express.Express {
     const middleware = express();
-    const jsonParser = bodyParser.json();
 
     middleware.get(/^\/create-build\/([1-9][0-9]*)\/([0-9a-f]{40})\/?$/, (req, res) => {
       const pr = req.params[0];
@@ -98,8 +96,8 @@ class UploadServerFactory {
       } else if (!archive) {
         this.throwRequestError(400, `Missing or empty '${X_FILE_HEADER}' header`, req);
       } else {
-        Promise.resolve().
-          then(() => buildVerifier.verify(+pr, authHeader)).
+        buildVerifier.
+          verify(+pr, authHeader).
           then(verStatus => verStatus === BUILD_VERIFICATION_STATUS.verifiedAndTrusted).
           then(isPublic => buildCreator.create(pr, sha, archive, isPublic).
             then(() => res.sendStatus(isPublic ? 201 : 202))).
@@ -107,23 +105,8 @@ class UploadServerFactory {
       }
     });
     middleware.get(/^\/health-check\/?$/, (_req, res) => res.sendStatus(200));
-    middleware.post(/^\/pr-updated\/?$/, jsonParser, (req, res) => {
-      const {action, number: prNo}: {action?: string, number?: number} = req.body;
-      const visMayHaveChanged = !action || (action === 'labeled') || (action === 'unlabeled');
-
-      if (!visMayHaveChanged) {
-        res.sendStatus(200);
-      } else if (!prNo) {
-        this.throwRequestError(400, `Missing or empty 'number' field`, req);
-      } else {
-        Promise.resolve().
-          then(() => buildVerifier.getPrIsTrusted(prNo)).
-          then(isPublic => buildCreator.updatePrVisibility(String(prNo), isPublic)).
-          then(() => res.sendStatus(200)).
-          catch(err => this.respondWithError(res, err));
-      }
-    });
-    middleware.all('*', req => this.throwRequestError(404, 'Unknown resource', req));
+    middleware.get('*', req => this.throwRequestError(404, 'Unknown resource', req));
+    middleware.all('*', req => this.throwRequestError(405, 'Unsupported method', req));
     middleware.use((err: any, _req: any, res: express.Response, _next: any) => this.respondWithError(res, err));
 
     return middleware;
@@ -142,10 +125,7 @@ class UploadServerFactory {
   }
 
   protected throwRequestError(status: number, error: string, req: express.Request) {
-    const message = `${error} in request: ${req.method} ${req.originalUrl}` +
-                    (!req.body ? '' : ` ${JSON.stringify(req.body)}`);
-
-    throw new UploadError(status, message);
+    throw new UploadError(status, `${error} in request: ${req.method} ${req.originalUrl}`);
   }
 }
 

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

@@ -1,16 +0,0 @@
-// Using the values below, we can fake the response of the corresponding methods in tests. This is
-// necessary, because the test upload-server will be running as a separate node process, so we will
-// not have direct access to the code (e.g. for mocking).
-// (See also 'lib/verify-setup/start-test-upload-server.ts'.)
-
-/* tslint:disable: variable-name */
-
-// Special values to be used as `authHeader` in `BuildVerifier#verify()`.
-export const BV_verify_error = 'FAKE_VERIFICATION_ERROR';
-export const BV_verify_verifiedNotTrusted = 'FAKE_VERIFIED_NOT_TRUSTED';
-
-// Special values to be used as `pr` in `BuildVerifier#getPrIsTrusted()`.
-export const BV_getPrIsTrusted_error = 32203;
-export const BV_getPrIsTrusted_notTrusted = 72457;
-
-/* tslint:enable: variable-name */

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

@@ -317,51 +317,6 @@ describe(`nginx`, () => {
     });
 
 
-    describe(`${host}/pr-updated`, () => {
-      const url = `${scheme}://${host}/pr-updated`;
-
-
-      it('should disallow non-POST requests', done => {
-        Promise.all([
-          h.runCmd(`curl -iLX GET ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
-          h.runCmd(`curl -iLX PUT ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
-          h.runCmd(`curl -iLX PATCH ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
-          h.runCmd(`curl -iLX DELETE ${url}`).then(h.verifyResponse([405, 'Not Allowed'])),
-        ]).then(done);
-      });
-
-
-      it('should pass requests through to the upload server', done => {
-        const cmdPrefix = `curl -iLX POST --header "Content-Type: application/json"`;
-
-        const cmd1 = `${cmdPrefix} ${url}`;
-        const cmd2 = `${cmdPrefix} --data '{"number":${pr}}' ${url}`;
-        const cmd3 = `${cmdPrefix} --data '{"number":${pr},"action":"foo"}' ${url}`;
-
-        Promise.all([
-          h.runCmd(cmd1).then(h.verifyResponse(400, /Missing or empty 'number' field/)),
-          h.runCmd(cmd2).then(h.verifyResponse(200)),
-          h.runCmd(cmd3).then(h.verifyResponse(200)),
-        ]).then(done);
-      });
-
-
-      it('should respond with 404 for unknown paths', done => {
-        const cmdPrefix = `curl -iLX POST ${scheme}://${host}`;
-
-        Promise.all([
-          h.runCmd(`${cmdPrefix}/foo/pr-updated`).then(h.verifyResponse(404)),
-          h.runCmd(`${cmdPrefix}/foo-pr-updated`).then(h.verifyResponse(404)),
-          h.runCmd(`${cmdPrefix}/foonpr-updated`).then(h.verifyResponse(404)),
-          h.runCmd(`${cmdPrefix}/pr-updated/foo`).then(h.verifyResponse(404)),
-          h.runCmd(`${cmdPrefix}/pr-updated-foo`).then(h.verifyResponse(404)),
-          h.runCmd(`${cmdPrefix}/pr-updatednfoo`).then(h.verifyResponse(404)),
-        ]).then(done);
-      });
-
-    });
-
-
     describe(`${host}/*`, () => {
 
       it('should respond with 404 for unknown URLs (even if the resource exists)', done => {

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

@@ -1,6 +1,5 @@
 // Imports
 import * as path from 'path';
-import * as c from './constants';
 import {helper as h} from './helper';
 
 // Tests
@@ -15,14 +14,12 @@ h.runForAllSupportedSchemes((scheme, port) => describe(`integration (on ${scheme
   const getFile = (pr: string, sha: string, file: string) =>
     h.runCmd(`curl -iL ${scheme}://pr${pr}-${h.getShordSha(sha)}.${host}/${file}`);
   const uploadBuild = (pr: string, sha: string, archive: string, authHeader = 'Token FOO') => {
+    // Using `FAKE_VERIFICATION_ERROR` or `FAKE_VERIFIED_NOT_TRUSTED` as `authHeader`,
+    // we can fake the response of the overwritten `BuildVerifier.verify()` method.
+    // (See 'lib/upload-server/index-test.ts'.)
     const curlPost = `curl -iLX POST --header "Authorization: ${authHeader}"`;
     return h.runCmd(`${curlPost} --data-binary "@${archive}" ${scheme}://${host}/create-build/${pr}/${sha}`);
   };
-  const prUpdated = (pr: number, action?: string) => {
-    const url = `${scheme}://${host}/pr-updated`;
-    const payloadStr = JSON.stringify({number: pr, action});
-    return h.runCmd(`curl -iLX POST --header "Content-Type: application/json" --data '${payloadStr}' ${url}`);
-  };
 
   beforeEach(() => jasmine.DEFAULT_TIMEOUT_INTERVAL = 10000);
   afterEach(() => {
@@ -32,7 +29,7 @@ h.runForAllSupportedSchemes((scheme, port) => describe(`integration (on ${scheme
   });
 
 
-  describe('for a new/non-existing PR', () => {
+  describe('for a new PR', () => {
 
     it('should be able to upload and serve a public build', done => {
       const regexPrefix9 = `^PR: uploaded\\/${pr9} \\| SHA: ${sha9} \\| File:`;
@@ -57,7 +54,7 @@ h.runForAllSupportedSchemes((scheme, port) => describe(`integration (on ${scheme
 
       h.createDummyArchive(pr9, sha9, archivePath);
 
-      uploadBuild(pr9, sha9, archivePath, c.BV_verify_verifiedNotTrusted).
+      uploadBuild(pr9, sha9, archivePath, 'FAKE_VERIFIED_NOT_TRUSTED').
         then(() => Promise.all([
           getFile(pr9, sha9, 'index.html').then(h.verifyResponse(404)),
           getFile(pr9, sha9, 'foo/bar.js').then(h.verifyResponse(404)),
@@ -77,7 +74,7 @@ h.runForAllSupportedSchemes((scheme, port) => describe(`integration (on ${scheme
 
       h.createDummyArchive(pr9, sha9, archivePath);
 
-      uploadBuild(pr9, sha9, archivePath, c.BV_verify_error).
+      uploadBuild(pr9, sha9, archivePath, 'FAKE_VERIFICATION_ERROR').
         then(h.verifyResponse(403, errorRegex9)).
         then(() => {
           expect(h.buildExists(pr9)).toBe(false);
@@ -86,18 +83,6 @@ h.runForAllSupportedSchemes((scheme, port) => describe(`integration (on ${scheme
         then(done);
     });
 
-
-    it('should be able to notify that a PR has been updated (and do nothing)', done => {
-      prUpdated(+pr9).
-        then(h.verifyResponse(200)).
-        then(() => {
-          // The PR should still not exist.
-          expect(h.buildExists(pr9, '', false)).toBe(false);
-          expect(h.buildExists(pr9, '', true)).toBe(false);
-        }).
-        then(done);
-    });
-
   });
 
 
@@ -138,7 +123,7 @@ h.runForAllSupportedSchemes((scheme, port) => describe(`integration (on ${scheme
       h.createDummyBuild(pr9, sha0, false);
       h.createDummyArchive(pr9, sha9, archivePath);
 
-      uploadBuild(pr9, sha9, archivePath, c.BV_verify_verifiedNotTrusted).
+      uploadBuild(pr9, sha9, archivePath, 'FAKE_VERIFIED_NOT_TRUSTED').
         then(() => Promise.all([
           getFile(pr9, sha0, 'index.html').then(h.verifyResponse(404)),
           getFile(pr9, sha0, 'foo/bar.js').then(h.verifyResponse(404)),
@@ -163,7 +148,7 @@ h.runForAllSupportedSchemes((scheme, port) => describe(`integration (on ${scheme
       h.createDummyBuild(pr9, sha0);
       h.createDummyArchive(pr9, sha9, archivePath);
 
-      uploadBuild(pr9, sha9, archivePath, c.BV_verify_error).
+      uploadBuild(pr9, sha9, archivePath, 'FAKE_VERIFICATION_ERROR').
         then(h.verifyResponse(403, errorRegex9)).
         then(() => {
           expect(h.buildExists(pr9)).toBe(true);
@@ -201,7 +186,7 @@ h.runForAllSupportedSchemes((scheme, port) => describe(`integration (on ${scheme
       h.createDummyBuild(pr9, sha9, false);
       h.createDummyArchive(pr9, sha9, archivePath);
 
-      uploadBuild(pr9, sha9, archivePath, c.BV_verify_verifiedNotTrusted).
+      uploadBuild(pr9, sha9, archivePath, 'FAKE_VERIFIED_NOT_TRUSTED').
         then(h.verifyResponse(409)).
         then(() => {
           expect(h.readBuildFile(pr9, sha9, 'index.html', false)).toMatch(idxContentRegex9);
@@ -210,110 +195,6 @@ h.runForAllSupportedSchemes((scheme, port) => describe(`integration (on ${scheme
         then(done);
     });
 
-
-    it('should be able to request re-checking visibility (if outdated)', done => {
-      const publicPr = pr9;
-      const hiddenPr = String(c.BV_getPrIsTrusted_notTrusted);
-
-      h.createDummyBuild(publicPr, sha9, false);
-      h.createDummyBuild(hiddenPr, sha9, true);
-
-      // PR visibilities are outdated (i.e. the opposte of what the should).
-      expect(h.buildExists(publicPr, '', false)).toBe(true);
-      expect(h.buildExists(publicPr, '', true)).toBe(false);
-      expect(h.buildExists(hiddenPr, '', false)).toBe(false);
-      expect(h.buildExists(hiddenPr, '', true)).toBe(true);
-
-      Promise.
-        all([
-          prUpdated(+publicPr).then(h.verifyResponse(200)),
-          prUpdated(+hiddenPr).then(h.verifyResponse(200)),
-        ]).
-        then(() => {
-          // PR visibilities should have been updated.
-          expect(h.buildExists(publicPr, '', false)).toBe(false);
-          expect(h.buildExists(publicPr, '', true)).toBe(true);
-          expect(h.buildExists(hiddenPr, '', false)).toBe(true);
-          expect(h.buildExists(hiddenPr, '', true)).toBe(false);
-        }).
-        then(() => {
-          h.deletePrDir(publicPr, true);
-          h.deletePrDir(hiddenPr, false);
-        }).
-        then(done);
-    });
-
-
-    it('should be able to request re-checking visibility (if up-to-date)', done => {
-      const publicPr = pr9;
-      const hiddenPr = String(c.BV_getPrIsTrusted_notTrusted);
-
-      h.createDummyBuild(publicPr, sha9, true);
-      h.createDummyBuild(hiddenPr, sha9, false);
-
-      // PR visibilities are already up-to-date.
-      expect(h.buildExists(publicPr, '', false)).toBe(false);
-      expect(h.buildExists(publicPr, '', true)).toBe(true);
-      expect(h.buildExists(hiddenPr, '', false)).toBe(true);
-      expect(h.buildExists(hiddenPr, '', true)).toBe(false);
-
-      Promise.
-        all([
-          prUpdated(+publicPr).then(h.verifyResponse(200)),
-          prUpdated(+hiddenPr).then(h.verifyResponse(200)),
-        ]).
-        then(() => {
-          // PR visibilities are still up-to-date.
-          expect(h.buildExists(publicPr, '', false)).toBe(false);
-          expect(h.buildExists(publicPr, '', true)).toBe(true);
-          expect(h.buildExists(hiddenPr, '', false)).toBe(true);
-          expect(h.buildExists(hiddenPr, '', true)).toBe(false);
-        }).
-        then(done);
-    });
-
-
-    it('should reject a request if re-checking visibility fails', done => {
-      const errorPr = String(c.BV_getPrIsTrusted_error);
-
-      h.createDummyBuild(errorPr, sha9, true);
-
-      expect(h.buildExists(errorPr, '', false)).toBe(false);
-      expect(h.buildExists(errorPr, '', true)).toBe(true);
-
-      prUpdated(+errorPr).
-        then(h.verifyResponse(500, /Test/)).
-        then(() => {
-          // PR visibility should not have been updated.
-          expect(h.buildExists(errorPr, '', false)).toBe(false);
-          expect(h.buildExists(errorPr, '', true)).toBe(true);
-        }).
-        then(done);
-    });
-
-
-    it('should reject a request if updating visibility fails', done => {
-      // One way to cause an error is to have both a public and a hidden directory for the same PR.
-      h.createDummyBuild(pr9, sha9, false);
-      h.createDummyBuild(pr9, sha9, true);
-
-      const hiddenPrDir = h.getPrDir(pr9, false);
-      const publicPrDir = h.getPrDir(pr9, true);
-      const bodyRegex = new RegExp(`Request to move '${hiddenPrDir}' to existing directory '${publicPrDir}'`);
-
-      expect(h.buildExists(pr9, '', false)).toBe(true);
-      expect(h.buildExists(pr9, '', true)).toBe(true);
-
-      prUpdated(+pr9).
-        then(h.verifyResponse(409, bodyRegex)).
-        then(() => {
-          // PR visibility should not have been updated.
-          expect(h.buildExists(pr9, '', false)).toBe(true);
-          expect(h.buildExists(pr9, '', true)).toBe(true);
-        }).
-        then(done);
-    });
-
   });
 
 }));

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

@@ -1,7 +1,6 @@
 // Imports
 import * as fs from 'fs';
 import * as path from 'path';
-import * as c from './constants';
 import {CmdResult, helper as h} from './helper';
 
 // Tests
@@ -26,13 +25,13 @@ describe('upload-server (on HTTP)', () => {
 
     it('should disallow non-GET requests', done => {
       const url = `http://${host}/create-build/${pr}/${sha9}`;
-      const bodyRegex = /^Unknown resource/;
+      const bodyRegex = /^Unsupported method/;
 
       Promise.all([
-        h.runCmd(`curl -iLX PUT ${url}`).then(h.verifyResponse(404, bodyRegex)),
-        h.runCmd(`curl -iLX POST ${url}`).then(h.verifyResponse(404, bodyRegex)),
-        h.runCmd(`curl -iLX PATCH ${url}`).then(h.verifyResponse(404, bodyRegex)),
-        h.runCmd(`curl -iLX DELETE ${url}`).then(h.verifyResponse(404, bodyRegex)),
+        h.runCmd(`curl -iLX PUT ${url}`).then(h.verifyResponse(405, bodyRegex)),
+        h.runCmd(`curl -iLX POST ${url}`).then(h.verifyResponse(405, bodyRegex)),
+        h.runCmd(`curl -iLX PATCH ${url}`).then(h.verifyResponse(405, bodyRegex)),
+        h.runCmd(`curl -iLX DELETE ${url}`).then(h.verifyResponse(405, bodyRegex)),
       ]).then(done);
     });
 
@@ -64,7 +63,7 @@ describe('upload-server (on HTTP)', () => {
 
 
     it('should reject requests for which the PR verification fails', done => {
-      const headers = `--header "Authorization: ${c.BV_verify_error}" ${xFileHeader}`;
+      const headers = `--header "Authorization: FAKE_VERIFICATION_ERROR" ${xFileHeader}`;
       const url = `http://${host}/create-build/${pr}/${sha9}`;
       const bodyRegex = new RegExp(`Error while verifying upload for PR ${pr}: Test`);
 
@@ -108,7 +107,7 @@ describe('upload-server (on HTTP)', () => {
 
     [true, false].forEach(isPublic => describe(`(for ${isPublic ? 'public' : 'hidden'} builds)`, () => {
       const authorizationHeader2 = isPublic ?
-        authorizationHeader : `--header "Authorization: ${c.BV_verify_verifiedNotTrusted}"`;
+        authorizationHeader : '--header "Authorization: FAKE_VERIFIED_NOT_TRUSTED"';
       const cmdPrefix = curl('', `${authorizationHeader2} ${xFileHeader}`);
 
 
@@ -374,194 +373,27 @@ describe('upload-server (on HTTP)', () => {
   });
 
 
-  describe(`${host}/pr-updated`, () => {
-    const url = `http://${host}/pr-updated`;
-
-    // Helpers
-    const curl = (payload?: {number: number, action?: string}) => {
-      const payloadStr = payload && JSON.stringify(payload) || '';
-      return `curl -iLX POST --header "Content-Type: application/json" --data '${payloadStr}' ${url}`;
-    };
-
-
-    it('should disallow non-POST requests', done => {
-      const bodyRegex = /^Unknown resource in request/;
-
-      Promise.all([
-        h.runCmd(`curl -iLX GET ${url}`).then(h.verifyResponse(404, bodyRegex)),
-        h.runCmd(`curl -iLX PUT ${url}`).then(h.verifyResponse(404, bodyRegex)),
-        h.runCmd(`curl -iLX PATCH ${url}`).then(h.verifyResponse(404, bodyRegex)),
-        h.runCmd(`curl -iLX DELETE ${url}`).then(h.verifyResponse(404, bodyRegex)),
-      ]).then(done);
-    });
-
-
-    it('should respond with 400 for requests without a payload', done => {
-      const bodyRegex = /^Missing or empty 'number' field in request/;
-
-      h.runCmd(curl()).
-        then(h.verifyResponse(400, bodyRegex)).
-        then(done);
-    });
-
-
-    it('should respond with 400 for requests without a \'number\' field', done => {
-      const bodyRegex = /^Missing or empty 'number' field in request/;
-
-      Promise.all([
-        h.runCmd(curl({} as any)).then(h.verifyResponse(400, bodyRegex)),
-        h.runCmd(curl({number: null} as any)).then(h.verifyResponse(400, bodyRegex)),
-      ]).then(done);
-    });
-
-
-    it('should reject requests for which checking the PR visibility fails', done => {
-      h.runCmd(curl({number: c.BV_getPrIsTrusted_error})).
-        then(h.verifyResponse(500, /Test/)).
-        then(done);
-    });
-
-
-    it('should respond with 404 for unknown paths', done => {
-      const mockPayload = JSON.stringify({number: +pr});
-      const cmdPrefix = `curl -iLX POST --data "${mockPayload}" http://${host}`;
-
-      Promise.all([
-        h.runCmd(`${cmdPrefix}/foo/pr-updated`).then(h.verifyResponse(404)),
-        h.runCmd(`${cmdPrefix}/foo-pr-updated`).then(h.verifyResponse(404)),
-        h.runCmd(`${cmdPrefix}/foonpr-updated`).then(h.verifyResponse(404)),
-        h.runCmd(`${cmdPrefix}/pr-updated/foo`).then(h.verifyResponse(404)),
-        h.runCmd(`${cmdPrefix}/pr-updated-foo`).then(h.verifyResponse(404)),
-        h.runCmd(`${cmdPrefix}/pr-updatednfoo`).then(h.verifyResponse(404)),
-      ]).then(done);
-    });
-
-
-    it('should do nothing if PR\'s visibility is already up-to-date', done => {
-      const publicPr = pr;
-      const hiddenPr = String(c.BV_getPrIsTrusted_notTrusted);
-      const checkVisibilities = () => {
-        // Public build is already public.
-        expect(h.buildExists(publicPr, '', false)).toBe(false);
-        expect(h.buildExists(publicPr, '', true)).toBe(true);
-        // Hidden build is already hidden.
-        expect(h.buildExists(hiddenPr, '', false)).toBe(true);
-        expect(h.buildExists(hiddenPr, '', true)).toBe(false);
-      };
-
-      h.createDummyBuild(publicPr, sha9, true);
-      h.createDummyBuild(hiddenPr, sha9, false);
-      checkVisibilities();
-
-      Promise.
-        all([
-          h.runCmd(curl({number: +publicPr, action: 'foo'})).then(h.verifyResponse(200)),
-          h.runCmd(curl({number: +hiddenPr, action: 'foo'})).then(h.verifyResponse(200)),
-        ]).
-        // Visibilities should not have changed, because the specified action could not have triggered a change.
-        then(checkVisibilities).
-        then(done);
-    });
-
-
-    it('should do nothing if \'action\' implies no visibility change', done => {
-      const publicPr = pr;
-      const hiddenPr = String(c.BV_getPrIsTrusted_notTrusted);
-      const checkVisibilities = () => {
-        // Public build is hidden atm.
-        expect(h.buildExists(publicPr, '', false)).toBe(true);
-        expect(h.buildExists(publicPr, '', true)).toBe(false);
-        // Hidden build is public atm.
-        expect(h.buildExists(hiddenPr, '', false)).toBe(false);
-        expect(h.buildExists(hiddenPr, '', true)).toBe(true);
-      };
-
-      h.createDummyBuild(publicPr, sha9, false);
-      h.createDummyBuild(hiddenPr, sha9, true);
-      checkVisibilities();
-
-      Promise.
-        all([
-          h.runCmd(curl({number: +publicPr, action: 'foo'})).then(h.verifyResponse(200)),
-          h.runCmd(curl({number: +hiddenPr, action: 'foo'})).then(h.verifyResponse(200)),
-        ]).
-        // Visibilities should not have changed, because the specified action could not have triggered a change.
-        then(checkVisibilities).
-        then(done);
-    });
-
-
-    describe('when the visiblity has changed', () => {
-      const publicPr = pr;
-      const hiddenPr = String(c.BV_getPrIsTrusted_notTrusted);
-
-      beforeEach(() => {
-        // Create initial PR builds with opposite visibilities as the ones that will be reported:
-        // - The now public PR was previously hidden.
-        // - The now hidden PR was previously public.
-        h.createDummyBuild(publicPr, sha9, false);
-        h.createDummyBuild(hiddenPr, sha9, true);
-
-        expect(h.buildExists(publicPr, '', false)).toBe(true);
-        expect(h.buildExists(publicPr, '', true)).toBe(false);
-        expect(h.buildExists(hiddenPr, '', false)).toBe(false);
-        expect(h.buildExists(hiddenPr, '', true)).toBe(true);
-      });
-      afterEach(() => {
-        // Expect PRs' visibility to have been updated:
-        // - The public PR should be actually public (previously it was hidden).
-        // - The hidden PR should be actually hidden (previously it was public).
-        expect(h.buildExists(publicPr, '', false)).toBe(false);
-        expect(h.buildExists(publicPr, '', true)).toBe(true);
-        expect(h.buildExists(hiddenPr, '', false)).toBe(true);
-        expect(h.buildExists(hiddenPr, '', true)).toBe(false);
-
-        h.deletePrDir(publicPr, true);
-        h.deletePrDir(hiddenPr, false);
-      });
-
-
-      it('should update the PR\'s visibility (action: undefined)', done => {
-        Promise.all([
-          h.runCmd(curl({number: +publicPr})).then(h.verifyResponse(200)),
-          h.runCmd(curl({number: +hiddenPr})).then(h.verifyResponse(200)),
-        ]).then(done);
-      });
-
-
-      it('should update the PR\'s visibility (action: labeled)', done => {
-        Promise.all([
-          h.runCmd(curl({number: +publicPr, action: 'labeled'})).then(h.verifyResponse(200)),
-          h.runCmd(curl({number: +hiddenPr, action: 'labeled'})).then(h.verifyResponse(200)),
-        ]).then(done);
-      });
-
-
-      it('should update the PR\'s visibility (action: unlabeled)', done => {
-        Promise.all([
-          h.runCmd(curl({number: +publicPr, action: 'unlabeled'})).then(h.verifyResponse(200)),
-          h.runCmd(curl({number: +hiddenPr, action: 'unlabeled'})).then(h.verifyResponse(200)),
-        ]).then(done);
-      });
-
-    });
-
-  });
-
-
   describe(`${host}/*`, () => {
 
-    it('should respond with 404 for requests to unknown URLs', done => {
+    it('should respond with 404 for GET requests to unknown URLs', done => {
       const bodyRegex = /^Unknown resource/;
 
       Promise.all([
         h.runCmd(`curl -iL http://${host}/index.html`).then(h.verifyResponse(404, bodyRegex)),
         h.runCmd(`curl -iL http://${host}/`).then(h.verifyResponse(404, bodyRegex)),
         h.runCmd(`curl -iL http://${host}`).then(h.verifyResponse(404, bodyRegex)),
-        h.runCmd(`curl -iLX PUT http://${host}`).then(h.verifyResponse(404, bodyRegex)),
-        h.runCmd(`curl -iLX POST http://${host}`).then(h.verifyResponse(404, bodyRegex)),
-        h.runCmd(`curl -iLX PATCH http://${host}`).then(h.verifyResponse(404, bodyRegex)),
-        h.runCmd(`curl -iLX DELETE http://${host}`).then(h.verifyResponse(404, bodyRegex)),
+      ]).then(done);
+    });
+
+
+    it('should respond with 405 for non-GET requests to any URL', done => {
+      const bodyRegex = /^Unsupported method/;
+
+      Promise.all([
+        h.runCmd(`curl -iLX PUT http://${host}`).then(h.verifyResponse(405, bodyRegex)),
+        h.runCmd(`curl -iLX POST http://${host}`).then(h.verifyResponse(405, bodyRegex)),
+        h.runCmd(`curl -iLX PATCH http://${host}`).then(h.verifyResponse(405, bodyRegex)),
+        h.runCmd(`curl -iLX DELETE http://${host}`).then(h.verifyResponse(405, bodyRegex)),
       ]).then(done);
     });
 

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

@@ -20,14 +20,12 @@
     "test-watch": "nodemon --exec \"yarn ~~test-only\" --watch dist"
   },
   "dependencies": {
-    "body-parser": "^1.17.2",
     "express": "^4.14.1",
     "jasmine": "^2.5.3",
     "jsonwebtoken": "^7.3.0",
     "shelljs": "^0.7.6"
   },
   "devDependencies": {
-    "@types/body-parser": "^1.16.4",
     "@types/express": "^4.0.35",
     "@types/jasmine": "^2.5.43",
     "@types/jsonwebtoken": "^7.2.0",

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

@@ -43,25 +43,178 @@ describe('BuildCreator', () => {
   });
 
 
-  describe('create()', () => {
+  describe('changePrVisibility()', () => {
     let bcEmitSpy: jasmine.Spy;
     let bcExistsSpy: jasmine.Spy;
-    let bcExtractArchiveSpy: jasmine.Spy;
-    let bcUpdatePrVisibilitySpy: jasmine.Spy;
-    let shellMkdirSpy: jasmine.Spy;
-    let shellRmSpy: jasmine.Spy;
+    let bcListShasByDate: jasmine.Spy;
+    let shellMvSpy: jasmine.Spy;
 
     beforeEach(() => {
+      bcEmitSpy = spyOn(bc, 'emit');
+      bcExistsSpy = spyOn(bc as any, 'exists');
+      bcListShasByDate = spyOn(bc as any, 'listShasByDate');
+      shellMvSpy = spyOn(shell, 'mv');
+
+      bcExistsSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
+      bcListShasByDate.and.returnValue([]);
+    });
+
+
+    it('should return a promise', done => {
+      const promise = bc.changePrVisibility(pr, true);
+      promise.then(done);   // Do not complete the test (and release the spies) synchronously
+                            // to avoid running the actual `extractArchive()`.
+
+      expect(promise).toEqual(jasmine.any(Promise));
+    });
+
+
+    [true, false].forEach(makePublic => {
+      const oldPrDir = makePublic ? hiddenPrDir : publicPrDir;
+      const newPrDir = makePublic ? publicPrDir : hiddenPrDir;
+
+
+      it('should rename the directory', done => {
+        bc.changePrVisibility(pr, makePublic).
+          then(() => expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir)).
+          then(done);
+      });
+
+
+      it('should emit a ChangedPrVisibilityEvent on success', done => {
+        let emitted = false;
+
+        bcEmitSpy.and.callFake((type: string, evt: ChangedPrVisibilityEvent) => {
+          expect(type).toBe(ChangedPrVisibilityEvent.type);
+          expect(evt).toEqual(jasmine.any(ChangedPrVisibilityEvent));
+          expect(evt.pr).toBe(+pr);
+          expect(evt.shas).toEqual(jasmine.any(Array));
+          expect(evt.isPublic).toBe(makePublic);
+
+          emitted = true;
+        });
+
+        bc.changePrVisibility(pr, makePublic).
+          then(() => expect(emitted).toBe(true)).
+          then(done);
+      });
+
+
+      it('should include all shas in the emitted event', done => {
+        const shas = ['foo', 'bar', 'baz'];
+        let emitted = false;
+
+        bcListShasByDate.and.returnValue(Promise.resolve(shas));
+        bcEmitSpy.and.callFake((type: string, evt: ChangedPrVisibilityEvent) => {
+          expect(bcListShasByDate).toHaveBeenCalledWith(newPrDir);
+
+          expect(type).toBe(ChangedPrVisibilityEvent.type);
+          expect(evt).toEqual(jasmine.any(ChangedPrVisibilityEvent));
+          expect(evt.pr).toBe(+pr);
+          expect(evt.shas).toBe(shas);
+          expect(evt.isPublic).toBe(makePublic);
+
+          emitted = true;
+        });
+
+        bc.changePrVisibility(pr, makePublic).
+          then(() => expect(emitted).toBe(true)).
+          then(done);
+      });
+
+
+      describe('on error', () => {
+
+        it('should abort and skip further operations if the old directory does not exist', done => {
+          bcExistsSpy.and.callFake((dir: string) => dir !== oldPrDir);
+          bc.changePrVisibility(pr, makePublic).catch(err => {
+            expectToBeUploadError(err, 404, `Request to move non-existing directory '${oldPrDir}' to '${newPrDir}'.`);
+            expect(shellMvSpy).not.toHaveBeenCalled();
+            expect(bcListShasByDate).not.toHaveBeenCalled();
+            expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
+        });
+
+
+        it('should abort and skip further operations if the new directory does already exist', done => {
+          bcExistsSpy.and.returnValue(true);
+          bc.changePrVisibility(pr, makePublic).catch(err => {
+            expectToBeUploadError(err, 409, `Request to move '${oldPrDir}' to existing directory '${newPrDir}'.`);
+            expect(shellMvSpy).not.toHaveBeenCalled();
+            expect(bcListShasByDate).not.toHaveBeenCalled();
+            expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
+        });
+
+
+        it('should abort and skip further operations if it fails to rename the directory', done => {
+          shellMvSpy.and.throwError('');
+          bc.changePrVisibility(pr, makePublic).catch(() => {
+            expect(shellMvSpy).toHaveBeenCalled();
+            expect(bcListShasByDate).not.toHaveBeenCalled();
+            expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
+        });
+
+
+        it('should abort and skip further operations if it fails to list the SHAs', done => {
+          bcListShasByDate.and.throwError('');
+          bc.changePrVisibility(pr, makePublic).catch(() => {
+            expect(shellMvSpy).toHaveBeenCalled();
+            expect(bcListShasByDate).toHaveBeenCalled();
+            expect(bcEmitSpy).not.toHaveBeenCalled();
+            done();
+          });
+        });
+
+
+        it('should reject with an UploadError', done => {
+          shellMvSpy.and.callFake(() => { throw 'Test'; });
+          bc.changePrVisibility(pr, makePublic).catch(err => {
+            expectToBeUploadError(err, 500, `Error while making PR ${pr} ${makePublic ? 'public' : 'hidden'}.\nTest`);
+            done();
+          });
+        });
+
+
+        it('should pass UploadError instances unmodified', done => {
+          shellMvSpy.and.callFake(() => { throw new UploadError(543, 'Test'); });
+          bc.changePrVisibility(pr, makePublic).catch(err => {
+            expectToBeUploadError(err, 543, 'Test');
+            done();
+          });
+        });
+
+      });
+
+    });
+
+  });
+
+
+  describe('create()', () => {
+    let bcChangePrVisibilitySpy: jasmine.Spy;
+    let bcEmitSpy: jasmine.Spy;
+    let bcExistsSpy: jasmine.Spy;
+    let bcExtractArchiveSpy: jasmine.Spy;
+    let shellMkdirSpy: jasmine.Spy;
+    let shellRmSpy: jasmine.Spy;
+
+    beforeEach(() => {
+      bcChangePrVisibilitySpy = spyOn(bc, 'changePrVisibility');
       bcEmitSpy = spyOn(bc, 'emit');
       bcExistsSpy = spyOn(bc as any, 'exists');
       bcExtractArchiveSpy = spyOn(bc as any, 'extractArchive');
-      bcUpdatePrVisibilitySpy = spyOn(bc, 'updatePrVisibility');
       shellMkdirSpy = spyOn(shell, 'mkdir');
       shellRmSpy = spyOn(shell, 'rm');
     });
 
 
     [true, false].forEach(isPublic => {
+      const otherVisPrDir = isPublic ? hiddenPrDir : publicPrDir;
       const prDir = isPublic ? publicPrDir : hiddenPrDir;
       const shaDir = isPublic ? publicShaDir : hiddenShaDir;
 
@@ -75,12 +228,20 @@ describe('BuildCreator', () => {
       });
 
 
+      it('should not update the PR\'s visibility first if not necessary', done => {
+        bc.create(pr, sha, archive, isPublic).
+          then(() => expect(bcChangePrVisibilitySpy).not.toHaveBeenCalled()).
+          then(done);
+      });
+
+
       it('should update the PR\'s visibility first if necessary', done => {
-        bcUpdatePrVisibilitySpy.and.callFake(() => expect(shellMkdirSpy).not.toHaveBeenCalled());
+        bcChangePrVisibilitySpy.and.callFake(() => expect(shellMkdirSpy).not.toHaveBeenCalled());
+        bcExistsSpy.and.callFake((dir: string) => dir === otherVisPrDir);
 
         bc.create(pr, sha, archive, isPublic).
           then(() => {
-            expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledWith(pr, isPublic);
+            expect(bcChangePrVisibilitySpy).toHaveBeenCalledWith(pr, isPublic);
             expect(shellMkdirSpy).toHaveBeenCalled();
           }).
           then(done);
@@ -125,6 +286,7 @@ describe('BuildCreator', () => {
 
         beforeEach(() => {
           existsValues = {
+            [otherVisPrDir]: false,
             [prDir]: false,
             [shaDir]: false,
           };
@@ -135,12 +297,14 @@ describe('BuildCreator', () => {
 
         it('should abort and skip further operations if changing the PR\'s visibility fails', done => {
           const mockError = new UploadError(543, 'Test');
-          bcUpdatePrVisibilitySpy.and.returnValue(Promise.reject(mockError));
+
+          existsValues[otherVisPrDir] = true;
+          bcChangePrVisibilitySpy.and.returnValue(Promise.reject(mockError));
 
           bc.create(pr, sha, archive, isPublic).catch(err => {
             expect(err).toBe(mockError);
 
-            expect(bcExistsSpy).not.toHaveBeenCalled();
+            expect(bcExistsSpy).toHaveBeenCalledTimes(1);
             expect(shellMkdirSpy).not.toHaveBeenCalled();
             expect(bcExtractArchiveSpy).not.toHaveBeenCalled();
             expect(bcEmitSpy).not.toHaveBeenCalled();
@@ -163,10 +327,8 @@ describe('BuildCreator', () => {
 
 
         it('should detect existing build directory after visibility change', done => {
-          bcUpdatePrVisibilitySpy.and.callFake(() => existsValues[prDir] = existsValues[shaDir] = true);
-
-          expect(bcExistsSpy(prDir)).toBe(false);
-          expect(bcExistsSpy(shaDir)).toBe(false);
+          existsValues[otherVisPrDir] = true;
+          bcChangePrVisibilitySpy.and.callFake(() => existsValues[prDir] = existsValues[shaDir] = true);
 
           bc.create(pr, sha, archive, isPublic).catch(err => {
             expectToBeUploadError(err, 409, `Request to overwrite existing directory: ${shaDir}`);
@@ -244,190 +406,6 @@ describe('BuildCreator', () => {
   });
 
 
-  describe('updatePrVisibility()', () => {
-    let bcEmitSpy: jasmine.Spy;
-    let bcExistsSpy: jasmine.Spy;
-    let bcListShasByDate: jasmine.Spy;
-    let shellMvSpy: jasmine.Spy;
-
-    beforeEach(() => {
-      bcEmitSpy = spyOn(bc, 'emit');
-      bcExistsSpy = spyOn(bc as any, 'exists');
-      bcListShasByDate = spyOn(bc as any, 'listShasByDate');
-      shellMvSpy = spyOn(shell, 'mv');
-
-      bcExistsSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
-      bcListShasByDate.and.returnValue([]);
-    });
-
-
-    it('should return a promise', done => {
-      const promise = bc.updatePrVisibility(pr, true);
-      promise.then(done);   // Do not complete the test (and release the spies) synchronously
-                            // to avoid running the actual `extractArchive()`.
-
-      expect(promise).toEqual(jasmine.any(Promise));
-    });
-
-
-    [true, false].forEach(makePublic => {
-      const oldPrDir = makePublic ? hiddenPrDir : publicPrDir;
-      const newPrDir = makePublic ? publicPrDir : hiddenPrDir;
-
-
-      it('should rename the directory', done => {
-        bc.updatePrVisibility(pr, makePublic).
-          then(() => expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir)).
-          then(done);
-      });
-
-
-      describe('when the visibility is updated', () => {
-
-        it('should resolve to true', done => {
-          bc.updatePrVisibility(pr, makePublic).
-            then(result => expect(result).toBe(true)).
-            then(done);
-        });
-
-
-        it('should rename the directory', done => {
-          bc.updatePrVisibility(pr, makePublic).
-            then(() => expect(shellMvSpy).toHaveBeenCalledWith(oldPrDir, newPrDir)).
-            then(done);
-        });
-
-
-        it('should emit a ChangedPrVisibilityEvent on success', done => {
-          let emitted = false;
-
-          bcEmitSpy.and.callFake((type: string, evt: ChangedPrVisibilityEvent) => {
-            expect(type).toBe(ChangedPrVisibilityEvent.type);
-            expect(evt).toEqual(jasmine.any(ChangedPrVisibilityEvent));
-            expect(evt.pr).toBe(+pr);
-            expect(evt.shas).toEqual(jasmine.any(Array));
-            expect(evt.isPublic).toBe(makePublic);
-
-            emitted = true;
-          });
-
-          bc.updatePrVisibility(pr, makePublic).
-            then(() => expect(emitted).toBe(true)).
-            then(done);
-        });
-
-
-        it('should include all shas in the emitted event', done => {
-          const shas = ['foo', 'bar', 'baz'];
-          let emitted = false;
-
-          bcListShasByDate.and.returnValue(Promise.resolve(shas));
-          bcEmitSpy.and.callFake((type: string, evt: ChangedPrVisibilityEvent) => {
-            expect(bcListShasByDate).toHaveBeenCalledWith(newPrDir);
-
-            expect(type).toBe(ChangedPrVisibilityEvent.type);
-            expect(evt).toEqual(jasmine.any(ChangedPrVisibilityEvent));
-            expect(evt.pr).toBe(+pr);
-            expect(evt.shas).toBe(shas);
-            expect(evt.isPublic).toBe(makePublic);
-
-            emitted = true;
-          });
-
-          bc.updatePrVisibility(pr, makePublic).
-            then(() => expect(emitted).toBe(true)).
-            then(done);
-        });
-
-      });
-
-
-      it('should do nothing if the visibility is already up-to-date', done => {
-        bcExistsSpy.and.callFake((dir: string) => dir === newPrDir);
-        bc.updatePrVisibility(pr, makePublic).
-          then(result => {
-            expect(result).toBe(false);
-            expect(shellMvSpy).not.toHaveBeenCalled();
-            expect(bcListShasByDate).not.toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
-          }).
-          then(done);
-      });
-
-
-      it('should do nothing if the PR directory does not exist', done => {
-        bcExistsSpy.and.returnValue(false);
-        bc.updatePrVisibility(pr, makePublic).
-          then(result => {
-            expect(result).toBe(false);
-            expect(shellMvSpy).not.toHaveBeenCalled();
-            expect(bcListShasByDate).not.toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
-          }).
-          then(done);
-      });
-
-
-      describe('on error', () => {
-
-        it('should abort and skip further operations if both directories exist', done => {
-          bcExistsSpy.and.returnValue(true);
-          bc.updatePrVisibility(pr, makePublic).catch(err => {
-            expectToBeUploadError(err, 409, `Request to move '${oldPrDir}' to existing directory '${newPrDir}'.`);
-            expect(shellMvSpy).not.toHaveBeenCalled();
-            expect(bcListShasByDate).not.toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
-            done();
-          });
-        });
-
-
-        it('should abort and skip further operations if it fails to rename the directory', done => {
-          shellMvSpy.and.throwError('');
-          bc.updatePrVisibility(pr, makePublic).catch(() => {
-            expect(shellMvSpy).toHaveBeenCalled();
-            expect(bcListShasByDate).not.toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
-            done();
-          });
-        });
-
-
-        it('should abort and skip further operations if it fails to list the SHAs', done => {
-          bcListShasByDate.and.throwError('');
-          bc.updatePrVisibility(pr, makePublic).catch(() => {
-            expect(shellMvSpy).toHaveBeenCalled();
-            expect(bcListShasByDate).toHaveBeenCalled();
-            expect(bcEmitSpy).not.toHaveBeenCalled();
-            done();
-          });
-        });
-
-
-        it('should reject with an UploadError', done => {
-          shellMvSpy.and.callFake(() => { throw 'Test'; });
-          bc.updatePrVisibility(pr, makePublic).catch(err => {
-            expectToBeUploadError(err, 500, `Error while making PR ${pr} ${makePublic ? 'public' : 'hidden'}.\nTest`);
-            done();
-          });
-        });
-
-
-        it('should pass UploadError instances unmodified', done => {
-          shellMvSpy.and.callFake(() => { throw new UploadError(543, 'Test'); });
-          bc.updatePrVisibility(pr, makePublic).catch(err => {
-            expectToBeUploadError(err, 543, 'Test');
-            done();
-          });
-        });
-
-      });
-
-    });
-
-  });
-
-
   // Protected methods
 
   describe('exists()', () => {

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

@@ -258,12 +258,12 @@ describe('uploadServerFactory', () => {
       });
 
 
-      it('should respond with 404 for non-GET requests', done => {
+      it('should respond with 405 for non-GET requests', done => {
         verifyRequests([
-          agent.put(`/create-build/${pr}/${sha}`).expect(404),
-          agent.post(`/create-build/${pr}/${sha}`).expect(404),
-          agent.patch(`/create-build/${pr}/${sha}`).expect(404),
-          agent.delete(`/create-build/${pr}/${sha}`).expect(404),
+          agent.put(`/create-build/${pr}/${sha}`).expect(405),
+          agent.post(`/create-build/${pr}/${sha}`).expect(405),
+          agent.patch(`/create-build/${pr}/${sha}`).expect(405),
+          agent.delete(`/create-build/${pr}/${sha}`).expect(405),
         ], done);
       });
 
@@ -418,12 +418,12 @@ describe('uploadServerFactory', () => {
       });
 
 
-      it('should respond with 404 for non-GET requests', done => {
+      it('should respond with 405 for non-GET requests', done => {
         verifyRequests([
-          agent.put('/health-check').expect(404),
-          agent.post('/health-check').expect(404),
-          agent.patch('/health-check').expect(404),
-          agent.delete('/health-check').expect(404),
+          agent.put('/health-check').expect(405),
+          agent.post('/health-check').expect(405),
+          agent.patch('/health-check').expect(405),
+          agent.delete('/health-check').expect(405),
         ], done);
       });
 
@@ -442,141 +442,11 @@ describe('uploadServerFactory', () => {
     });
 
 
-    describe('POST /pr-updated', () => {
-      const pr = '9';
-      const url = '/pr-updated';
-      let bvGetPrIsTrustedSpy: jasmine.Spy;
-      let bcUpdatePrVisibilitySpy: jasmine.Spy;
-
-      // Helpers
-      const createRequest = (num: number, action?: string) =>
-        agent.post(url).send({number: num, action});
-
-      beforeEach(() => {
-        bvGetPrIsTrustedSpy = spyOn(buildVerifier, 'getPrIsTrusted');
-        bcUpdatePrVisibilitySpy = spyOn(buildCreator, 'updatePrVisibility');
-      });
-
-
-      it('should respond with 404 for non-POST requests', done => {
-        verifyRequests([
-          agent.get(url).expect(404),
-          agent.put(url).expect(404),
-          agent.patch(url).expect(404),
-          agent.delete(url).expect(404),
-        ], done);
-      });
-
-
-      it('should respond with 400 for requests without a payload', done => {
-        const responseBody = `Missing or empty 'number' field in request: POST ${url} {}`;
-
-        const request1 = agent.post(url);
-        const request2 = agent.post(url).send();
-
-        verifyRequests([
-          request1.expect(400, responseBody),
-          request2.expect(400, responseBody),
-        ], done);
-      });
-
-
-      it('should respond with 400 for requests without a \'number\' field', done => {
-        const responseBodyPrefix = `Missing or empty 'number' field in request: POST ${url}`;
-
-        const request1 = agent.post(url).send({});
-        const request2 = agent.post(url).send({number: null});
-
-        verifyRequests([
-          request1.expect(400, `${responseBodyPrefix} {}`),
-          request2.expect(400, `${responseBodyPrefix} {"number":null}`),
-        ], done);
-      });
-
-
-      it('should call \'BuildVerifier#gtPrIsTrusted()\' with the correct arguments', done => {
-        const req = createRequest(+pr);
-
-        promisifyRequest(req).
-          then(() => expect(bvGetPrIsTrustedSpy).toHaveBeenCalledWith(9)).
-          then(done, done.fail);
-      });
-
-
-      it('should propagate errors from BuildVerifier', done => {
-        bvGetPrIsTrustedSpy.and.callFake(() => Promise.reject('Test'));
-
-        const req = createRequest(+pr).expect(500, 'Test');
-
-        promisifyRequest(req).
-          then(() => {
-            expect(bvGetPrIsTrustedSpy).toHaveBeenCalledWith(9);
-            expect(bcUpdatePrVisibilitySpy).not.toHaveBeenCalled();
-          }).
-          then(done, done.fail);
-      });
-
-
-      it('should call \'BuildCreator#updatePrVisibility()\' with the correct arguments', done => {
-        bvGetPrIsTrustedSpy.and.callFake((pr2: number) => Promise.resolve(pr2 === 42));
-
-        const req1 = createRequest(24);
-        const req2 = createRequest(42);
-
-        Promise.all([
-          promisifyRequest(req1).then(() => expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledWith('24', false)),
-          promisifyRequest(req2).then(() => expect(bcUpdatePrVisibilitySpy).toHaveBeenCalledWith('42', true)),
-        ]).then(done, done.fail);
-      });
-
-
-      it('should propagate errors from BuildCreator', done => {
-        bcUpdatePrVisibilitySpy.and.callFake(() => Promise.reject('Test'));
-
-        const req = createRequest(+pr).expect(500, 'Test');
-        verifyRequests([req], done);
-      });
-
-
-      describe('on success', () => {
-
-        it('should respond with 200 (action: undefined)', done => {
-          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
-
-          const reqs = [4, 2].map(num => createRequest(num).expect(200, http.STATUS_CODES[200]));
-          verifyRequests(reqs, done);
-        });
-
-
-        it('should respond with 200 (action: labeled)', done => {
-          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
-
-          const reqs = [4, 2].map(num => createRequest(num, 'labeled').expect(200, http.STATUS_CODES[200]));
-          verifyRequests(reqs, done);
-        });
-
-
-        it('should respond with 200 (action: unlabeled)', done => {
-          bvGetPrIsTrustedSpy.and.returnValues(Promise.resolve(true), Promise.resolve(false));
-
-          const reqs = [4, 2].map(num => createRequest(num, 'unlabeled').expect(200, http.STATUS_CODES[200]));
-          verifyRequests(reqs, done);
-        });
-
-
-        it('should respond with 200 (and do nothing) if \'action\' implies no visibility change', done => {
-          const promises = ['foo', 'notlabeled'].
-            map(action => createRequest(+pr, action).expect(200, http.STATUS_CODES[200])).
-            map(promisifyRequest);
-
-          Promise.all(promises).
-            then(() => {
-              expect(bvGetPrIsTrustedSpy).not.toHaveBeenCalled();
-              expect(bcUpdatePrVisibilitySpy).not.toHaveBeenCalled();
-            }).
-            then(done, done.fail);
-        });
+    describe('GET *', () => {
 
+      it('should respond with 404', done => {
+        const responseBody = 'Unknown resource in request: GET /some/url';
+        verifyRequests([agent.get('/some/url').expect(404, responseBody)], done);
       });
 
     });
@@ -584,15 +454,14 @@ describe('uploadServerFactory', () => {
 
     describe('ALL *', () => {
 
-      it('should respond with 404', done => {
-        const responseFor = (method: string) => `Unknown resource in request: ${method.toUpperCase()} /some/url`;
+      it('should respond with 405', done => {
+        const responseFor = (method: string) => `Unsupported method in request: ${method.toUpperCase()} /some/url`;
 
         verifyRequests([
-          agent.get('/some/url').expect(404, responseFor('get')),
-          agent.put('/some/url').expect(404, responseFor('put')),
-          agent.post('/some/url').expect(404, responseFor('post')),
-          agent.patch('/some/url').expect(404, responseFor('patch')),
-          agent.delete('/some/url').expect(404, responseFor('delete')),
+          agent.put('/some/url').expect(405, responseFor('put')),
+          agent.post('/some/url').expect(405, responseFor('post')),
+          agent.patch('/some/url').expect(405, responseFor('patch')),
+          agent.delete('/some/url').expect(405, responseFor('delete')),
         ], done);
       });
 

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

@@ -2,20 +2,13 @@
 # yarn lockfile v1
 
 
-"@types/body-parser@^1.16.4":
-  version "1.16.4"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.16.4.tgz#96f3660e6f88a677fee7250f5a5e6d6bda3c76bb"
-  dependencies:
-    "@types/express" "*"
-    "@types/node" "*"
-
 "@types/express-serve-static-core@*":
   version "4.0.48"
   resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.0.48.tgz#b4fa06b0fce282e582b4535ff7fac85cc90173e9"
   dependencies:
     "@types/node" "*"
 
-"@types/express@*", "@types/express@^4.0.35":
+"@types/express@^4.0.35":
   version "4.0.36"
   resolved "https://registry.yarnpkg.com/@types/express/-/express-4.0.36.tgz#14eb47de7ecb10319f0a2fb1cf971aa8680758c2"
   dependencies:
@@ -243,21 +236,6 @@ block-stream@*:
   dependencies:
     inherits "~2.0.0"
 
-body-parser@^1.17.2:
-  version "1.17.2"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.17.2.tgz#f8892abc8f9e627d42aedafbca66bf5ab99104ee"
-  dependencies:
-    bytes "2.4.0"
-    content-type "~1.0.2"
-    debug "2.6.7"
-    depd "~1.1.0"
-    http-errors "~1.6.1"
-    iconv-lite "0.4.15"
-    on-finished "~2.3.0"
-    qs "6.4.0"
-    raw-body "~2.2.0"
-    type-is "~1.6.15"
-
 boom@2.x.x:
   version "2.10.1"
   resolved "https://registry.yarnpkg.com/boom/-/boom-2.10.1.tgz#39c8918ceff5799f83f9492a848f625add0c766f"
@@ -295,10 +273,6 @@ buffer-equal-constant-time@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
 
-bytes@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-2.4.0.tgz#7d97196f9d5baf7f6935e25985549edd2a6c2339"
-
 caller-path@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-0.1.0.tgz#94085ef63581ecd3daa92444a8fe94e82577751f"
@@ -1184,10 +1158,6 @@ http-signature@~1.1.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-iconv-lite@0.4.15:
-  version "0.4.15"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.15.tgz#fe265a218ac6a57cfe854927e9d04c19825eddeb"
-
 ignore-by-default@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/ignore-by-default/-/ignore-by-default-1.0.1.tgz#48ca6d72f6c6a3af00a9ad4ae6876be3889e2b09"
@@ -1988,14 +1958,6 @@ range-parser@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
 
-raw-body@~2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.2.0.tgz#994976cf6a5096a41162840492f0bdc5d6e7fb96"
-  dependencies:
-    bytes "2.4.0"
-    iconv-lite "0.4.15"
-    unpipe "1.0.0"
-
 rc@^1.0.1, rc@^1.1.6, rc@^1.1.7:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.1.tgz#2e03e8e42ee450b8cb3dce65be1bf8974e1dfd95"
@@ -2515,7 +2477,7 @@ unique-string@^1.0.0:
   dependencies:
     crypto-random-string "^1.0.0"
 
-unpipe@1.0.0, unpipe@~1.0.0:
+unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
 

aio/aio-builds-setup/dockerbuild/scripts-sh/upload-server-test.sh

@@ -21,7 +21,7 @@ appName=aio-upload-server-test
 if [[ "$1" == "stop" ]]; then
   pm2 delete $appName
 else
-  pm2 start $AIO_SCRIPTS_JS_DIR/dist/lib/verify-setup/start-test-upload-server.js \
+  pm2 start $AIO_SCRIPTS_JS_DIR/dist/lib/upload-server/index-test.js \
     --log /var/log/aio/upload-server-test.log \
     --name $appName \
     --no-autorestart \

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

@@ -3,9 +3,10 @@
 
 TODO (gkalpak): Add docs. Mention:
 - Travis' JWT addon (+ limitations).
-  Relevant files: `.travis.yml`, `scripts/ci/env.sh`
+  Relevant files: `.travis.yml`
 - Testing on CI.
-  Relevant files: `scripts/ci/test-aio.sh`, `aio/aio-builds-setup/scripts/test.sh`
+  Relevant files: `ci/test-aio.sh`, `aio/aio-builds-setup/scripts/test.sh`
+- Preverifying on CI.
+  Relevant files: `ci/deploy.sh`, `aio/aio-builds-setup/scripts/travis-preverify-pr.sh`
 - Deploying from CI.
-  Relevant files: `scripts/ci/deploy.sh`, `aio/scripts/deploy-preview.sh`,
-                  `aio/scripts/deploy-to-firebase.sh`
+  Relevant files: `ci/deploy.sh`, `aio/scripts/deploy-preview.sh`

aio/aio-builds-setup/docs/overview--general.md

@@ -80,31 +80,13 @@ More info on the possible HTTP status codes and their meaning can be found
 [here](overview--http-status-codes.md).
 
 
-### Updating PR visibility
-- nginx receives a natification that a PR has been updated and passes it through to the
-  upload-server. This could, for example, be sent by a GitHub webhook every time a PR's labels
-  change.
-  E.g.: `ngbuilds.io/pr-updated` (payload: `{"number":<PR>,"action":"labeled"}`)
-- The request contains the PR number (as `number`) and optionally the action that triggered the
-  request (as `action`) in the payload.
-- The upload-server verifies the payload and determines whether the `action` (if specified) could
-  have led to PR visibility changes. Only requests that omit the `action` field altogether or
-  specify an action that can affect visibility are further processed.
-  (Currently, the only actions that are considered capable of affecting visibility are `labeled` and
-  `unlabeled`.)
-- The upload-server re-checks and if necessary updates the PR's visibility.
-
-More info on the possible HTTP status codes and their meaning can be found
-[here](overview--http-status-codes.md).
-
-
 ### Serving build artifacts
 - nginx receives a request for an uploaded resource on a subdomain corresponding to the PR and SHA.
   E.g.: `pr<PR>-<SHA>.ngbuilds.io/path/to/resource`
 - nginx maps the subdomain to the correct sub-directory and serves the resource.
   E.g.: `/<PR>/<SHA>/path/to/resource`
 
-More info on the possible HTTP status codes and their meaning can be found
+Again, more info on the possible HTTP status codes and their meaning can be found
 [here](overview--http-status-codes.md).
 
 

aio/aio-builds-setup/docs/overview--http-status-codes.md

@@ -42,6 +42,10 @@ with a bried explanation of what they mean:
 - **403 (Forbidden)**:
   Unable to verify build (e.g. invalid JWT token, or unable to talk to 3rd-party APIs, etc).
 
+- **404 (Not Found)**:
+  Tried to change PR visibility but the source directory did not exist.
+  (Currently, this can only happen as a rare race condition during build deployment.)
+
 - **405 (Method Not Allowed)**:
   Request method other than POST.
 
@@ -53,28 +57,6 @@ with a bried explanation of what they mean:
   Payload larger than size specified in `AIO_UPLOAD_MAX_SIZE`.
 
 
-## `https://ngbuilds.io/health-check`
-
-- **200 (OK)**:
-  The server is healthy (i.e. up and running and processing requests).
-
-
-## `https://ngbuilds.io/pr-updated`
-
-- **200 (OK)**:
-  Request processed successfully. Processing may or may not have resulted in further actions.
-
-- **400 (Bad Request)**:
-  No payload or no `number` field in payload.
-
-- **405 (Method Not Allowed)**:
-  Request method other than POST.
-
-- **409 (Conflict)**:
-  Request to overwrite existing directory (i.e. directories for both visibilities exist).
-  (Normally, this should not happen.)
-
-
 ## `https://*.ngbuilds.io/*`
 
 - **404 (Not Found)**:

aio/aio-builds-setup/docs/overview--scripts-and-commands.md

@@ -16,6 +16,13 @@ available:
   Can be used for running the tests for `<aio-builds-setup-dir>/dockerbuild/scripts-js/`. This is
   useful for CI integration. See [here](misc--integrate-with-ci.md) for more info.
 
+- `travis-preverify-pr.sh`:
+  Can be used for "pre-verifying" a PR before uploading the artifacts to the server. It checks
+  whether the author of the PR is a member of one of the specified GitHub teams (therefore allowed
+  to upload build artifacts) or the PR has the specified "trusted PR" label (meaning it has been
+  manually verified by a trusted member). This is useful for CI integration.
+  See [here](misc--integrate-with-ci.md) for more info.
+
 - `update-preview-server.sh`:
   Can be used for updating the docker container (and image) based on the latest changes checked out
   from a git repository. See [here](vm-setup--update-docker-container.md) for more info.

aio/aio-builds-setup/docs/overview--security-model.md

@@ -96,7 +96,7 @@ This section describes how each of the aforementioned sub-tasks is accomplished:
 
 5. **Deploy the artifacts to the corresponding PR's directory.**
 
-   With the preceding steps, we have verified that the uploaded artifacts have been uploaded by
+   With the preceeding steps, we have verified that the uploaded artifacts have been uploaded by
    Travis. Additionally, we have determined whether the PR can be trusted to have its previews
    publicly accessible or whether further verification is necessary. The artifacts will be stored to
    the PR's directory, but will not be publicly accessible unless the PR has been verified.

aio/aio-builds-setup/scripts/travis-preverify-pr.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+set -eux -o pipefail
+
+# Set up env
+source "`dirname $0`/_env.sh"
+
+# Build `scripts-js/`
+(
+  cd "$SCRIPTS_JS_DIR"
+  yarn install
+  yarn build
+)
+
+# Preverify PR
+AIO_GITHUB_ORGANIZATION="angular" \
+AIO_GITHUB_TEAM_SLUGS="angular-core,aio-contributors" \
+AIO_GITHUB_TOKEN=$(echo ${GITHUB_TEAM_MEMBERSHIP_CHECK_KEY} | rev) \
+AIO_REPO_SLUG=$TRAVIS_REPO_SLUG \
+AIO_TRUSTED_PR_LABEL="aio: preview" \
+AIO_PREVERIFY_PR=$TRAVIS_PULL_REQUEST \
+node "$SCRIPTS_JS_DIR/dist/lib/upload-server/index-preverify-pr"
+
+# Exit codes:
+# - 0: The PR can be automatically trusted (i.e. author belongs to trusted team or PR has the "trusted PR" label).
+# - 1: An error occurred.
+# - 2: The PR cannot be automatically trusted.

aio/content/examples/.gitignore

@@ -43,9 +43,13 @@ dist/
 **/app/**/*.ajs.js
 
 # aot
-*/aot/**/*
-!*/aot/bs-config.json
-!*/aot/index.html
+**/*.ngfactory.ts
+**/*.ngsummary.json
+**/*.ngsummary.ts
+**/*.shim.ngstyle.ts
+**/*.metadata.json
+!aot/bs-config.json
+!aot/index.html
 !rollup-config.js
 
 # i18n

aio/content/examples/ajs-quick-reference/src/app/app.component.html

@@ -14,13 +14,13 @@
 <h1>Example Snippets</h1>
 
 <!-- #docregion ngClass -->
-<div [ngClass]="{'active': isActive}">
+<div [ngClass]="{active: isActive}">
 <!-- #enddocregion ngClass -->
   [ngClass] active
 </div>
 <!-- #docregion ngClass -->
-<div [ngClass]="{'active': isActive,
-                 'shazam': isImportant}">
+<div [ngClass]="{active: isActive,
+                 shazam: isImportant}">
 <!-- #enddocregion ngClass -->
   [ngClass] active and boldly important
 </div>
@@ -57,7 +57,7 @@
 
 <p></p>
 <!-- #docregion ngStyle -->
-<div [ngStyle]="{'color': colorPreference}">
+<div [ngStyle]="{color: colorPreference}">
 <!-- #enddocregion ngStyle -->
   color preference #1
 </div>

aio/content/examples/architecture/src/app/backend.service.ts

@@ -6,7 +6,7 @@ import { Hero } from './hero';
 const HEROES = [
         new Hero('Windstorm', 'Weather mastery'),
         new Hero('Mr. Nice', 'Killing them with kindness'),
-        new Hero('Magneta', 'Manipulates metallic objects')
+        new Hero('Magneta', 'Manipulates metalic objects')
       ];
 
 @Injectable()

aio/content/examples/cli-quickstart/e2e-spec.ts

@@ -9,6 +9,6 @@ describe('cli-quickstart App', () => {
 
   it('should display message saying app works', () => {
     let pageTitle = element(by.css('app-root h1')).getText();
-    expect(pageTitle).toEqual('Welcome to My First Angular App!!');
+    expect(pageTitle).toEqual('My First Angular App');
   });
 });

aio/content/examples/cli-quickstart/e2e/app.e2e-spec.ts

@@ -9,6 +9,6 @@ describe('my-app App', function() {
 
   it('should display message saying app works', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to app!!');
+    expect(page.getParagraphText()).toEqual('app works!');
   });
 });

aio/content/examples/cli-quickstart/e2e/tsconfig.e2e.json

@@ -1,12 +1,18 @@
 {
-  "extends": "../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../out-tsc/e2e",
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "es2016"
+    ],
+    "outDir": "../dist/out-tsc-e2e",
     "module": "commonjs",
-    "target": "es5",
-    "types": [
+    "target": "es6",
+    "types":[
       "jasmine",
-      "jasminewd2",
       "node"
     ]
   }

aio/content/examples/cli-quickstart/src/app/app.component.html

@@ -1,20 +1,3 @@
-<!--The content below is only a placeholder and can be replaced.-->
-<div style="text-align:center">
-  <h1>
-    Welcome to {{title}}!!
-  </h1>
-  <img width="300" alt="Angular logo" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxOS4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjxzdmcgdmVyc2lvbj0iMS4xIiBpZD0iTGF5ZXJfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgeD0iMHB4IiB5PSIwcHgiDQoJIHZpZXdCb3g9IjAgMCAyNTAgMjUwIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCAyNTAgMjUwOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8c3R5bGUgdHlwZT0idGV4dC9jc3MiPg0KCS5zdDB7ZmlsbDojREQwMDMxO30NCgkuc3Qxe2ZpbGw6I0MzMDAyRjt9DQoJLnN0MntmaWxsOiNGRkZGRkY7fQ0KPC9zdHlsZT4NCjxnPg0KCTxwb2x5Z29uIGNsYXNzPSJzdDAiIHBvaW50cz0iMTI1LDMwIDEyNSwzMCAxMjUsMzAgMzEuOSw2My4yIDQ2LjEsMTg2LjMgMTI1LDIzMCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAJIi8+DQoJPHBvbHlnb24gY2xhc3M9InN0MSIgcG9pbnRzPSIxMjUsMzAgMTI1LDUyLjIgMTI1LDUyLjEgMTI1LDE1My40IDEyNSwxNTMuNCAxMjUsMjMwIDEyNSwyMzAgMjAzLjksMTg2LjMgMjE4LjEsNjMuMiAxMjUsMzAgCSIvPg0KCTxwYXRoIGNsYXNzPSJzdDIiIGQ9Ik0xMjUsNTIuMUw2Ni44LDE4Mi42aDBoMjEuN2gwbDExLjctMjkuMmg0OS40bDExLjcsMjkuMmgwaDIxLjdoMEwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMUwxMjUsNTIuMQ0KCQlMMTI1LDUyLjF6IE0xNDIsMTM1LjRIMTA4bDE3LTQwLjlMMTQyLDEzNS40eiIvPg0KPC9nPg0KPC9zdmc+DQo=">
-</div>
-<h2>Here are some links to help you start: </h2>
-<ul>
-  <li>
-    <h2><a target="_blank" href="https://angular.io/tutorial">Tour of Heroes</a></h2>
-  </li>
-  <li>
-    <h2><a target="_blank" href="https://github.com/angular/angular-cli/wiki">CLI Documentation</a></h2>
-  </li>
-  <li>
-    <h2><a target="_blank" href="http://angularjs.blogspot.ca/">Angular blog</a></h2>
-  </li>
-</ul>
-
+<h1>
+  {{title}}
+</h1>

aio/content/examples/cli-quickstart/src/app/app.component.spec.ts

@@ -17,16 +17,16 @@ describe('AppComponent', () => {
     expect(app).toBeTruthy();
   }));
 
-  it(`should have as title 'app'`, async(() => {
+  it(`should have as title 'app works!'`, async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('app');
+    expect(app.title).toEqual('app works!');
   }));
 
   it('should render title in a h1 tag', async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!!');
+    expect(compiled.querySelector('h1').textContent).toContain('app works!');
   }));
 });

aio/content/examples/cli-quickstart/src/app/app.module.ts

@@ -1,5 +1,7 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
+import { FormsModule } from '@angular/forms';
+import { HttpModule } from '@angular/http';
 
 import { AppComponent } from './app.component';
 
@@ -8,7 +10,9 @@ import { AppComponent } from './app.component';
     AppComponent
   ],
   imports: [
-    BrowserModule
+    BrowserModule,
+    FormsModule,
+    HttpModule
   ],
   providers: [],
   bootstrap: [AppComponent]

aio/content/examples/cli-quickstart/src/index.html

@@ -1,5 +1,5 @@
 <!doctype html>
-<html lang="en">
+<html>
 <head>
   <meta charset="utf-8">
   <title>MyApp</title>
@@ -9,6 +9,6 @@
   <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
 <body>
-  <app-root></app-root>
+  <app-root>Loading...</app-root>
 </body>
 </html>

aio/content/examples/cli-quickstart/src/polyfills.ts

@@ -31,21 +31,21 @@
 // import 'core-js/es6/array';
 // import 'core-js/es6/regexp';
 // import 'core-js/es6/map';
-// import 'core-js/es6/weak-map';
 // import 'core-js/es6/set';
 
 /** IE10 and IE11 requires the following for NgClass support on SVG elements */
 // import 'classlist.js';  // Run `npm install --save classlist.js`.
 
+/** IE10 and IE11 requires the following to support `@angular/animation`. */
+// import 'web-animations-js';  // Run `npm install --save web-animations-js`.
+
+
 /** Evergreen browsers require these. **/
 import 'core-js/es6/reflect';
 import 'core-js/es7/reflect';
 
 
-/**
- * Required to support Web Animations `@angular/animation`.
- * Needed for: All but Chrome, Firefox and Opera. http://caniuse.com/#feat=web-animation
- **/
+/** ALL Firefox browsers require the following to support `@angular/animation`. **/
 // import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
 
@@ -66,7 +66,3 @@ import 'zone.js/dist/zone';  // Included with Angular CLI.
  * Needed for: All but Chrome, Firefox, Edge, IE11 and Safari 10
  */
 // import 'intl';  // Run `npm install --save intl`.
-/**
- * Need to import at least one locale-data with intl.
- */
-// import 'intl/locale-data/jsonp/en';

aio/content/examples/cli-quickstart/src/tsconfig.app.json

@@ -1,7 +1,16 @@
 {
-  "extends": "../tsconfig.json",
   "compilerOptions": {
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "es2016",
+      "dom"
+    ],
     "outDir": "../out-tsc/app",
+    "target": "es5",
     "module": "es2015",
     "baseUrl": "",
     "types": []

aio/content/examples/cli-quickstart/src/tsconfig.spec.json

@@ -1,9 +1,16 @@
 {
-  "extends": "../tsconfig.json",
   "compilerOptions": {
+    "sourceMap": true,
+    "declaration": false,
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": [
+      "es2016"
+    ],
     "outDir": "../out-tsc/spec",
     "module": "commonjs",
-    "target": "es5",
+    "target": "es6",
     "baseUrl": "",
     "types": [
       "jasmine",
@@ -14,7 +21,6 @@
     "test.ts"
   ],
   "include": [
-    "**/*.spec.ts",
-    "**/*.d.ts"
+    "**/*.spec.ts"
   ]
 }

aio/content/examples/cli-quickstart/src/typings.d.ts

@@ -1,5 +0,0 @@
-/* SystemJS module definition */
-declare var module: NodeModule;
-interface NodeModule {
-  id: string;
-}

aio/content/examples/cli-quickstart/tsconfig.json

@@ -2,19 +2,13 @@
   "compileOnSave": false,
   "compilerOptions": {
     "outDir": "./dist/out-tsc",
-    "baseUrl": "src",
     "sourceMap": true,
     "declaration": false,
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
-    "target": "es5",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
     "lib": [
-      "es2016",
-      "dom"
+      "es2016"
     ]
   }
 }

aio/content/examples/component-interaction/src/app/app.module.ts

@@ -39,7 +39,7 @@ if (!/e2e/.test(location.search)) {
   directives.push(CountdownLocalVarParentComponent);
   directives.push(CountdownViewChildParentComponent);
 } else {
-  // In e2e test use CUSTOM_ELEMENTS_SCHEMA to suppress unknown element errors
+  // In e2e test use CUSTOM_ELEMENTS_SCHEMA to supress unknown element errors
   schemas.push(CUSTOM_ELEMENTS_SCHEMA);
 }
 

aio/content/examples/hierarchical-dependency-injection/plnkr.json

@@ -1,5 +1,5 @@
 {
-  "description": "Hierarchical Dependency Injection",
+  "description": "Hierachical Dependency Injection",
   "basePath": "src/",
   "files":[
     "!**/*.d.ts",

aio/content/examples/i18n/src/app/app.component.ts

@@ -9,7 +9,7 @@ export class AppComponent {
   wolves = 0;
   gender = 'f';
   fly = true;
-  logo = 'https://angular.io/assets/images/logos/angular/angular.png';
+  logo = 'https://angular.io/resources/images/logos/angular/angular.png';
   count = 3;
   heroes: string[] = ['Magneta', 'Celeritas', 'Dynama'];
   inc(i: number) {

aio/content/examples/ngmodule/src/app/title.component.ts

@@ -12,7 +12,7 @@ import { UserService } from './user.service';
 })
 export class TitleComponent {
   @Input() subtitle = '';
-  title = 'NgModules';
+  title = 'Angular Modules';
 // #enddocregion v1
   user = '';
 

aio/content/examples/pipes/e2e-spec.ts

@@ -85,7 +85,7 @@ describe('Pipes', function () {
       return resetEle.click();
     })
     .then(function() {
-       expect(flyingHeroesEle.count()).toEqual(2, 'reset should restore original flying heroes');
+       expect(flyingHeroesEle.count()).toEqual(2, 'reset should restore orginal flying heroes');
     });
   });
 

aio/content/examples/pipes/src/app/exponential-strength.pipe.ts

@@ -6,7 +6,7 @@ import { Pipe, PipeTransform } from '@angular/core';
  * Usage:
  *   value | exponentialStrength:exponent
  * Example:
- *   {{ 2 | exponentialStrength:10 }}
+ *   {{ 2 |  exponentialStrength:10}}
  *   formats to: 1024
 */
 @Pipe({name: 'exponentialStrength'})

aio/content/examples/reactive-forms/src/app/app.module.ts

@@ -16,7 +16,7 @@ import { HeroService }         from './hero.service'; //  <-- #1 import service
 @NgModule({
   imports: [
     BrowserModule,
-    ReactiveFormsModule // <-- #2 add to @NgModule imports
+    ReactiveFormsModule // <-- #2 add to Angular module imports
   ],
   declarations: [
     AppComponent,

aio/content/examples/structural-directives/src/app/app.component.html

@@ -213,10 +213,10 @@
 <h2 id="myUnless">UnlessDirective</h2>
 <p>
   The condition is currently
-  <span [ngClass]="{ 'a': !condition, 'b': condition, 'unless': true }">{{condition}}</span>.
+  <span [ngClass]="{ a: !condition, b: condition, unless: true }">{{condition}}</span>.
   <button
     (click)="condition = !condition"
-    [ngClass] = "{ 'a': condition, 'b': !condition }" >
+    [ngClass] = "{ a: condition, b: !condition }" >
     Toggle condition to {{condition ? 'false' : 'true'}}
   </button>
 </p>

aio/content/examples/styleguide/src/06-03/app/shared/validator2.directive.ts

@@ -4,7 +4,7 @@ import { Directive } from '@angular/core';
 @Directive({
   selector: '[tohValidator2]',
   host: {
-    '[attr.role]': 'role',
+    'attr.role': 'button',
     '(mouseenter)': 'onMouseEnter()'
   }
 })

aio/content/examples/template-syntax/src/app/app.component.html

@@ -161,7 +161,7 @@
   <!-- #docregion property-binding-syntax-1 -->
   <img [src]="heroImageUrl">
   <hero-detail [hero]="currentHero"></hero-detail>
-  <div [ngClass]="{'special': isSpecial}"></div>
+  <div [ngClass]="{special: isSpecial}"></div>
   <!-- #enddocregion property-binding-syntax-1 -->
 </div>
 <br><br>
@@ -496,7 +496,7 @@ bindon-ngModel
 <div [ngClass]="isSpecial ? 'special' : ''">This div is special</div>
 
 <div class="bad curly special">Bad curly special</div>
-<div [ngClass]="{'bad':false, 'curly':true, 'special':true}">Curly special</div>
+<div [ngClass]="{bad:false, curly:true, special:true}">Curly special</div>
 
 <a class="to-toc" href="#toc">top</a>
 

aio/content/examples/template-syntax/src/app/app.component.ts

@@ -140,9 +140,9 @@ export class AppComponent implements AfterViewInit, OnInit {
   setCurrentClasses() {
     // CSS classes: added/removed per current state of component properties
     this.currentClasses =  {
-      'saveable': this.canSave,
-      'modified': !this.isUnchanged,
-      'special':  this.isSpecial
+      saveable: this.canSave,
+      modified: !this.isUnchanged,
+      special:  this.isSpecial
     };
   }
   // #enddocregion setClasses

aio/content/examples/testing/src/app/bag/bag.ts

@@ -273,7 +273,7 @@ export class InnerCompWithExternalTemplateComponent { }
 
 @Component({
   selector: 'bad-template-comp',
-  templateUrl: './non-existent.html'
+  templateUrl: './non-existant.html'
 })
 export class BadTemplateUrlComponent { }
 

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

@@ -227,7 +227,7 @@ function heroModuleSetup() {
   // #enddocregion route-no-id
 
   // #docregion route-bad-id
-  describe('when navigate to non-existent hero id', () => {
+  describe('when navigate to non-existant hero id', () => {
     beforeEach( async(() => {
       activatedRoute.testParamMap = { id: 99999 };
       createComponent();

aio/content/examples/toh-pt6/aot/styles.css

@@ -0,0 +1,116 @@
+/* #docregion , quickstart, toh */
+/* Master Styles */
+h1 {
+  color: #369;
+  font-family: Arial, Helvetica, sans-serif;
+  font-size: 250%;
+}
+h2, h3 {
+  color: #444;
+  font-family: Arial, Helvetica, sans-serif;
+  font-weight: lighter;
+}
+body {
+  margin: 2em;
+}
+/* #enddocregion quickstart */
+body, input[text], button {
+  color: #888;
+  font-family: Cambria, Georgia;
+}
+/* #enddocregion toh */
+a {
+  cursor: pointer;
+  cursor: hand;
+}
+button {
+  font-family: Arial;
+  background-color: #eee;
+  border: none;
+  padding: 5px 10px;
+  border-radius: 4px;
+  cursor: pointer;
+  cursor: hand;
+}
+button:hover {
+  background-color: #cfd8dc;
+}
+button:disabled {
+  background-color: #eee;
+  color: #aaa;
+  cursor: auto;
+}
+
+/* Navigation link styles */
+nav a {
+  padding: 5px 10px;
+  text-decoration: none;
+  margin-right: 10px;
+  margin-top: 10px;
+  display: inline-block;
+  background-color: #eee;
+  border-radius: 4px;
+}
+nav a:visited, a:link {
+  color: #607D8B;
+}
+nav a:hover {
+  color: #039be5;
+  background-color: #CFD8DC;
+}
+nav a.active {
+  color: #039be5;
+}
+
+/* items class */
+.items {
+  margin: 0 0 2em 0;
+  list-style-type: none;
+  padding: 0;
+  width: 24em;
+}
+.items li {
+  cursor: pointer;
+  position: relative;
+  left: 0;
+  background-color: #EEE;
+  margin: .5em;
+  padding: .3em 0;
+  height: 1.6em;
+  border-radius: 4px;
+}
+.items li:hover {
+  color: #607D8B;
+  background-color: #DDD;
+  left: .1em;
+}
+.items li.selected {
+  background-color: #CFD8DC;
+  color: white;
+}
+.items li.selected:hover {
+  background-color: #BBD8DC;
+}
+.items .text {
+  position: relative;
+  top: -3px;
+}
+.items .badge {
+  display: inline-block;
+  font-size: small;
+  color: white;
+  padding: 0.8em 0.7em 0 0.7em;
+  background-color: #607D8B;
+  line-height: 1em;
+  position: relative;
+  left: -1px;
+  top: -4px;
+  height: 1.8em;
+  margin-right: .8em;
+  border-radius: 4px 0 0 4px;
+}
+/* #docregion toh */
+/* everywhere else */
+* {
+  font-family: Arial, Helvetica, sans-serif;
+}

aio/content/examples/upgrade-phonecat-2-hybrid/app/phone-detail/phone-detail.template.html

@@ -2,7 +2,7 @@
 <div *ngIf="phone">
   <div class="phone-images">
     <img [src]="img" class="phone"
-        [ngClass]="{'selected': img === mainImageUrl}"
+        [ngClass]="{selected: img === mainImageUrl}"
         *ngFor="let img of phone.images" />
   </div>
 

aio/content/examples/upgrade-phonecat-2-hybrid/e2e-spec.ts

@@ -9,8 +9,7 @@ describe('PhoneCat Application', function() {
 
   it('should redirect `index.html` to `index.html#!/phones', function() {
     browser.get('index.html');
-    browser.sleep(1000); // Not sure why this is needed but it is. The route change works fine.
-    expect(browser.getCurrentUrl()).toMatch(/\/phones$/);
+    expect(browser.getLocationAbsUrl()).toBe('/phones');
   });
 
   describe('View: Phone list', function() {
@@ -66,7 +65,7 @@ describe('PhoneCat Application', function() {
 
       element.all(by.css('.phones li a')).first().click();
       browser.sleep(1000); // Not sure why this is needed but it is. The route change works fine.
-      expect(browser.getCurrentUrl()).toMatch(/\/phones\/nexus-s$/);
+      expect(browser.getLocationAbsUrl()).toBe('/phones/nexus-s');
     });
 
   });

aio/content/examples/upgrade-phonecat-3-final/app/phone-detail/phone-detail.template.html

@@ -2,7 +2,7 @@
 <div *ngIf="phone">
   <div class="phone-images">
     <img [src]="img" class="phone"
-        [ngClass]="{'selected': img === mainImageUrl}"
+        [ngClass]="{selected: img === mainImageUrl}"
         *ngFor="let img of phone.images" />
   </div>
 

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

@@ -1000,7 +1000,7 @@ For more information on pipes, see [Pipes](guide/pipes).
 
 
 ## Modules/controllers/components
-In both AngularJS and Angular, modules help you organize your application into cohesive blocks of functionality.
+In both AngularJS and Angular, Angular modules help you organize your application into cohesive blocks of functionality.
 
 In AngularJS, you write the code that provides the model and the methods for the view in a **controller**.
 In Angular, you build a **component**.
@@ -1080,18 +1080,18 @@ The Angular code is shown using TypeScript.
     <td>
 
 
-      ### NgModules
+      ### Angular modules
       <code-example hideCopy path="ajs-quick-reference/src/app/app.module.1.ts" linenums="false">
 
       </code-example>
 
 
-      NgModules, defined with the `NgModule` decorator, serve the same purpose:
+      Angular modules, defined with the `NgModule` decorator, serve the same purpose:
 
       * `imports`: specifies the list of other modules that this module depends upon
       * `declaration`: keeps track of your components, pipes, and directives.
 
-      For more information on modules, see [NgModules](guide/ngmodule).
+      For more information on modules, see [Angular Modules (NgModule)](guide/ngmodule).
     </td>
 
   </tr>

aio/content/guide/aot-compiler.md

@@ -475,7 +475,7 @@ You'll need separate TypeScript configuration files such as these:
 <div class="callout is-helpful">
 
   <header>
-    `@types` and node modules
+    @Types and node modules
   </header>
 
   In the file structure of _this particular sample project_,
@@ -568,7 +568,7 @@ Run the following command to generate the map.
 </code-example>
 
 The `source-map-explorer` analyzes the source map generated with the bundle and draws a map of all dependencies,
-showing exactly which application and NgModules and classes are included in the bundle.
+showing exactly which application and Angular modules and classes are included in the bundle.
 
 Here's the map for _Tour of Heroes_.
 

aio/content/guide/architecture.md

@@ -31,21 +31,21 @@ You'll learn the details in the pages that follow. For now, focus on the big pic
 <img src="generated/images/guide/architecture/module.png" alt="Component" class="left">
 
 
-Angular apps are modular and Angular has its own modularity system called _NgModules_.
+Angular apps are modular and Angular has its own modularity system called _Angular modules_ or _NgModules_.
 
-NgModules are a big deal.
-This page introduces modules; the [NgModules](guide/ngmodule) page covers them in depth.
+_Angular modules_ are a big deal.
+This page introduces modules; the [Angular modules](guide/ngmodule) page covers them in depth.
 
 <br class="clear">
 
-Every Angular app has at least one NgModule class, [the _root module_](guide/bootstrapping "Bootstrapping"),
+Every Angular app has at least one Angular module class, [the _root module_](guide/bootstrapping "AppModule: the root module"),
 conventionally named `AppModule`.
 
 While the _root module_ may be the only module in a small application, most apps have many more
 _feature modules_, each a cohesive block of code dedicated to an application domain,
 a workflow, or a closely related set of capabilities.
 
-An NgModule, whether a _root_ or _feature_, is a class with an `@NgModule` decorator.
+An Angular module, whether a _root_ or _feature_, is a class with an `@NgModule` decorator.
 
 <div class="l-sub-section">
 
@@ -87,12 +87,12 @@ During development you're likely to bootstrap the `AppModule` in a `main.ts` fil
 
 <code-example path="architecture/src/main.ts" title="src/main.ts" linenums="false"></code-example>
 
-### NgModules vs. JavaScript modules
+### Angular modules vs. JavaScript modules
 
-The NgModule &mdash; a class decorated with `@NgModule` &mdash; is a fundamental feature of Angular.
+The Angular module &mdash; a class decorated with `@NgModule` &mdash; is a fundamental feature of Angular.
 
 JavaScript also has its own module system for managing collections of JavaScript objects.
-It's completely different and unrelated to the NgModule system.
+It's completely different and unrelated to the Angular module system.
 
 In JavaScript each _file_ is a module and all objects defined in the file belong to that module.
 The module declares some objects to be public by marking them with the `export` key word.
@@ -124,7 +124,7 @@ For example, import Angular's `Component` decorator from the `@angular/core` lib
 
 <code-example path="architecture/src/app/app.component.ts" region="import" linenums="false"></code-example>
 
-You also import NgModules from Angular _libraries_ using JavaScript import statements:
+You also import Angular _modules_ from Angular _libraries_ using JavaScript import statements:
 
 <code-example path="architecture/src/app/mini-app.ts" region="import-browser-module" linenums="false"></code-example>
 
@@ -139,7 +139,7 @@ Hang in there. The confusion yields to clarity with time and experience.
 
 <div class="l-sub-section">
 
-  Learn more from the [NgModules](guide/ngmodule) page.
+  Learn more from the [Angular modules](guide/ngmodule) page.
 
 </div>
 

aio/content/guide/bootstrapping.md

@@ -1,8 +1,8 @@
 # Bootstrapping
 
-An NgModule class describes how the application parts fit together.
-Every application has at least one NgModule, the _root_ module
-that you [bootstrap](#main) to launch the application.
+An Angular module class describes how the application parts fit together.
+Every application has at least one Angular module, the _root_ module
+that you [bootstrap](guide/bootstrapping#main) to launch the application.
 You can call it anything you want. The conventional name is `AppModule`.
 
 The [setup](guide/setup) instructions produce a new project with the following minimal `AppModule`.
@@ -17,14 +17,14 @@ You'll evolve this module as your application grows.
 After the `import` statements, you come to a class adorned with the
 **`@NgModule`** [_decorator_](guide/glossary#decorator '"Decorator" explained').
 
-The `@NgModule` decorator identifies `AppModule` as an `NgModule` class.
+The `@NgModule` decorator identifies `AppModule` as an Angular module class (also called an `NgModule` class).
 `@NgModule` takes a _metadata_ object that tells Angular how to compile and launch the application.
 
 * **_imports_** — the `BrowserModule` that this and every application needs to run in a browser.
 * **_declarations_** — the application's lone component, which is also ...
 * **_bootstrap_** — the _root_ component that Angular creates and inserts into the `index.html` host web page.
 
-The [NgModules](guide/ngmodule) guide dives deeply into the details of NgModules.
+The [Angular Modules (NgModule)](guide/ngmodule) guide dives deeply into the details of Angular modules.
 All you need to know at the moment is a few basics about these three properties.
 
 
@@ -33,8 +33,8 @@ All you need to know at the moment is a few basics about these three properties.
 
 ### The _imports_ array
 
-NgModules are a way to consolidate features that belong together into discrete units.
-Many features of Angular itself are organized as NgModules.
+Angular modules are a way to consolidate features that belong together into discrete units.
+Many features of Angular itself are organized as Angular modules.
 HTTP services are in the `HttpModule`. The router is in the `RouterModule`.
 Eventually you may create a feature module.
 
@@ -61,7 +61,7 @@ Other guide and cookbook pages will tell you when you need to add additional mod
 
 
 
-The `import` statements at the top of the file and the NgModule's `imports` array
+The `import` statements at the top of the file and the Angular module's `imports` array
 are unrelated and have completely different jobs.
 
 The _JavaScript_ `import` statements give you access to symbols _exported_ by other files
@@ -70,8 +70,8 @@ You add `import` statements to almost every application file.
 They have nothing to do with Angular and Angular knows nothing about them.
 
 The _module's_ `imports` array appears _exclusively_ in the `@NgModule` metadata object.
-It tells Angular about specific _other_ NgModules—all of them classes decorated
-with `@NgModule`—that the application needs to function properly.
+It tells Angular about specific _other_ Angular modules — all of them classes decorated with `@NgModule` —
+that the application needs to function properly.
 
 </div>
 
@@ -110,7 +110,7 @@ Do not put any other kind of class in `declarations`; _not_ `NgModule` classes,
 
 ### The _bootstrap_ array
 
-You launch the application by [_bootstrapping_](#main) the root `AppModule`.
+You launch the application by [_bootstrapping_](guide/bootstrapping#main) the root `AppModule`.
 Among other things, the _bootstrapping_ process creates the component(s) listed in the `bootstrap` array
 and inserts each one into the browser DOM.
 
@@ -127,6 +127,13 @@ Which brings us to the _bootstrapping_ process itself.
 
 {@a main}
 
+
+<l-main-section>
+
+</l-main-section>
+
+
+
 ## Bootstrap in _main.ts_
 
 There are many ways to bootstrap an application.
@@ -171,11 +178,11 @@ This file is very stable. Once you've set it up, you may never change it again.
 
 
 
-## More about NgModules
+## More about Angular Modules
 
 Your initial app has only a single module, the _root_ module.
 As your app grows, you'll consider subdividing it into multiple "feature" modules,
 some of which can be loaded later ("lazy loaded") if and when the user chooses
 to visit those features.
 
-When you're ready to explore these possibilities, visit the [NgModules](guide/ngmodule) guide.
+When you're ready to explore these possibilities, visit the [Angular Modules (NgModule)](guide/ngmodule) guide.

aio/content/guide/browser-support.md

@@ -193,8 +193,8 @@ Angular supports most recent browsers. This includes the following specific vers
 
 
 
-Angular's continuous integration process runs unit tests of the framework on all of these browsers for every pull request,
-using <a href="https://saucelabs.com/">SauceLabs</a> and
+Angular's continuous integration process runs unit tests of the framework on all of these browsers for every pull request, 
+using <a href="https://saucelabs.com/">SauceLabs</a> and 
 <a href="https://www.browserstack.com">Browserstack</a>.
 
 
@@ -215,7 +215,7 @@ that implement missing features in JavaScript.
 
 
 
-A particular browser may require at least one polyfill to run _any_ Angular application.
+A particular browser may require at least one polyfill to run _any_ Angular application. 
 You may need additional polyfills for specific features.
 
 The tables below can help you determine which polyfills to load, depending on the browsers you target and the features you use.
@@ -241,7 +241,7 @@ These are the polyfills required to run an Angular application on each supported
 <table>
 
   <tr style="vertical-align: top">
-
+ 
     <th>
       Browsers (Desktop & Mobile)
     </th>
@@ -253,7 +253,7 @@ These are the polyfills required to run an Angular application on each supported
   </tr>
 
   <tr style="vertical-align: top">
-
+ 
     <td>
       Chrome, Firefox, Edge, Safari 9+
     </td>
@@ -265,7 +265,7 @@ These are the polyfills required to run an Angular application on each supported
   </tr>
 
   <tr style="vertical-align: top">
-
+ 
     <td>
       Safari 7 & 8, IE10 & 11, Android 4.1+
     </td>
@@ -279,7 +279,7 @@ These are the polyfills required to run an Angular application on each supported
   </tr>
 
   <tr style="vertical-align: top">
-
+ 
     <td>
       IE9
     </td>
@@ -309,7 +309,7 @@ Here are the features which may require additional polyfills:
 <table>
 
   <tr style="vertical-align: top">
-
+ 
     <th>
       Feature
     </th>
@@ -325,7 +325,7 @@ Here are the features which may require additional polyfills:
   </tr>
 
   <tr style="vertical-align: top">
-
+ 
     <td>
 
       [Animations](guide/animations)
@@ -363,14 +363,14 @@ Here are the features which may require additional polyfills:
   </tr>
 
   <tr style="vertical-align: top">
-
+ 
     <td>
 
        [NgClass](api/common/NgClass) on SVG elements
     </td>
 
     <td>
-
+ 
 
       [classList](guide/browser-support#classlist)
     </td>
@@ -382,17 +382,16 @@ Here are the features which may require additional polyfills:
   </tr>
 
   <tr style="vertical-align: top">
-
+ 
     <td>
-
+    
       [Http](guide/http) when sending and receiving binary data
     </td>
 
     <td>
+ 
 
-      [Typed&nbsp;Array](guide/browser-support#typedarray)<br>
-      [Blob](guide/browser-support#blob)<br>
-      [FormData](guide/browser-support#formdata)
+      [Typed&nbsp;Array](guide/browser-support#typedarray) <br>[Blob](guide/browser-support#blob)<br>[FormData](guide/browser-support#formdata)
     </td>
 
     <td>
@@ -406,7 +405,7 @@ Here are the features which may require additional polyfills:
 
 
 ### Suggested polyfills ##
-Below are the polyfills which are used to test the framework itself. They are a good starting point for an application.
+Below are the polyfills which are used to test the framework itself. They are a good starting point for an application. 
 
 
 <table>
@@ -543,5 +542,5 @@ Below are the polyfills which are used to test the framework itself. They are a
 
 
 
-\* Figures are for minified and gzipped code,
+\* Figures are for minified and gzipped code, 
 computed with the <a href="http://closure-compiler.appspot.com/home">closure compiler</a>.

aio/content/guide/change-log.md

@@ -27,12 +27,12 @@ Revised samples are more clear and cover all topics discussed.
 ## NEW: Samples re-structured with `src/` folder (2017-02-02)
 All documentation samples have been realigned with the default folder structure of the Angular CLI.
 That's a step along the road to basing the sample in the Angular CLI.
-But it's also good in its own right.
+But it's also good in its own right. 
 It helps clearly separate app code from setup and configuration files.
 
 All samples now have a `src/` folder at the project root.
-The former `app/` folder moves under `src/`.
-Read about moving your existing project to this structure in
+The former `app/` folder moves under `src/`. 
+Read about moving your existing project to this structure in 
 <a href="https://github.com/angular/quickstart#updating-to-a-newer-version-of-the-quickstart-repo" target="Migrating samples/quickstart app to the src folder">
 the QuickStart repo update instructions</a>.
 
@@ -48,8 +48,8 @@ Notably:
 The new [**Reactive Forms**](guide/reactive-forms) guide explains how and why to build a "reactive form".
 "Reactive Forms" are the code-based counterpart to the declarative "Template Driven" forms approach
 introduced in the [Forms](guide/forms) guide.
-Check it out before you decide how to add forms to your app.
-Remember also that you can use both techniques in the same app,
+Check it out before you decide how to add forms to your app. 
+Remember also that you can use both techniques in the same app, 
 choosing the approach that best fits each scenario.
 
 ## NEW: Deployment guide (2017-01-30)
@@ -65,25 +65,25 @@ Revised samples are clearer and cover all topics discussed.
 
 ## Miscellaneous (2017-01-05)
 
-* [Setup](guide/setup) guide:
-added (optional) instructions on how to remove _non-essential_ files.
+* [Setup](guide/setup) guide: 
+added (optional) instructions on how to remove _non-essential_ files. 
 * No longer consolidate RxJS operator imports in `rxjs-extensions` file; each file should import what it needs.
 * All samples prepend template/style URLs with `./` as a best practice.
 * [Style Guide](guide/styleguide): copy edits and revised rules.
 
 ## Router: more detail (2016-12-21)
 
-Added more information to the [Router](guide/router) guide
+Added more information to the [Router](guide/router) guide 
 including sections named outlets, wildcard routes, and preload strategies.
 
 ## HTTP: how to set default request headers (and other request options) (2016-12-14)
 
-Added section on how to set default request headers (and other request options) to
-HTTP guide.
+Added section on how to set default request headers (and other request options) to 
+[HTTP](guide/http#override-default-request-options) guide.
 
 ## Testing: added component test plunkers (2016-12-02)
 
-Added two plunkers that each test _one simple component_ so you can write a component test plunker of your own: <live-example name="setup" plnkr="quickstart-specs">one</live-example> for the QuickStart seed's `AppComponent` and <live-example name="testing" plnkr="banner-specs">another</live-example> for the Testing guide's `BannerComponent`.
+Added two plunkers that each test _one simple component_ so you can write a component test plunker of your own: <live-example name="setup" plnkr="quickstart-specs">one</live-example> for the QuickStart seed's `AppComponent` and <live-example name="testing" plnkr="banner-specs">another</live-example> for the Testing guide's `BannerComponent`. 
 Linked to these plunkers in [Testing](guide/testing#live-examples) and [Setup anatomy](guide/setup-systemjs-anatomy) guides.
 
 ## Internationalization: pluralization and _select_ (2016-11-30)
@@ -112,15 +112,15 @@ Docs and code samples updated and tested with Angular v.2.2.0.
 
 ## UPDATE: NgUpgrade Guide for the AOT friendly _upgrade/static_ module (2016-11-14)
 
-The updated [NgUpgrade Guide](guide/upgrade) guide covers the
-new AOT friendly `upgrade/static` module
+The updated [NgUpgrade Guide](guide/upgrade) guide covers the 
+new AOT friendly `upgrade/static` module 
 released in v.2.2.0, which is the recommended
 facility for migrating from AngularJS to Angular.
 The documentation for the version prior to v.2.2.0 has been removed.
 
 ## ES6  described in "TypeScript to JavaScript" (2016-11-14)
 
-The updated [TypeScript to JavaScript](guide/ts-to-js) guide
+The updated [TypeScript to JavaScript](guide/ts-to-js) guide 
 now explains how to write apps in ES6/7
 by translating the common idioms in the TypeScript documentation examples
 (and elsewhere on the web) to ES6/7 and ES5.
@@ -156,7 +156,7 @@ in the `in-memory-web-api` repo.
 The router can lazily _preload_ modules _after_ the app starts and
 _before_ the user navigates to them for improved perceived performance.
 
-New `:enter` and `:leave` aliases make animation more natural.
+New `:enter` and `:leave` aliases make animation more natural. 
 
 ## Sync with Angular v.2.1.0 (2016-10-12)
 
@@ -176,11 +176,11 @@ Docs and code samples updated and tested with Angular v.2.0.2.
 ## "Routing and Navigation" guide with the _Router Module_ (2016-10-5)
 
 The [Routing and Navigation](guide/router) guide now locates route configuration
-in a _Routing Module_.
+in a _Routing Module_. 
 The _Routing Module_ replaces the previous _routing object_ involving the `ModuleWithProviders`.
 
 All guided samples with routing use the _Routing Module_ and prose content has been updated,
-most conspicuously in the
+most conspicuously in the 
 [NgModule](guide/ngmodule) guide and [NgModule FAQ](guide/ngmodule-faq) guide.
 
 ## New "Internationalization" guide (2016-09-30)
@@ -194,12 +194,12 @@ Many samples use the `angular-in-memory-web-api` to simulate a remote server.
 This library is also useful to you during early development before you have a server to talk to.
 
 The package name was changed from "angular2-in-memory-web-api" which is still frozen-in-time on npm.
-The new "angular-in-memory-web-api" has new features.
+The new "angular-in-memory-web-api" has new features. 
 <a href="https://github.com/angular/in-memory-web-api/blob/master/README.md">Read about them on github</a>.
 
 ## "Style Guide" with _NgModules_ (2016-09-27)
 
-[StyleGuide](guide/styleguide) explains recommended conventions for NgModules.
+[StyleGuide](guide/styleguide) explains recommended conventions for Angular modules (NgModule).
 Barrels now are far less useful and have been removed from the style guide;
 they remain valuable but are not a matter of Angular style.
 Also relaxed the rule that discouraged use of the `@Component.host` property.
@@ -215,5 +215,5 @@ modules with SystemJS as the samples currently do.
 
 ## "Lifecycle Hooks" guide simplified (2016-09-24)
 
-The [Lifecycle Hooks](guide/lifecycle-hooks) guide is shorter, simpler, and
+The [Lifecycle Hooks](guide/lifecycle-hooks) guide is shorter, simpler, and 
 draws more attention to the order in which Angular calls the hooks.

aio/content/guide/cheatsheet.md

@@ -1,4 +1,4 @@
-<h1 class="no-toc">Cheat Sheet</h1>
+# Cheat Sheet
 
 <div id="cheatsheet">
 <table class="is-full-width is-fixed-layout">
@@ -23,28 +23,28 @@
 </th>
 </tr>
 <tr>
-<td><code>@<b>NgModule</b>({ declarations: ..., imports: ...,<br>     exports: ..., providers: ..., bootstrap: ...})<br>class MyModule {}</code></td>
+<td><code>@<b>NgModule</b>({&nbsp;declarations:&nbsp;...,&nbsp;imports:&nbsp;...,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;exports:&nbsp;...,&nbsp;providers:&nbsp;...,&nbsp;bootstrap:&nbsp;...})<br>class&nbsp;MyModule&nbsp;{}</code></td>
 <td><p>Defines a module that contains components, directives, pipes, and providers.</p>
 </td>
 </tr><tr>
-<td><code><b>declarations:</b> [MyRedComponent, MyBlueComponent, MyDatePipe]</code></td>
+<td><code><b>declarations:</b>&nbsp;[MyRedComponent,&nbsp;MyBlueComponent,&nbsp;MyDatePipe]</code></td>
 <td><p>List of components, directives, and pipes that belong to this module.</p>
 </td>
 </tr><tr>
-<td><code><b>imports:</b> [BrowserModule, SomeOtherModule]</code></td>
+<td><code><b>imports:</b>&nbsp;[BrowserModule,&nbsp;SomeOtherModule]</code></td>
 <td><p>List of modules to import into this module. Everything from the imported modules
 is available to <code>declarations</code> of this module.</p>
 </td>
 </tr><tr>
-<td><code><b>exports:</b> [MyRedComponent, MyDatePipe]</code></td>
+<td><code><b>exports:</b>&nbsp;[MyRedComponent,&nbsp;MyDatePipe]</code></td>
 <td><p>List of components, directives, and pipes visible to modules that import this module.</p>
 </td>
 </tr><tr>
-<td><code><b>providers:</b> [MyService, { provide: ... }]</code></td>
+<td><code><b>providers:</b>&nbsp;[MyService,&nbsp;{&nbsp;provide:&nbsp;...&nbsp;}]</code></td>
 <td><p>List of dependency injection providers visible both to the contents of this module and to importers of this module.</p>
 </td>
 </tr><tr>
-<td><code><b>bootstrap:</b> [MyAppComponent]</code></td>
+<td><code><b>bootstrap:</b>&nbsp;[MyAppComponent]</code></td>
 <td><p>List of components to bootstrap when this module is bootstrapped.</p>
 </td>
 </tr>
@@ -56,61 +56,61 @@ is available to <code>declarations</code> of this module.</p>
 <th></th>
 </tr>
 <tr>
-<td><code>&lt;input <b>[value]</b>="firstName"&gt;</code></td>
+<td><code>&lt;input&nbsp;<b>[value]</b>="firstName"&gt;</code></td>
 <td><p>Binds property <code>value</code> to the result of expression <code>firstName</code>.</p>
 </td>
 </tr><tr>
-<td><code>&lt;div <b>[attr.role]</b>="myAriaRole"&gt;</code></td>
+<td><code>&lt;div&nbsp;<b>[attr.role]</b>="myAriaRole"&gt;</code></td>
 <td><p>Binds attribute <code>role</code> to the result of expression <code>myAriaRole</code>.</p>
 </td>
 </tr><tr>
-<td><code>&lt;div <b>[class.extra-sparkle]</b>="isDelightful"&gt;</code></td>
+<td><code>&lt;div&nbsp;<b>[class.extra-sparkle]</b>="isDelightful"&gt;</code></td>
 <td><p>Binds the presence of the CSS class <code>extra-sparkle</code> on the element to the truthiness of the expression <code>isDelightful</code>.</p>
 </td>
 </tr><tr>
-<td><code>&lt;div <b>[style.width.px]</b>="mySize"&gt;</code></td>
+<td><code>&lt;div&nbsp;<b>[style.width.px]</b>="mySize"&gt;</code></td>
 <td><p>Binds style property <code>width</code> to the result of expression <code>mySize</code> in pixels. Units are optional.</p>
 </td>
 </tr><tr>
-<td><code>&lt;button <b>(click)</b>="readRainbow($event)"&gt;</code></td>
+<td><code>&lt;button&nbsp;<b>(click)</b>="readRainbow($event)"&gt;</code></td>
 <td><p>Calls method <code>readRainbow</code> when a click event is triggered on this button element (or its children) and passes in the event object.</p>
 </td>
 </tr><tr>
-<td><code>&lt;div title="Hello <b>{{ponyName}}</b>"&gt;</code></td>
+<td><code>&lt;div&nbsp;title="Hello&nbsp;<b>{{ponyName}}</b>"&gt;</code></td>
 <td><p>Binds a property to an interpolated string, for example, "Hello Seabiscuit". Equivalent to:
 <code>&lt;div [title]="'Hello ' + ponyName"&gt;</code></p>
 </td>
 </tr><tr>
-<td><code>&lt;p&gt;Hello <b>{{ponyName}}</b>&lt;/p&gt;</code></td>
+<td><code>&lt;p&gt;Hello&nbsp;<b>{{ponyName}}</b>&lt;/p&gt;</code></td>
 <td><p>Binds text content to an interpolated string, for example, "Hello Seabiscuit".</p>
 </td>
 </tr><tr>
-<td><code>&lt;my-cmp <b>[(title)]</b>="name"&gt;</code></td>
+<td><code>&lt;my-cmp&nbsp;<b>[(title)]</b>="name"&gt;</code></td>
 <td><p>Sets up two-way data binding. Equivalent to: <code>&lt;my-cmp [title]="name" (titleChange)="name=$event"&gt;</code></p>
 </td>
 </tr><tr>
-<td><code>&lt;video <b>#movieplayer</b> ...&gt;<br>  &lt;button <b>(click)</b>="movieplayer.play()"&gt;<br>&lt;/video&gt;</code></td>
+<td><code>&lt;video&nbsp;<b>#movieplayer</b>&nbsp;...&gt;<br>&nbsp;&nbsp;&lt;button&nbsp;<b>(click)</b>="movieplayer.play()"&gt;<br>&lt;/video&gt;</code></td>
 <td><p>Creates a local variable <code>movieplayer</code> that provides access to the <code>video</code> element instance in data-binding and event-binding expressions in the current template.</p>
 </td>
 </tr><tr>
-<td><code>&lt;p <b>*myUnless</b>="myExpression"&gt;...&lt;/p&gt;</code></td>
+<td><code>&lt;p&nbsp;<b>*myUnless</b>="myExpression"&gt;...&lt;/p&gt;</code></td>
 <td><p>The <code>*</code> symbol turns the current element into an embedded template. Equivalent to:
 <code>&lt;ng-template [myUnless]="myExpression"&gt;&lt;p&gt;...&lt;/p&gt;&lt;/ng-template&gt;</code></p>
 </td>
 </tr><tr>
-<td><code>&lt;p&gt;Card No.: <b>{{cardNumber | myCardNumberFormatter}}</b>&lt;/p&gt;</code></td>
+<td><code>&lt;p&gt;Card&nbsp;No.:&nbsp;<b>{{cardNumber&nbsp;|&nbsp;myCardNumberFormatter}}</b>&lt;/p&gt;</code></td>
 <td><p>Transforms the current value of expression <code>cardNumber</code> via the pipe called <code>myCardNumberFormatter</code>.</p>
 </td>
 </tr><tr>
-<td><code>&lt;p&gt;Employer: <b>{{employer?.companyName}}</b>&lt;/p&gt;</code></td>
+<td><code>&lt;p&gt;Employer:&nbsp;<b>{{employer?.companyName}}</b>&lt;/p&gt;</code></td>
 <td><p>The safe navigation operator (<code>?</code>) means that the <code>employer</code> field is optional and if <code>undefined</code>, the rest of the expression should be ignored.</p>
 </td>
 </tr><tr>
-<td><code>&lt;<b>svg:</b>rect x="0" y="0" width="100" height="100"/&gt;</code></td>
+<td><code>&lt;<b>svg:</b>rect&nbsp;x="0"&nbsp;y="0"&nbsp;width="100"&nbsp;height="100"/&gt;</code></td>
 <td><p>An SVG snippet template needs an <code>svg:</code> prefix on its root element to disambiguate the SVG element from an HTML component.</p>
 </td>
 </tr><tr>
-<td><code>&lt;<b>svg</b>&gt;<br>  &lt;rect x="0" y="0" width="100" height="100"/&gt;<br>&lt;/<b>svg</b>&gt;</code></td>
+<td><code>&lt;<b>svg</b>&gt;<br>&nbsp;&nbsp;&lt;rect&nbsp;x="0"&nbsp;y="0"&nbsp;width="100"&nbsp;height="100"/&gt;<br>&lt;/<b>svg</b>&gt;</code></td>
 <td><p>An <code>&lt;svg&gt;</code> root element is detected as an SVG element automatically, without the prefix.</p>
 </td>
 </tr>
@@ -124,19 +124,19 @@ is available to <code>declarations</code> of this module.</p>
 </th>
 </tr>
 <tr>
-<td><code>&lt;section <b>*ngIf</b>="showSection"&gt;</code></td>
+<td><code>&lt;section&nbsp;<b>*ngIf</b>="showSection"&gt;</code></td>
 <td><p>Removes or recreates a portion of the DOM tree based on the <code>showSection</code> expression.</p>
 </td>
 </tr><tr>
-<td><code>&lt;li <b>*ngFor</b>="let item of list"&gt;</code></td>
+<td><code>&lt;li&nbsp;<b>*ngFor</b>="let&nbsp;item&nbsp;of&nbsp;list"&gt;</code></td>
 <td><p>Turns the li element and its contents into a template, and uses that to instantiate a view for each item in list.</p>
 </td>
 </tr><tr>
-<td><code>&lt;div <b>[ngSwitch]</b>="conditionExpression"&gt;<br>  &lt;ng-template <b>[<b>ngSwitchCase</b>]</b>="case1Exp"&gt;...&lt;/ng-template&gt;<br>  &lt;ng-template <b>ngSwitchCase</b>="case2LiteralString"&gt;...&lt;/ng-template&gt;<br>  &lt;ng-template <b>ngSwitchDefault</b>&gt;...&lt;/ng-template&gt;<br>&lt;/div&gt;</code></td>
+<td><code>&lt;div&nbsp;<b>[ngSwitch]</b>="conditionExpression"&gt;<br>&nbsp;&nbsp;&lt;ng-template&nbsp;<b>[<b>ngSwitchCase</b>]</b>="case1Exp"&gt;...&lt;/ng-template&gt;<br>&nbsp;&nbsp;&lt;ng-template&nbsp;<b>ngSwitchCase</b>="case2LiteralString"&gt;...&lt;/ng-template&gt;<br>&nbsp;&nbsp;&lt;ng-template&nbsp;<b>ngSwitchDefault</b>&gt;...&lt;/ng-template&gt;<br>&lt;/div&gt;</code></td>
 <td><p>Conditionally swaps the contents of the div by selecting one of the embedded templates based on the current value of <code>conditionExpression</code>.</p>
 </td>
 </tr><tr>
-<td><code>&lt;div <b>[ngClass]</b>="{'active': isActive, 'disabled': isDisabled}"&gt;</code></td>
+<td><code>&lt;div&nbsp;<b>[ngClass]</b>="{active:&nbsp;isActive,&nbsp;disabled:&nbsp;isDisabled}"&gt;</code></td>
 <td><p>Binds the presence of CSS classes on the element to the truthiness of the associated map values. The right-hand expression should return {class-name: true/false} map.</p>
 </td>
 </tr>
@@ -150,7 +150,7 @@ is available to <code>declarations</code> of this module.</p>
 </th>
 </tr>
 <tr>
-<td><code>&lt;input <b>[(ngModel)]</b>="userName"&gt;</code></td>
+<td><code>&lt;input&nbsp;<b>[(ngModel)]</b>="userName"&gt;</code></td>
 <td><p>Provides two-way data-binding, parsing, and validation for form controls.</p>
 </td>
 </tr>
@@ -164,19 +164,19 @@ is available to <code>declarations</code> of this module.</p>
 </th>
 </tr>
 <tr>
-<td><code><b>@Component({...})</b><br>class MyComponent() {}</code></td>
+<td><code><b>@Component({...})</b><br>class&nbsp;MyComponent()&nbsp;{}</code></td>
 <td><p>Declares that a class is a component and provides metadata about the component.</p>
 </td>
 </tr><tr>
-<td><code><b>@Directive({...})</b><br>class MyDirective() {}</code></td>
+<td><code><b>@Directive({...})</b><br>class&nbsp;MyDirective()&nbsp;{}</code></td>
 <td><p>Declares that a class is a directive and provides metadata about the directive.</p>
 </td>
 </tr><tr>
-<td><code><b>@Pipe({...})</b><br>class MyPipe() {}</code></td>
+<td><code><b>@Pipe({...})</b><br>class&nbsp;MyPipe()&nbsp;{}</code></td>
 <td><p>Declares that a class is a pipe and provides metadata about the pipe.</p>
 </td>
 </tr><tr>
-<td><code><b>@Injectable()</b><br>class MyService() {}</code></td>
+<td><code><b>@Injectable()</b><br>class&nbsp;MyService()&nbsp;{}</code></td>
 <td><p>Declares that a class has dependencies that should be injected into the constructor when the dependency injector is creating an instance of this class.
 </p>
 </td>
@@ -191,13 +191,13 @@ is available to <code>declarations</code> of this module.</p>
 </th>
 </tr>
 <tr>
-<td><code><b>selector:</b> '.cool-button:not(a)'</code></td>
+<td><code><b>selector:</b>&nbsp;'.cool-button:not(a)'</code></td>
 <td><p>Specifies a CSS selector that identifies this directive within a template. Supported selectors include <code>element</code>,
 <code>[attribute]</code>, <code>.class</code>, and <code>:not()</code>.</p>
 <p>Does not support parent-child relationship selectors.</p>
 </td>
 </tr><tr>
-<td><code><b>providers:</b> [MyService, { provide: ... }]</code></td>
+<td><code><b>providers:</b>&nbsp;[MyService,&nbsp;{&nbsp;provide:&nbsp;...&nbsp;}]</code></td>
 <td><p>List of dependency injection providers for this directive and its children.</p>
 </td>
 </tr>
@@ -212,19 +212,19 @@ so the <code>@Directive</code> configuration applies to components as well</p>
 </th>
 </tr>
 <tr>
-<td><code><b>moduleId:</b> module.id</code></td>
+<td><code><b>moduleId:</b>&nbsp;module.id</code></td>
 <td><p>If set, the <code>templateUrl</code> and <code>styleUrl</code> are resolved relative to the component.</p>
 </td>
 </tr><tr>
-<td><code><b>viewProviders:</b> [MyService, { provide: ... }]</code></td>
+<td><code><b>viewProviders:</b>&nbsp;[MyService,&nbsp;{&nbsp;provide:&nbsp;...&nbsp;}]</code></td>
 <td><p>List of dependency injection providers scoped to this component's view.</p>
 </td>
 </tr><tr>
-<td><code><b>template:</b> 'Hello {{name}}'<br><b>templateUrl:</b> 'my-component.html'</code></td>
+<td><code><b>template:</b>&nbsp;'Hello&nbsp;{{name}}'<br><b>templateUrl:</b>&nbsp;'my-component.html'</code></td>
 <td><p>Inline template or external template URL of the component's view.</p>
 </td>
 </tr><tr>
-<td><code><b>styles:</b> ['.primary {color: red}']<br><b>styleUrls:</b> ['my-component.css']</code></td>
+<td><code><b>styles:</b>&nbsp;['.primary&nbsp;{color:&nbsp;red}']<br><b>styleUrls:</b>&nbsp;['my-component.css']</code></td>
 <td><p>List of inline CSS styles or external stylesheet URLs for styling the component’s view.</p>
 </td>
 </tr>
@@ -238,36 +238,36 @@ so the <code>@Directive</code> configuration applies to components as well</p>
 </th>
 </tr>
 <tr>
-<td><code><b>@Input()</b> myProperty;</code></td>
+<td><code><b>@Input()</b>&nbsp;myProperty;</code></td>
 <td><p>Declares an input property that you can update via property binding (example:
 <code>&lt;my-cmp [myProperty]="someExpression"&gt;</code>).</p>
 </td>
 </tr><tr>
-<td><code><b>@Output()</b> myEvent = new EventEmitter();</code></td>
+<td><code><b>@Output()</b>&nbsp;myEvent&nbsp;=&nbsp;new&nbsp;EventEmitter();</code></td>
 <td><p>Declares an output property that fires events that you can subscribe to with an event binding (example: <code>&lt;my-cmp (myEvent)="doSomething()"&gt;</code>).</p>
 </td>
 </tr><tr>
-<td><code><b>@HostBinding('class.valid')</b> isValid;</code></td>
+<td><code><b>@HostBinding('class.valid')</b>&nbsp;isValid;</code></td>
 <td><p>Binds a host element property (here, the CSS class <code>valid</code>) to a directive/component property (<code>isValid</code>).</p>
 </td>
 </tr><tr>
-<td><code><b>@HostListener('click', ['$event'])</b> onClick(e) {...}</code></td>
+<td><code><b>@HostListener('click',&nbsp;['$event'])</b>&nbsp;onClick(e)&nbsp;{...}</code></td>
 <td><p>Subscribes to a host element event (<code>click</code>) with a directive/component method (<code>onClick</code>), optionally passing an argument (<code>$event</code>).</p>
 </td>
 </tr><tr>
-<td><code><b>@ContentChild(myPredicate)</b> myChildComponent;</code></td>
+<td><code><b>@ContentChild(myPredicate)</b>&nbsp;myChildComponent;</code></td>
 <td><p>Binds the first result of the component content query (<code>myPredicate</code>) to a property (<code>myChildComponent</code>) of the class.</p>
 </td>
 </tr><tr>
-<td><code><b>@ContentChildren(myPredicate)</b> myChildComponents;</code></td>
+<td><code><b>@ContentChildren(myPredicate)</b>&nbsp;myChildComponents;</code></td>
 <td><p>Binds the results of the component content query (<code>myPredicate</code>) to a property (<code>myChildComponents</code>) of the class.</p>
 </td>
 </tr><tr>
-<td><code><b>@ViewChild(myPredicate)</b> myChildComponent;</code></td>
+<td><code><b>@ViewChild(myPredicate)</b>&nbsp;myChildComponent;</code></td>
 <td><p>Binds the first result of the component view query (<code>myPredicate</code>) to a property (<code>myChildComponent</code>) of the class. Not available for directives.</p>
 </td>
 </tr><tr>
-<td><code><b>@ViewChildren(myPredicate)</b> myChildComponents;</code></td>
+<td><code><b>@ViewChildren(myPredicate)</b>&nbsp;myChildComponents;</code></td>
 <td><p>Binds the results of the component view query (<code>myPredicate</code>) to a property (<code>myChildComponents</code>) of the class. Not available for directives.</p>
 </td>
 </tr>
@@ -281,39 +281,39 @@ so the <code>@Directive</code> configuration applies to components as well</p>
 </th>
 </tr>
 <tr>
-<td><code><b>constructor(myService: MyService, ...)</b> { ... }</code></td>
+<td><code><b>constructor(myService:&nbsp;MyService,&nbsp;...)</b>&nbsp;{&nbsp;...&nbsp;}</code></td>
 <td><p>Called before any other lifecycle hook. Use it to inject dependencies, but avoid any serious work here.</p>
 </td>
 </tr><tr>
-<td><code><b>ngOnChanges(changeRecord)</b> { ... }</code></td>
+<td><code><b>ngOnChanges(changeRecord)</b>&nbsp;{&nbsp;...&nbsp;}</code></td>
 <td><p>Called after every change to input properties and before processing content or child views.</p>
 </td>
 </tr><tr>
-<td><code><b>ngOnInit()</b> { ... }</code></td>
+<td><code><b>ngOnInit()</b>&nbsp;{&nbsp;...&nbsp;}</code></td>
 <td><p>Called after the constructor, initializing input properties, and the first call to <code>ngOnChanges</code>.</p>
 </td>
 </tr><tr>
-<td><code><b>ngDoCheck()</b> { ... }</code></td>
+<td><code><b>ngDoCheck()</b>&nbsp;{&nbsp;...&nbsp;}</code></td>
 <td><p>Called every time that the input properties of a component or a directive are checked. Use it to extend change detection by performing a custom check.</p>
 </td>
 </tr><tr>
-<td><code><b>ngAfterContentInit()</b> { ... }</code></td>
+<td><code><b>ngAfterContentInit()</b>&nbsp;{&nbsp;...&nbsp;}</code></td>
 <td><p>Called after <code>ngOnInit</code> when the component's or directive's content has been initialized.</p>
 </td>
 </tr><tr>
-<td><code><b>ngAfterContentChecked()</b> { ... }</code></td>
+<td><code><b>ngAfterContentChecked()</b>&nbsp;{&nbsp;...&nbsp;}</code></td>
 <td><p>Called after every check of the component's or directive's content.</p>
 </td>
 </tr><tr>
-<td><code><b>ngAfterViewInit()</b> { ... }</code></td>
+<td><code><b>ngAfterViewInit()</b>&nbsp;{&nbsp;...&nbsp;}</code></td>
 <td><p>Called after <code>ngAfterContentInit</code> when the component's view has been initialized. Applies to components only.</p>
 </td>
 </tr><tr>
-<td><code><b>ngAfterViewChecked()</b> { ... }</code></td>
+<td><code><b>ngAfterViewChecked()</b>&nbsp;{&nbsp;...&nbsp;}</code></td>
 <td><p>Called after every check of the component's view. Applies to components only.</p>
 </td>
 </tr><tr>
-<td><code><b>ngOnDestroy()</b> { ... }</code></td>
+<td><code><b>ngOnDestroy()</b>&nbsp;{&nbsp;...&nbsp;}</code></td>
 <td><p>Called once, before the instance is destroyed.</p>
 </td>
 </tr>
@@ -325,15 +325,15 @@ so the <code>@Directive</code> configuration applies to components as well</p>
 <th></th>
 </tr>
 <tr>
-<td><code>{ <b>provide</b>: MyService, <b>useClass</b>: MyMockService }</code></td>
+<td><code>{&nbsp;<b>provide</b>:&nbsp;MyService,&nbsp;<b>useClass</b>:&nbsp;MyMockService&nbsp;}</code></td>
 <td><p>Sets or overrides the provider for <code>MyService</code> to the <code>MyMockService</code> class.</p>
 </td>
 </tr><tr>
-<td><code>{ <b>provide</b>: MyService, <b>useFactory</b>: myFactory }</code></td>
+<td><code>{&nbsp;<b>provide</b>:&nbsp;MyService,&nbsp;<b>useFactory</b>:&nbsp;myFactory&nbsp;}</code></td>
 <td><p>Sets or overrides the provider for <code>MyService</code> to the <code>myFactory</code> factory function.</p>
 </td>
 </tr><tr>
-<td><code>{ <b>provide</b>: MyValue, <b>useValue</b>: 41 }</code></td>
+<td><code>{&nbsp;<b>provide</b>:&nbsp;MyValue,&nbsp;<b>useValue</b>:&nbsp;41&nbsp;}</code></td>
 <td><p>Sets or overrides the provider for <code>MyValue</code> to the value <code>41</code>.</p>
 </td>
 </tr>
@@ -347,39 +347,39 @@ so the <code>@Directive</code> configuration applies to components as well</p>
 </th>
 </tr>
 <tr>
-<td><code>const routes: <b>Routes</b> = [<br>  { path: '', component: HomeComponent },<br>  { path: 'path/:routeParam', component: MyComponent },<br>  { path: 'staticPath', component: ... },<br>  { path: '**', component: ... },<br>  { path: 'oldPath', redirectTo: '/staticPath' },<br>  { path: ..., component: ..., data: { message: 'Custom' } }<br>]);<br><br>const routing = RouterModule.forRoot(routes);</code></td>
+<td><code>const&nbsp;routes:&nbsp;<b>Routes</b>&nbsp;=&nbsp;[<br>&nbsp;&nbsp;{&nbsp;path:&nbsp;'',&nbsp;component:&nbsp;HomeComponent&nbsp;},<br>&nbsp;&nbsp;{&nbsp;path:&nbsp;'path/:routeParam',&nbsp;component:&nbsp;MyComponent&nbsp;},<br>&nbsp;&nbsp;{&nbsp;path:&nbsp;'staticPath',&nbsp;component:&nbsp;...&nbsp;},<br>&nbsp;&nbsp;{&nbsp;path:&nbsp;'**',&nbsp;component:&nbsp;...&nbsp;},<br>&nbsp;&nbsp;{&nbsp;path:&nbsp;'oldPath',&nbsp;redirectTo:&nbsp;'/staticPath'&nbsp;},<br>&nbsp;&nbsp;{&nbsp;path:&nbsp;...,&nbsp;component:&nbsp;...,&nbsp;data:&nbsp;{&nbsp;message:&nbsp;'Custom'&nbsp;}&nbsp;}<br>]);<br><br>const&nbsp;routing&nbsp;=&nbsp;RouterModule.forRoot(routes);</code></td>
 <td><p>Configures routes for the application. Supports static, parameterized, redirect, and wildcard routes. Also supports custom route data and resolve.</p>
 </td>
 </tr><tr>
-<td><code><br>&lt;<b>router-outlet</b>&gt;&lt;/<b>router-outlet</b>&gt;<br>&lt;<b>router-outlet</b> name="aux"&gt;&lt;/<b>router-outlet</b>&gt;<br></code></td>
+<td><code><br>&lt;<b>router-outlet</b>&gt;&lt;/<b>router-outlet</b>&gt;<br>&lt;<b>router-outlet</b>&nbsp;name="aux"&gt;&lt;/<b>router-outlet</b>&gt;<br></code></td>
 <td><p>Marks the location to load the component of the active route.</p>
 </td>
 </tr><tr>
-<td><code><br>&lt;a routerLink="/path"&gt;<br>&lt;a <b>[routerLink]</b>="[ '/path', routeParam ]"&gt;<br>&lt;a <b>[routerLink]</b>="[ '/path', { matrixParam: 'value' } ]"&gt;<br>&lt;a <b>[routerLink]</b>="[ '/path' ]" [queryParams]="{ page: 1 }"&gt;<br>&lt;a <b>[routerLink]</b>="[ '/path' ]" fragment="anchor"&gt;<br></code></td>
+<td><code><br>&lt;a&nbsp;routerLink="/path"&gt;<br>&lt;a&nbsp;<b>[routerLink]</b>="[&nbsp;'/path',&nbsp;routeParam&nbsp;]"&gt;<br>&lt;a&nbsp;<b>[routerLink]</b>="[&nbsp;'/path',&nbsp;{&nbsp;matrixParam:&nbsp;'value'&nbsp;}&nbsp;]"&gt;<br>&lt;a&nbsp;<b>[routerLink]</b>="[&nbsp;'/path'&nbsp;]"&nbsp;[queryParams]="{&nbsp;page:&nbsp;1&nbsp;}"&gt;<br>&lt;a&nbsp;<b>[routerLink]</b>="[&nbsp;'/path'&nbsp;]"&nbsp;fragment="anchor"&gt;<br></code></td>
 <td><p>Creates a link to a different view based on a route instruction consisting of a route path, required and optional parameters, query parameters, and a fragment. To navigate to a root route, use the <code>/</code> prefix; for a child route, use the <code>./</code>prefix; for a sibling or parent, use the <code>../</code> prefix.</p>
 </td>
 </tr><tr>
-<td><code>&lt;a [routerLink]="[ '/path' ]" routerLinkActive="active"&gt;</code></td>
+<td><code>&lt;a&nbsp;[routerLink]="[&nbsp;'/path'&nbsp;]"&nbsp;routerLinkActive="active"&gt;</code></td>
 <td><p>The provided classes are added to the element when the <code>routerLink</code> becomes the current active route.</p>
 </td>
 </tr><tr>
-<td><code>class <b>CanActivate</b>Guard implements <b>CanActivate</b> {<br>    canActivate(<br>      route: ActivatedRouteSnapshot,<br>      state: RouterStateSnapshot<br>    ): Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean { ... }<br>}<br><br>{ path: ..., canActivate: [<b>CanActivate</b>Guard] }</code></td>
+<td><code>class&nbsp;<b>CanActivate</b>Guard&nbsp;implements&nbsp;<b>CanActivate</b>&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;canActivate(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;route:&nbsp;ActivatedRouteSnapshot,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;state:&nbsp;RouterStateSnapshot<br>&nbsp;&nbsp;&nbsp;&nbsp;):&nbsp;Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean&nbsp;{&nbsp;...&nbsp;}<br>}<br><br>{&nbsp;path:&nbsp;...,&nbsp;canActivate:&nbsp;[<b>CanActivate</b>Guard]&nbsp;}</code></td>
 <td><p>An interface for defining a class that the router should call first to determine if it should activate this component. Should return a boolean or an Observable/Promise that resolves to a boolean.</p>
 </td>
 </tr><tr>
-<td><code>class <b>CanDeactivate</b>Guard implements <b>CanDeactivate</b>&lt;T&gt; {<br>    canDeactivate(<br>      component: T,<br>      route: ActivatedRouteSnapshot,<br>      state: RouterStateSnapshot<br>    ): Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean { ... }<br>}<br><br>{ path: ..., canDeactivate: [<b>CanDeactivate</b>Guard] }</code></td>
+<td><code>class&nbsp;<b>CanDeactivate</b>Guard&nbsp;implements&nbsp;<b>CanDeactivate</b>&lt;T&gt;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;canDeactivate(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;component:&nbsp;T,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;route:&nbsp;ActivatedRouteSnapshot,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;state:&nbsp;RouterStateSnapshot<br>&nbsp;&nbsp;&nbsp;&nbsp;):&nbsp;Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean&nbsp;{&nbsp;...&nbsp;}<br>}<br><br>{&nbsp;path:&nbsp;...,&nbsp;canDeactivate:&nbsp;[<b>CanDeactivate</b>Guard]&nbsp;}</code></td>
 <td><p>An interface for defining a class that the router should call first to determine if it should deactivate this component after a navigation. Should return a boolean or an Observable/Promise that resolves to a boolean.</p>
 </td>
 </tr><tr>
-<td><code>class <b>CanActivateChild</b>Guard implements <b>CanActivateChild</b> {<br>    canActivateChild(<br>      route: ActivatedRouteSnapshot,<br>      state: RouterStateSnapshot<br>    ): Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean { ... }<br>}<br><br>{ path: ..., canActivateChild: [CanActivateGuard],<br>    children: ... }</code></td>
+<td><code>class&nbsp;<b>CanActivateChild</b>Guard&nbsp;implements&nbsp;<b>CanActivateChild</b>&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;canActivateChild(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;route:&nbsp;ActivatedRouteSnapshot,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;state:&nbsp;RouterStateSnapshot<br>&nbsp;&nbsp;&nbsp;&nbsp;):&nbsp;Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean&nbsp;{&nbsp;...&nbsp;}<br>}<br><br>{&nbsp;path:&nbsp;...,&nbsp;canActivateChild:&nbsp;[CanActivateGuard],<br>&nbsp;&nbsp;&nbsp;&nbsp;children:&nbsp;...&nbsp;}</code></td>
 <td><p>An interface for defining a class that the router should call first to determine if it should activate the child route. Should return a boolean or an Observable/Promise that resolves to a boolean.</p>
 </td>
 </tr><tr>
-<td><code>class <b>Resolve</b>Guard implements <b>Resolve</b>&lt;T&gt; {<br>    resolve(<br>      route: ActivatedRouteSnapshot,<br>      state: RouterStateSnapshot<br>    ): Observable&lt;any&gt;|Promise&lt;any&gt;|any { ... }<br>}<br><br>{ path: ..., resolve: [<b>Resolve</b>Guard] }</code></td>
+<td><code>class&nbsp;<b>Resolve</b>Guard&nbsp;implements&nbsp;<b>Resolve</b>&lt;T&gt;&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;resolve(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;route:&nbsp;ActivatedRouteSnapshot,<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;state:&nbsp;RouterStateSnapshot<br>&nbsp;&nbsp;&nbsp;&nbsp;):&nbsp;Observable&lt;any&gt;|Promise&lt;any&gt;|any&nbsp;{&nbsp;...&nbsp;}<br>}<br><br>{&nbsp;path:&nbsp;...,&nbsp;resolve:&nbsp;[<b>Resolve</b>Guard]&nbsp;}</code></td>
 <td><p>An interface for defining a class that the router should call first to resolve route data before rendering the route. Should return a value or an Observable/Promise that resolves to a value.</p>
 </td>
 </tr><tr>
-<td><code>class <b>CanLoad</b>Guard implements <b>CanLoad</b> {<br>    canLoad(<br>      route: Route<br>    ): Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean { ... }<br>}<br><br>{ path: ..., canLoad: [<b>CanLoad</b>Guard], loadChildren: ... }</code></td>
+<td><code>class&nbsp;<b>CanLoad</b>Guard&nbsp;implements&nbsp;<b>CanLoad</b>&nbsp;{<br>&nbsp;&nbsp;&nbsp;&nbsp;canLoad(<br>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;route:&nbsp;Route<br>&nbsp;&nbsp;&nbsp;&nbsp;):&nbsp;Observable&lt;boolean&gt;|Promise&lt;boolean&gt;|boolean&nbsp;{&nbsp;...&nbsp;}<br>}<br><br>{&nbsp;path:&nbsp;...,&nbsp;canLoad:&nbsp;[<b>CanLoad</b>Guard],&nbsp;loadChildren:&nbsp;...&nbsp;}</code></td>
 <td><p>An interface for defining a class that the router should call first to check if the lazy loaded module should be loaded. Should return a boolean or an Observable/Promise that resolves to a boolean.</p>
 </td>
 </tr>

aio/content/guide/component-styles.md

@@ -119,13 +119,12 @@ if some ancestor element has the CSS class `theme-light`.
 
 
 
-### (deprecated) `/deep/`, `>>>`, and `::ng-deep`
+### /deep/
 
 Component styles normally apply only to the HTML in the component's own template. 
 
-Use the `/deep/` shadow-piercing descendant combinator to force a style down through the child
-component tree into all the child component views.
-The `/deep/` combinator works to any depth of nested components, and it applies to both the view
+Use the `/deep/` selector to force a style down through the child component tree into all the child component views.
+The `/deep/` selector works to any depth of nested components, and it applies to both the view
 children and content children of the component. 
 
 The following example targets all `<h3>` elements, from the host element down 
@@ -135,24 +134,17 @@ through this component to all of its child elements in the DOM.
 
 </code-example>
 
-The `/deep/` combinator also has the aliases `>>>`, and `::ng-deep`.
+The `/deep/` selector also has the alias `>>>`. You can use either interchangeably.
+
 
 <div class="alert is-important">
 
-Use `/deep/`, `>>>` and `::ng-deep` only with *emulated* view encapsulation.
+Use the `/deep/` and `>>>` selectors only with *emulated* view encapsulation.
 Emulated is the default and most commonly used view encapsulation. For more information, see the
 [Controlling view encapsulation](guide/component-styles#view-encapsulation) section.
 
 </div>
 
-<div class="alert is-important">
-
-The shadow-piercing descendant combinator is deprecated and [support is being removed from major browsers](https://www.chromestatus.com/features/6750456638341120) and tools.
-As such we plan to drop support in Angular (for all 3 of `/deep/`, `>>>` and `::ng-deep`).
-Until then `::ng-deep` should be preferred for a broader compatibility with the tools.
-
-</div>
-
 {@a loading-styles}
 
 ## Loading component styles

aio/content/guide/dependency-injection-in-action.md

@@ -244,7 +244,7 @@ You can limit the scope of an injected service to a *branch* of the application
 by providing that service *at the sub-root component for that branch*.
 This example shows how similar providing a service to a sub-root component is
 to providing a service in the root `AppComponent`. The syntax is the same.
-Here, the `HeroService` is available to the `HeroesBaseComponent` because it is in the `providers` array:
+Here, the `HeroService` is availble to the `HeroesBaseComponent` because it is in the `providers` array:
 
 <code-example path="dependency-injection-in-action/src/app/sorted-heroes.component.ts" region="injection" title="src/app/sorted-heroes.component.ts (HeroesBaseComponent excerpt)">
 

aio/content/guide/displaying-data.md

@@ -320,7 +320,7 @@ Read more about `ngIf` and `*` in the [ngIf section](guide/template-syntax#ngIf)
 
 
 The template expression inside the double quotes,
-`*ngIf="heroes.length > 3"`, looks and behaves much like TypeScript.
+`*ngIf="heros.length > 3"`, looks and behaves much like TypeScript.
 When the component's list of heroes has more than three items, Angular adds the paragraph
 to the DOM and the message appears. If there are three or fewer items, Angular omits the
 paragraph, so no message appears. For more information,

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

@@ -40,9 +40,9 @@ The flat folder approach allows us to shuffle the apparent navigation structure
 
 The doc generation process consumes the markdown files in the `content/guide` directory and produces JSON files in the `src/generated/docs/guide` directory, which is also flat. Those JSON files contain a combination of document metadata and HTML content.
 
-The reader requests a page by its Page URL. The doc viewer fetches the corresponding JSON file, interprets it, and renders it as fully-formed HTML page.
+The reader request a page by its Page URL. The doc viewer fetches the corresponding JSON file, interprets it, and renders it as fully-formed HTML page.
 
-Page URLs mirror the `content` file structure. The URL for the page of a guide is in the form `guide/{page-name}`. The page for _this_ "Authors Style Guide" is located at `content/guide/docs-style-guide.md` and its URL is `guide/docs-style-guide`.
+Page URLs mirror the `content` file structure. A guide page URL is in the form `guide/{page-name}`. _This_ guide page is located at `context/guide/docs-style-guide.md` and its URL is `guide/docs-style-guide`.
 
 
 <div class="l-sub-section">
@@ -64,7 +64,7 @@ While documentation guide pages ultimately render as HTML, almost all of them ar
 
 Markdown is easier to read and to edit than HTML. Many editors (including Visual Studio Code) can render markdown as you type it.
 
-From time to time you'll have to step away from markdown and write a portion of the document in HTML. Markdown allows you to mix HTML and markdown in the same document.
+From time to time you'll have to step away from markdown and write a portion of the document in HTML. markdown allows you to mix HTML and markdown in the same document.
 
 Standard markdown processors don't allow you to put markdown _within_ HTML tags. But the Angular documentation markdown processor **supports markdown within HTML**, as long as you follow one rule:
 
@@ -77,14 +77,14 @@ Standard markdown processors don't allow you to put markdown _within_ HTML tags.
 ```html
 <div class="alert is-critical">
 
-  **Always** follow every opening and closing HTML tag with _a blank line_. 
+  **Always** follow every opening and closing opening HTML tag with _a blank line_. 
 
 </div>
 ```
 
 <div class="l-sub-section">
 
-  It is customary but not required to _precede_ the _closing HTML_ tag with a blank line as well.
+  It is customary but not required to precede the _closing HTML_ tag with a blank tag as well.
 
 </div>
 
@@ -101,7 +101,7 @@ Begin the title with the markdown `#` character. Alternatively, you can write th
 
 **Only one title (`<h1>`) per document!**
 
-Title text should be in "Title Case", which means that you use capital letters to start the first words and all _principal_ words. Use lower case letters for _secondary words such as "in", "of", and "the".
+Title text should be in "Title Case", which means that you use capital letters to start the first works and all _principal_. Use lower case letters for _secondary words such as "in", "of", and "the".
 
 ```html
   # The Meat of the Matter
@@ -113,7 +113,7 @@ Title text should be in "Title Case", which means that you use capital letters t
 
 A typical document is divided into sections. 
 
-All section heading text should be in "Sentence case", which means the first word is capitalized and all other words are lower case.
+All section heading text should be in "Sentence Case", which means the first word is capitalized and all other words are lower case.
 
 **Always follow the section heading with at least one blank line.**
 
@@ -313,7 +313,7 @@ In all other cases, code snippets should be generated automatically from tested
 
 One of the documentation design goals is that guide page code snippets should be examples of real, working code.
 
-We meet this goal by displaying code snippets that are derived directly from standalone code samples, written specifically for these guide pages.
+We meet this goal by displaying code snippets that are derived directly from standalone code samples, written specifically for these guide page.
 
 The author of a guide page is responsible for the code sample that supports that page.
 The author must also write end-to-end tests for the sample.
@@ -343,11 +343,10 @@ Here's the brief markup that produced that lengthy snippet:
 ```html
 <code-example 
   path="docs-style-guide/src/app/app.module.ts" 
-  title="src/app/app.module.ts">
-</code-example>
+  title="src/app/app.module.ts"></code-example>
 ```
 
-You identified the snippet's source file by setting the `path` attribute to sample folder's location _within_ `content/examples`.
+You identified the snippet's source file by setting the `path` attribute to sample folder's location_within `content/examples`.
 In this example, that path is  `docs-style-guide/src/app/app.module.ts`.  
 
 You added a header to tell the reader where to find the file by setting the `title` attribute.
@@ -370,7 +369,7 @@ You control the _code-example_ output by setting one or more of its attributes:
 
 * `region`- displays the source file fragment with that region name; regions are identified by _docregion_ markup in the source file, as explained [below](#region "Displaying a code fragment").
 
-* `linenums`- value may be `true`, `false`, or a `number`. When not specified, line numbers are automatically displayed when there are greater than 10 lines of code. The rarely used `number` option starts line numbering at the given value. `linenums=4` sets the starting line number to 4.
+* `linenums`- value may be `true`, `false`, or a `number`. When not specified, line numbers are automatically displayed when there are 10 or more lines of code. The rarely used `number` option starts line numbering at the given value. `linenums=4` sets the starting line number to 4.
 
 * `class`- code snippets can be styled with the CSS classes `no-box`, `code-shell`, and `avoid`.
 
@@ -386,8 +385,7 @@ Often you want to focus on a fragment of code within a sample code file. In this
 
 <code-example 
   path="docs-style-guide/src/app/app.module.ts" 
-  region="class">
-</code-example>
+  region="class"></code-example>
 
 First you surround that fragment in the source file with a named _docregion_ as described [below](#source-code-markup).
 Then you reference that _docregion_ in the `region` attribute of the `<code-example>` like this
@@ -396,13 +394,12 @@ Then you reference that _docregion_ in the `region` attribute of the `<code-exam
 ```html
 <code-example 
   path="docs-style-guide/src/app/app.module.ts" 
-  region="class">
-</code-example>
+  region="class"></code-example>
 ```
 
 A couple of observations:
 
-1. The `region` value, `"class"`, is the name of the `#docregion` in the source file. Confirm that by looking at `content/examples/docs-style-guide/src/app/app.module.ts`
+1. The `region` value, `"class"`, is the name of the `#docregion` in the source file. Confirm that by looking at `content/examples/ocs-style-guide/src/app/app.module.ts`
 
 1. Omitting the `title` is fine when the source of the fragment is obvious. We just said that this is a fragment of the `app.module.ts` file which was displayed immediately above, in full, with a header.
 There's no need to repeat the header.
@@ -434,20 +431,21 @@ Here's the markup for an "avoid" example in the
 {@a code-tabs}
 ### Code Tabs
 
-Code tabs display code much like _code examples_ do.  The added advantage is that they can display mutiple code samples within a tabbed interface.  Each tab is displayed using _code pane_.
+Code tabs display code much like Code examples do.  The added advantage is that they can display mutiple code samples within a tabbed interface.  Each tab is displayed using Code-pane.
 
 #### Code-tabs attributes
 
-* `linenums`: The value can be `true`, `false` or a number indicating the starting line number. If not specified, line numbers are enabled only when code for a tab pane has greater than 10 lines of code.
+* `linenums`: The value can be `true`, `false` or a number indicating the starting line number. If not specified, line numbers are are enabled only when code for a tab pane has 10 or more lines.
 
 #### Code-pane attributes
 
 * `path` - a file in the content/examples folder
 * `title` - seen in the header of a tab
-* `linenums` - overrides the `linenums` property at the `code-tabs` level for this particular pane. The value can be `true`, `false` or a number indicating the starting line number. If not specified, line numbers are enabled only when the number of lines of code are greater than 10.
+* `linenums` - overrides the `linenums` property at the `code-tabs` level for this particular pane. The value can be `true`, `false` or a number indicating the starting line number. If not specified, line numbers are are enabled only when there are 10 or more lines.
 
 The next example displays multiple code tabs, each with its own title.
-It demonstrates control over display of line numbers at both the `<code-tabs>` and `<code-pane>` levels.
+Line numbers are explicitly disabled for all panes at the `<code-tabs>` level.
+The second pane adds line numbers back for itself. 
 
 <code-tabs linenums="false">
   <code-pane 
@@ -472,9 +470,6 @@ It demonstrates control over display of line numbers at both the `<code-tabs>` a
 
 Here's the markup for that example.
 
-Note how the `linenums` attribute in the  `<code-tabs>` explicitly disables numbering for all panes.
-The `linenums` attribute in the second pane restores line numbering for _itself only_.
-
 ```html
 <code-tabs linenums="false">
   <code-pane 
@@ -768,7 +763,7 @@ To link to a plunker defined by a named `plnkr.json` file, set the `plnkr` attri
 
 <h3 class="no-toc">Live Example without download</h3> 
 
-To skip the download link, add the `noDownload` attribute.
+To skip the download link, add the `noDownload` attribute
 
 <live-example noDownload>Just the plunker</live-example>
 
@@ -786,7 +781,7 @@ To skip the live plunker link and only link to the download, add the `downloadOn
 <live-example downloadOnly>Download only</live-example>
 ```
 
-<h3 class="no-toc">Embedded live example</h3> 
+<h3 class="no-toc"Embedded live example></h3> 
 
 By default, a live example link opens a plunker in a separate browser tab. 
 You can embed the plunker within the guide page itself by adding the `embedded` attribute.

aio/content/guide/form-validation.md

@@ -64,7 +64,7 @@ This gives you a reference to the Angular `NgModel` directive
 associated with this control that you can use _in the template_
 to check for control states such as `valid` and `dirty`.
 
-* The `*ngIf` on the `<div>` element reveals a set of nested message `divs`
+* The `*ngIf` on the `<div>` element reveals a set of nested message `divs` 
 but only if there are `name` errors and
 the control is either `dirty` or `touched`.
 
@@ -168,8 +168,10 @@ on custom validation directives.
 
 * Binding to the new `formErrors.name` property is sufficient to display all name validation error messages.
 
+	
 {@a component-class}
 
+
 ### Component class
 The original component code for Template 1 stayed the same; however,
 Template 2 requires some changes in the component. This section covers the code
@@ -321,7 +323,7 @@ This allows you to do the following:
 
 * Add, change, and remove validation functions on the fly.
 * Manipulate the control model dynamically from within the component.
-* [Test](guide/form-validation#testing-considerations) validation and control logic with isolated unit tests.
+* [Test](guide/form-validation#testing) validation and control logic with isolated unit tests.
 
 The following sample re-writes the hero form in Reactive Forms style.
 
@@ -386,7 +388,7 @@ but rather for css styling and accessibility.
 
 <div class="l-sub-section">
 
-Currently, Reactive Forms doesn't add the `required` or `aria-required`
+Currently, Reactive Forms doesn't add the `required` or `aria-required` 
 HTML validation attribute to the DOM element
 when the control has the `required` validator function.
 
@@ -455,12 +457,12 @@ to set error messages for the new control model.
 
 ## Built-in validators
 
-Angular forms include a number of built-in validator functions, which are functions
-that help you check common user input in forms. In addition to the built-in
-validators covered here of `minlength`, `maxlength`,
-and `required`, there are others such as `email` and `pattern`
-for Reactive Forms.
-For a full list of built-in validators,
+Angular forms include a number of built-in validator functions, which are functions 
+that help you check common user input in forms. In addition to the built-in 
+validators covered here of `minlength`, `maxlength`, 
+and `required`, there are others such as `email` and `pattern` 
+for Reactive Forms. 
+For a full list of built-in validators, 
 see the [Validators](api/forms/Validators) API reference.
 
 
@@ -486,7 +488,7 @@ Learn more about `FormBuilder` in the [Introduction to FormBuilder](guide/reacti
 #### Committing hero value changes
 
 In two-way data binding, the user's changes flow automatically from the controls back to the data model properties.
-A Reactive Forms component should not use data binding to
+A Reactive Forms component should not use data binding to 
 automatically update data model properties.
 The developer decides _when and how_ to update the data model from control values.
 

aio/content/guide/forms.md

@@ -214,10 +214,10 @@ There are three changes:
 
 1. You import `FormsModule` and the new `HeroFormComponent`.
 
-1. You add the `FormsModule` to the list of `imports` defined in the `@NgModule` decorator. This gives the application
+1. You add the `FormsModule` to the list of `imports` defined in the `ngModule` decorator. This gives the application
 access to all of the template-driven forms features, including `ngModel`.
 
-1. You add the `HeroFormComponent` to the list of `declarations` defined in the `@NgModule` decorator. This makes
+1. You add the `HeroFormComponent` to the list of `declarations` defined in the `ngModule` decorator. This makes
 the `HeroFormComponent` component visible throughout this module.
 
 

aio/content/guide/glossary.md

@@ -25,8 +25,15 @@ to a module factory, meaning you don't need to include the Angular compiler in y
 Ahead-of-time compiled applications also benefit from decreased load time and increased performance.
 
 
+## Angular module
 
-</div>
+Helps you organize an application into cohesive blocks of functionality.
+An Angular module identifies the components, directives, and pipes that the application uses along with the list of external Angular modules that the application needs, such as `FormsModule`.
+
+Every Angular application has an application root-module class. By convention, the class is
+called `AppModule` and resides in a file named `app.module.ts`.
+
+For details and examples, see the [Angular Modules (NgModule)](guide/ngmodule) page.
 
 
 ## Annotation
@@ -108,7 +115,7 @@ The Angular [scoped packages](guide/glossary#scoped-package) each have a barrel
 
 
 
-You can often achieve the same result using [NgModules](guide/glossary#ngmodule) instead.
+You can often achieve the same result using [Angular modules](guide/glossary#angular-module) instead.
 
 
 </div>
@@ -125,11 +132,7 @@ between a "token"&mdash;also referred to as a "key"&mdash;and a dependency [prov
 
 ## Bootstrap
 
-
-<div class="l-sub-section">
-
-You launch an Angular application by "bootstrapping" it using the application root NgModule (`AppModule`).
-
+You launch an Angular application by "bootstrapping" it using the application root Angular module (`AppModule`).
 Bootstrapping identifies an application's top level "root" [component](guide/glossary#component),
 which is the first component that is loaded for the application.
 For more information, see the [Setup](guide/setup) page.
@@ -343,13 +346,13 @@ elements and their children.
 The [official JavaScript language specification](https://en.wikipedia.org/wiki/ECMAScript).
 
 The latest approved version of JavaScript is
-[ECMAScript 2017](http://www.ecma-international.org/ecma-262/8.0/)
-(also known as "ES2017" or "ES8"). Many Angular developers write their applications
-in ES8 or a dialect that strives to be
+[ECMAScript 2016](http://www.ecma-international.org/ecma-262/7.0/)
+(also known as "ES2016" or "ES7"). Many Angular developers write their applications
+in ES7 or a dialect that strives to be
 compatible with it, such as [TypeScript](guide/glossary#typescript).
 
 Most modern browsers only support the much older "ECMAScript 5" (also known as "ES5") standard.
-Applications written in ES2017, ES2016, ES2015, or one of their dialects must be [transpiled](guide/glossary#transpile)
+Applications written in ES2016, ES2015, or one of their dialects must be [transpiled](guide/glossary#transpile)
 to ES5 JavaScript.
 
 Angular developers can write in ES5 directly.
@@ -472,8 +475,8 @@ Read more in the [Lifecycle Hooks](guide/lifecycle-hooks) page.
 
 Angular has the following types of modules:
 
-* [NgModules](guide/glossary#ngmodule).
-For details and examples, see the [NgModules](guide/ngmodule) page.
+* [Angular modules](guide/glossary#angular-module).
+For details and examples, see the [Angular Modules](guide/ngmodule) page.
 * ES2015 modules, as described in this section.
 
 
@@ -490,7 +493,7 @@ In general, you assemble an application from many modules, both the ones you wri
 A module *exports* something of value in that code, typically one thing such as a class;
 a module that needs that class *imports* it.
 
-The structure of NgModules and the import/export syntax
+The structure of Angular modules and the import/export syntax
 is based on the [ES2015 module standard](http://www.2ality.com/2014/09/es6-modules-final.html).
 
 An application that adheres to this standard requires a module loader to
@@ -508,24 +511,6 @@ You rarely access Angular feature modules directly. You usually import them from
 
 {@a N}
 
-
-## NgModule
-
-<div class="l-sub-section">
-
-
-
-Helps you organize an application into cohesive blocks of functionality.
-An NgModule identifies the components, directives, and pipes that the application uses along with the list of external NgModules that the application needs, such as `FormsModule`.
-
-Every Angular application has an application root-module class. By convention, the class is
-called `AppModule` and resides in a file named `app.module.ts`.
-
-For details and examples, see [NgModules](guide/ngmodule).
-
-
-</div>
-
 {@a O}
 
 ## Observable
@@ -629,9 +614,7 @@ For more information, see the [Routing & Navigation](guide/router) page.
 
 ## Router module
 
-<div class="l-sub-section">
-
-A separate [NgModule](guide/glossary#ngmodule) that provides the necessary service providers and directives for navigating through application views.
+A separate [Angular module](guide/glossary#angular-module) that provides the necessary service providers and directives for navigating through application views.
 
 For more information, see the [Routing & Navigation](guide/router) page.
 
@@ -650,7 +633,7 @@ For more information, see the [Routing & Navigation](guide/router) page.
 A way to group related *npm* packages.
 Read more at the [npm-scope](https://docs.npmjs.com/misc/scope) page.
 
-NgModules are delivered within *scoped packages* such as `@angular/core`,
+Angular modules are delivered within *scoped packages* such as `@angular/core`,
 `@angular/common`, `@angular/platform-browser-dynamic`, `@angular/http`, and `@angular/router`.
 
 Import a scoped package the same way that you import a normal package.
@@ -812,4 +795,4 @@ asynchronous events by checking for data changes and updating
 the information it displays via [data bindings](guide/glossary#data-binding).
 
 Learn more about zones in this
-[Brian Ford video](https://www.youtube.com/watch?v=3IqtmUscE_U).
+[Brian Ford video](https://www.youtube.com/watch?v=3IqtmUscE_U).

aio/content/guide/language-service.md

@@ -1,176 +0,0 @@
-# Angular Language Service
-
-The Angular Language Service is a way to get completions, errors, 
-hints, and navigation inside your Angular templates whether they 
-are external in an HTML file or embedded in annotations/decorators 
-in a string. The Angular Language Service autodetects that you are 
-opening an Angular file, reads your `tsconfig.json` file, finds all the 
-templates you have in your application, and then provides language 
-services for any templates that you open.
-
-
-## Autocompletion
-
-Autocompletion can speed up your development time by providing you with 
-contextual possibilities and hints as you type. This example shows 
-autocomplete in an interpolation. As you type it out, 
-you can hit tab to complete.
-
-<figure>
-  <img src="generated/images/guide/language-service/language-completion.gif" alt="autocompletion">
-</figure>
-
-There are also completions within 
-elements. Any elements you have as a component selector will 
-show up in the completion list.
-
-## Error checking
-
-The Angular Language Service can also forewarn you of mistakes in your code. 
-In this example, Angular doesn't know what `orders` is or where it comes from. 
-
-<figure>
-  <img src="generated/images/guide/language-service/language-error.gif" alt="error checking">
-</figure>
-
-## Navigation
-
-Navigation allows you to hover to 
-see where a component, directive, module, etc. is from and then 
-click and press F12 to go directly to its definition.
-
-<figure>
-  <img src="generated/images/guide/language-service/language-navigation.gif" alt="navigation">
-</figure>
-
-
-## Angular Language Service in your editor
-
-Angular Language Service is currently available for [Visual Studio Code](https://code.visualstudio.com/) and 
-[WebStorm](https://www.jetbrains.com/webstorm). 
-
-### Visual Studio Code
-
-In Visual Studio Code, install Angular Language Service from the store, 
-which is accessible from the bottom icon on the left menu pane. 
-You can also use the VS Quick Open (⌘+P) to search for the extension. When you've opened it, 
-enter the following command: 
-
-```sh
-ext install ng-template
-```
-
-Then click the install button to install the Angular Language Service. 
-
-
-### WebStorm
-
-In webstorm, you have to install the language service as a dev dependency. 
-When Angular sees this dev dependency, it provides the 
-language service inside of WebStorm. Webstorm then gives you 
-colorization inside the template and autocomplete in addition to the Angular Language Service.
-
-Here's the dev dependency 
-you need to have in `package.json`:
-
-```json
-
-devDependencies {
-	"@angular/language-service": "^4.0.0"
-}
-```
-
-Then in the terminal window at the root of your project, 
-install the `devDependencies` with `npm` or `yarn`: 
-
-```sh
-npm install 
-```
-*OR* 
-
-```sh
-yarn
-```
-
-*OR* 
-
-```sh
-yarn install
-```
-
-
-### Sublime Text
-
-In [Sublime Text](https://www.sublimetext.com/), you first need an extension to allow Typescript. 
-Install the latest version of typescript in a local `node_modules` directory:
-
-```sh
-npm install --save-dev typescript
-```
-
-Then install the Angular Language Service in the same location:
-```sh
-npm install --save-dev @angular/language-service
-```
-
-Starting with TypeScript 2.3, TypeScript has a language service plugin model that the language service can use. 
-
-Next, in your user preferences (`Cmd+,` or `Ctrl+,`), add:
-
-```json
-"typescript-tsdk": "<path to your folder>/node_modules/typescript/lib"
-```
-
-
-## Installing in your project
-
-You can also install Angular Language Service in your project with the 
-following `npm` command:
-
-```sh
-npm install --save-dev @angular/language-service
-```
-Additionally, add the following to the `"compilerOptions"` section of 
-your project's `tsconfig.json`.
-
-```json
-  "plugins": [
-      {"name": "@angular/language-service"}
-  ]
-```
-Note that this only provides diagnostics and completions in `.ts` 
-files. You need a custom sublime plugin (or modifications to the current plugin) 
-for completions in HTML files.
-
-
-## How the Language Service works
-
-When you use an editor with a language service, there's an 
-editor process which starts a separate language process/service 
-to which it speaks through an [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call). 
-Any time you type inside of the editor, it sends information to the other process to 
-track the state of your project. When you trigger a completion list within a template, the editor process first parses the template into an HTML AST, or [abstract syntax tree](https://en.wikipedia.org/wiki/Abstract_syntax_tree). Then the Angular compiler interprets 
-what module the template is part of, the scope you're in, and the component selector. Then it figures out where in the template AST your cursor is. When it determines the 
-context, it can then determine what the children can be.
-
-It's a little more involved if you are in an interpolation. If you have an interpolation of `{{data.---}}` inside a `div` and need the completion list after `data.---`, the compiler can't use the HTML AST to find the answer. The HTML AST can only tell the compiler that there is some text with the characters "`{{data.---}}`". That's when the template parser produces an expression AST, which resides within the template AST. The Angular Language Services then looks at `data.---` within its context and asks the TypeScript Language Service what the members of data are. TypeScript then returns the list of possibilities.
-
-
-For more in-depth information, see the 
-[Angular Language Service API](https://github.com/angular/angular/blob/master/packages/language-service/src/types.ts)
-
-
-
-
-
-
-
-
-<hr>
-
-## More on Information
-
-For more information, see [Chuck Jazdzewski's presentation](https://www.youtube.com/watch?v=ez3R0Gi4z5A&t=368s) on the Angular Language 
-Service from [ng-conf](https://www.ng-conf.org/) 2017.
-
-

aio/content/guide/lifecycle-hooks.md

@@ -397,7 +397,8 @@ created under test or before you decide to display it.
 Constructors should do no more than set the initial local variables to simple values.
 
 An `ngOnInit()` is a good place for a component to fetch its initial data. The
-[Tour of Heroes Tutorial](tutorial/toh-pt4#oninit) guide shows how.
+[Tour of Heroes Tutorial](tutorial/toh-pt4#oninit) and [HTTP Client](guide/http#oninit)
+guides show how.
 
 
 Remember also that a directive's data-bound input properties are not set until _after construction_.

aio/content/guide/ngmodule-faq.md

@@ -615,7 +615,7 @@ Once the application begins, the app root injector is closed to new providers.
 
 Time passes and application logic triggers lazy loading of a module.
 Angular must add the lazy-loaded module's providers to an injector somewhere.
-It can't add them to the app root injector because that injector is closed to new providers.
+It can't added them to the app root injector because that injector is closed to new providers.
 So Angular creates a new child injector for the lazy-loaded module context.
 
 
@@ -1327,7 +1327,7 @@ Here's an _NgModule_ class with imports, exports, and declarations.
 
 
 
-Of course you use _JavaScript_ modules to write NgModules as seen in the complete `contact.module.ts` file:
+Of course you use _JavaScript_ modules to write _Angular_ modules as seen in the complete `contact.module.ts` file:
 
 <code-example path="ngmodule/src/app/contact/contact.module.2.ts" title="src/app/contact/contact.module.ts" linenums="false">
 

aio/content/guide/npm-packages.md

@@ -163,6 +163,7 @@ without waiting for Angular updates.
 ***angular-in-memory-web-api***: An Angular-supported library that simulates a remote server's web api
 without requiring an actual server or real HTTP calls.
 Good for demos, samples, and early stage development (before you even have a server).
+Read about it in the [HTTP Client](guide/http#in-mem-web-api) page.
 
 ***bootstrap***: [Bootstrap](http://getbootstrap.com/) is a popular HTML and CSS framework for designing responsive web apps.
 Some of the samples improve their appearance with *bootstrap*.

aio/content/guide/quickstart.md

@@ -140,7 +140,7 @@ This is the _root component_ and it is named `app-root`.
 You can find it in `./src/app/app.component.ts`.
 
 
-Open the component file and change the `title` property from _Welcome to app!!_ to _Welcome to My First Angular App!!_:
+Open the component file and change the `title` property from _app works!_ to _My First Angular App_:
 
 
 <code-example path="cli-quickstart/src/app/app.component.ts" region="title" title="src/app/app.component.ts" linenums="false"></code-example>
@@ -331,7 +331,7 @@ Any files outside of this folder are meant to support building your app.
       The main HTML page that is served when someone visits your site.
       Most of the time you'll never need to edit it.
       The CLI automatically adds all `js` and `css` files when building your app so you
-      never need to add any `<script>` or `<link>` tags here manually.
+      never need to add any `&lt;script&gt;` or `&lt;link&gt;` tags here manually.
 
     </td>
   </tr>
@@ -464,7 +464,7 @@ These files go in the root folder next to `src/`.
     </td>
     <td>
 
-      Inside `e2e/` live the end-to-end tests.
+      Inside `e2e/` live the End-to-End tests.
       They shouldn't be inside `src/` because e2e tests are really a separate app that
       just so happens to test your main app.
       That's also why they have their own `tsconfig.e2e.json`.
@@ -493,7 +493,7 @@ These files go in the root folder next to `src/`.
 
       Configuration for Angular CLI.
       In this file you can set several defaults and also configure what files are included
-      when your project is built.
+      when your project is build.
       Check out the official documentation if you want to know more.
 
     </td>

aio/content/guide/reactive-forms.md

@@ -614,7 +614,7 @@ If you do not bind the value, the select shows the first option from the data mo
 The component _class_ defines control properties without regard for their representation in the template.
 You define the `state`, `power`, and `sidekick` controls the same way you defined the `name` control.
 You tie these controls to the template HTML elements in the same way,
-specifying the `FormControl` name with the `formControlName` directive.
+specifiying the `FormControl` name with the `formControlName` directive.
 
 See the API reference for more information about
 [radio buttons](api/forms/RadioControlValueAccessor "API: RadioControlValueAccessor"),
@@ -1080,11 +1080,8 @@ To get access to the `FormArray` class, import it into `hero-detail.component.ts
 
 
 To _work_ with a `FormArray` you do the following:
-
 1. Define the items (`FormControls` or `FormGroups`) in the array.
-
 1. Initialize the array with items created from data in the _data model_.
-
 1. Add and remove items as the user requires.
 
 In this guide, you define a `FormArray` for `Hero.addresses` and
@@ -1223,7 +1220,7 @@ Place a button on the form so the user can add a new _secret lair_ and wire it t
 
 Be sure to **add the `type="button"` attribute**.
 In fact, you should always specify a button's `type`.
-Without an explicit type, the button type defaults to "submit".
+Without an explict type, the button type defaults to "submit".
 When you later add a _form submit_ action, every "submit" button triggers the submit action which
 might do something like save the current changes.
 You do not want to save changes when the user clicks the _Add a Secret Lair_ button.

aio/content/guide/router.md

@@ -255,11 +255,11 @@ During each navigation, the `Router` emits navigation events through the `Router
 
   <tr>
     <td>
-      <code>RouteConfigLoadEnd</code>
+      <code>RouteConfigLoadStart</code>
     </td>
     <td>
 
-      An [event](api/router/RouteConfigLoadEnd) triggered after a route has been lazy loaded.
+      An [event](api/router/RouteConfigLoadStart) triggered after a route has been lazy loaded.
 
     </td>
   </tr>
@@ -347,7 +347,7 @@ Here are the key `Router` terms and their meanings:
     </td>
 
     <td>
-      A separate NgModule that provides the necessary service providers
+      A separate Angular module that provides the necessary service providers
       and directives for navigating through application views.
     </td>
 
@@ -1830,7 +1830,7 @@ Finally, you activate the observable with `subscribe` method and (re)set the com
 
 #### _ParamMap_ API
 
-The `ParamMap` API is inspired by the [URLSearchParams interface](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams). It provides methods
+The `ParamMap` API is inspired by the [URLSearchParams interface](https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParamsOPut). It provides methods
 to handle parameter access for both route parameters (`paramMap`) and query parameters (`queryParamMap`).
 
 <table>
@@ -3794,7 +3794,7 @@ Take the final step and detach the admin feature set from the main application.
 The root `AppModule` must neither load nor reference the `AdminModule` or its files.
 
 In `app.module.ts`, remove the `AdminModule` import statement from the top of the file
-and remove the `AdminModule` from the NgModule's `imports` array.
+and remove the `AdminModule` from the Angular module's `imports` array.
 
 
 {@a can-load-guard}

aio/content/guide/security.md

@@ -282,7 +282,36 @@ This technique is effective because all browsers implement the _same origin poli
 on which cookies are set can read the cookies from that site and set custom headers on requests to that site.
 That means only your application can read this cookie token and set the custom header. The malicious code on `evil.com` can't.
 
-Angular's `HttpClient` has built-in support for the client-side half of this technique. Read about it more in the [HttpClient guide](/guide/http).
+Angular's `http` has built-in support for the client-side half of this technique in its `XSRFStrategy`.
+The default `CookieXSRFStrategy` is turned on automatically.
+Before sending an HTTP request, the `CookieXSRFStrategy` looks for a cookie called `XSRF-TOKEN` and
+sets a header named `X-XSRF-TOKEN` with the value of that cookie.
+
+The server must do its part by setting the
+initial `XSRF-TOKEN` cookie and confirming that each subsequent state-modifying request
+includes a matching `XSRF-TOKEN` cookie and `X-XSRF-TOKEN` header.
+
+XSRF/CSRF tokens should be unique per user and session, have a large random value generated by a
+cryptographically secure random number generator, and expire in a day or two.
+
+Your server may use a different cookie or header name for this purpose.
+An Angular application can customize cookie and header names by providing its own `CookieXSRFStrategy` values.
+
+<code-example language="typescript">
+  { provide: XSRFStrategy, useValue: new CookieXSRFStrategy('myCookieName', 'My-Header-Name') }
+</code-example>
+
+
+
+Or you can implement and provide an entirely custom `XSRFStrategy`:
+
+
+<code-example language="typescript">
+  { provide: XSRFStrategy, useClass: MyXSRFStrategy }
+
+</code-example>
+
+
 
 For information about CSRF at the Open Web Application Security Project (OWASP), see
 <a href="https://www.owasp.org/index.php/Cross-Site_Request_Forgery_%28CSRF%29">Cross-Site Request Forgery (CSRF)</a> and
@@ -308,7 +337,7 @@ This attack is only successful if the returned JSON is executable as JavaScript.
 prevent an attack by prefixing all JSON responses to make them non-executable, by convention, using the
 well-known string `")]}',\n"`.
 
-Angular's `HttpClient` library recognizes this convention and automatically strips the string
+Angular's `Http` library recognizes this convention and automatically strips the string
 `")]}',\n"` from all responses before further parsing.
 
 For more information, see the XSSI section of this [Google web security blog

aio/content/guide/setup-systemjs-anatomy.md

@@ -199,7 +199,7 @@ If you do, this page can help you understand their purpose.
 
 
       A list of files that you can delete if you want to purge your setup of the
-      original QuickStart Seed testing and git maintenance artifacts.
+      original QuickStart Seed testing and git maintainence artifacts.
       See instructions in the optional
       [_Deleting non-essential files_](guide/setup#non-essential "Setup: Deleting non-essential files") section.
       *Do this only in the beginning to avoid accidentally deleting your own tests and git setup!*

aio/content/guide/styleguide.md

@@ -2129,12 +2129,12 @@ discourage the `I` prefix.
 <a href="#toc">Back to top</a>
 
 
-## Application structure and NgModules
+## Application structure and Angular modules
 
 Have a near-term view of implementation and a long-term vision. Start small but keep in mind where the app is heading down the road.
 
 All of the app's code goes in a folder named `src`.
-All feature areas are in their own folder, with their own NgModule.
+All feature areas are in their own folder, with their own Angular module.
 
 All content is one asset per file. Each component, service, and pipe is in its own file.
 All third party vendor scripts are stored in another folder and not in the `src` folder.
@@ -2779,7 +2779,7 @@ and more difficult in a flat structure.
 
 
 
-**Do** create an NgModule for each feature area.
+**Do** create an Angular module for each feature area.
 
 
 </div>
@@ -2790,7 +2790,7 @@ and more difficult in a flat structure.
 
 
 
-**Why?** NgModules make it easy to lazy load routable features.
+**Why?** Angular modules make it easy to lazy load routable features.
 
 
 </div>
@@ -2801,7 +2801,7 @@ and more difficult in a flat structure.
 
 
 
-**Why?** NgModules make it easier to isolate, test, and re-use features.
+**Why?** Angular modules make it easier to isolate, test, and re-use features.
 
 
 </div>
@@ -2827,7 +2827,7 @@ and more difficult in a flat structure.
 
 
 
-**Do** create an NgModule in the app's root folder,
+**Do** create an Angular module in the app's root folder,
 for example, in `/src/app`.
 
 
@@ -2839,7 +2839,7 @@ for example, in `/src/app`.
 
 
 
-**Why?** Every app requires at least one root NgModule.
+**Why?** Every app requires at least one root Angular module.
 
 
 </div>
@@ -2888,7 +2888,7 @@ for example, in `/src/app`.
 
 
 
-**Do** create an NgModule for all distinct features in an application;
+**Do** create an Angular module for all distinct features in an application;
 for example, a `Heroes` feature.
 
 
@@ -3127,7 +3127,7 @@ that may need features from another common module; for example,
 
 
 
-**Why?** A lazy loaded feature module that imports that shared module will make its own copy of the service and likely have undesirable results.
+**Why?** A lazy loaded feature module that imports that shared module will make its own copy of the service and likely have undesireable results.
 
 
 </div>
@@ -3377,7 +3377,7 @@ Yet they're too big and messy to leave loose in the root folder.
 
 
 
-**Why?** A lazily loaded feature module that directly imports the `CoreModule` will make its own copy of services and likely have undesirable results.
+**Why?** A lazily loaded feature module that directly imports the `CoreModule` will make its own copy of services and likely have undesireable results.
 
 
 </div>

aio/content/guide/template-syntax.md

@@ -12,8 +12,8 @@ component class instance (the *component*) and its user-facing template.
 You may be familiar with the component/template duality from your experience with model-view-controller (MVC) or model-view-viewmodel (MVVM).
 In Angular, the component plays the part of the controller/viewmodel, and the template represents the view.
 
-This page is a comprehensive technical reference to the Angular template language.
-It explains basic principles of the template language and describes most of the syntax that you'll encounter elsewhere in the documentation.
+This page is a comprehensive technical reference to the Angular template language. 
+It explains basic principles of the template language and describes most of the syntax that you'll encounter elsewhere in the documentation. 
 
 Many code snippets illustrate the points and concepts, all of them available
 in the <live-example title="Template Syntax Live Code"></live-example>.
@@ -1155,7 +1155,7 @@ other HTML elements, attributes, properties, and components.
 They are usually applied to elements as if they were HTML attributes, hence the name.
 
 Many details are covered in the [_Attribute Directives_](guide/attribute-directives) guide.
-Many NgMdules such as the [`RouterModule`](guide/router "Routing and Navigation")
+Many Angular modules such as the [`RouterModule`](guide/router "Routing and Navigation")
 and the [`FormsModule`](guide/forms "Forms") define their own attribute directives.
 This section is an introduction to the most commonly used attribute directives:
 
@@ -1260,7 +1260,7 @@ Two-way data binding with the `NgModel` directive makes that easy. Here's an exa
 #### _FormsModule_ is required to use _ngModel_
 
 Before using the `ngModel` directive in a two-way data binding,
-you must import the `FormsModule` and add it to the NgModule's `imports` list.
+you must import the `FormsModule` and add it to the Angular module's `imports` list.
 Learn more about the `FormsModule` and `ngModel` in the
 [Forms](guide/forms#ngModel) guide.
 
@@ -1371,7 +1371,7 @@ _This_ section is an introduction to the common structural directives:
 ### NgIf
 
 You can add or remove an element from the DOM by applying an `NgIf` directive to
-that element (called the _host element_).
+that element (called the _host elment_).
 Bind the directive to a condition expression like `isActive` in this example.
 
 <code-example path="template-syntax/src/app/app.component.html" region="NgIf-1" title="src/app/app.component.html" linenums="false">
@@ -1947,12 +1947,12 @@ As of Typescript 2.0, you can enforce [strict null checking](http://www.typescri
 
 In this mode, typed variables disallow null and undefined by default. The type checker throws an error if you leave a variable unassigned or try to assign null or undefined to a variable whose type disallows null and undefined.
 
-The type checker also throws an error if it can't determine whether a variable will be null or undefined at runtime.
-You may know that can't happen but the type checker doesn't know.
+The type checker also throws an error if it can't determine whether a variable will be null or undefined at runtime. 
+You may know that can't happen but the type checker doesn't know. 
 You tell the type checker that it can't happen by applying the post-fix
-[_non-null assertion operator (!)_](http://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-0.html#non-null-assertion-operator "Non-null assertion operator").
+[_non-null assertion operator (!)_]((http://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-0.html#non-null-assertion-operator "Non-null assertion operator").
 
-The _Angular_ **non-null assertion operator (`!`)** serves the same purpose in an Angular template.
+The _Angular_ **non-null assertion operator (`!`)** serves the same purpose in an Angular template. 
 
 For example, after you use [*ngIf](guide/template-syntax#ngIf) to check that `hero` is defined, you can assert that
 `hero` properties are also defined.

aio/content/guide/testing.md

@@ -178,7 +178,7 @@ For a discussion of the unit testing setup files, [see below](guide/testing#setu
 {@a isolated-v-testing-utilities}
 
 
-### Isolated unit tests vs. the Angular testing utilities
+### Isolated unit tests vs. the Angular testing utilites
 
 [Isolated unit tests](guide/testing#isolated-unit-tests "Unit testing without the Angular testing utilities")
 examine an instance of a class all by itself without any dependence on Angular or any injected values.
@@ -427,7 +427,7 @@ and re-attach it to a dynamically-constructed Angular test module
 tailored specifically for this battery of tests.
 
 The `configureTestingModule` method takes an `@NgModule`-like metadata object.
-The metadata object can have most of the properties of a normal [NgModule](guide/ngmodule).
+The metadata object can have most of the properties of a normal [Angular module](guide/ngmodule).
 
 _This metadata object_ simply declares the component to test, `BannerComponent`.
 The metadata lack `imports` because (a) the default testing module configuration already has what `BannerComponent` needs

aio/content/guide/ts-to-js.md

@@ -247,10 +247,12 @@ next to the original _ES5_ version for comparison:
   </code-pane>
 </code-tabs>
 
-{@a name-constructor}
-
 <div class="callout is-helpful">
 
+  {@a name-constructor}
+
+  ###  Name the constructor
+
   A **named** constructor displays clearly in the console log
   if the component throws a runtime error.
   An **unnamed** constructor displays as an anonymous function, for   example, `class0`,
@@ -429,7 +431,7 @@ by calling the `@Inject()` decorator with the injection token.
 In the following example, the token is the string `'heroName'`.
 
 The other JavaScript dialects add a `parameters` array to the class constructor function.
-Each item contains a new instance of `Inject`:
+Each item constrains a new instance of `Inject`:
 
 * _Plain ES6_&mdash;each item is a new instance of `Inject(token)` in a sub-array.
 * _ES5_&mdash;simply list the string tokens.

aio/content/guide/upgrade.md

@@ -62,7 +62,7 @@ There are a few rules in particular that will make it much easier to do
 * The [Folders-by-Feature Structure](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#folders-by-feature-structure)
   and [Modularity](https://github.com/johnpapa/angular-styleguide/blob/master/a1/README.md#modularity)
   rules define similar principles on a higher level of abstraction: Different parts of the
-  application should reside in different directories and NgModules.
+  application should reside in different directories and Angular modules.
 
 When an application is laid out feature per feature in this way, it can also be
 migrated one feature at a time. For applications that don't already look like
@@ -382,12 +382,12 @@ that describes Angular assets in metadata. The differences blossom from there.
 
 In a hybrid application you run both versions of Angular at the same time.
 That means that you need at least one module each from both AngularJS and Angular.
-You will import `UpgradeModule` inside the NgModule, and then use it for
+You will import `UpgradeModule` inside the Angular module, and then use it for
 bootstrapping the AngularJS module.
 
 <div class="l-sub-section">
 
-Read more about [NgModules](guide/ngmodule).
+Learn more about Angular modules at the [NgModule guide](guide/ngmodule).
 
 </div>
 
@@ -485,7 +485,7 @@ Because `HeroDetailComponent` is an Angular component, you must also add it to t
 
 And because this component is being used from the AngularJS module, and is an entry point into
 the Angular application, you must add it to the `entryComponents` for the
-NgModule.
+Angular module.
 
 <code-example path="upgrade-module/src/app/downgrade-static/app.module.ts" region="ngmodule" title="app.module.ts">
 </code-example>

aio/content/guide/visual-studio-2015.md

@@ -243,7 +243,7 @@ Everything seems fine while you move about _within_ the app.
 But you'll see the problem right away if you refresh the browser
 or paste a link to an app page (called a "deep link") into the browser address bar.
 
-You'll most likely get a *404 - Page Not Found* response from the server
+You'll most likely get a *404 - Page Not Found* response from the serer
 for any address other than `/` or `/index.html`.
 
 You have to configure the server to return `index.html` for requests to these "unknown" pages.