release: cut the v10.2.0 release

This commit fixes a bug when `useAbsoluteUrl` is set to true and
`ServerPlatformLocation` infers the base url from the supplied
`url`. User should explicitly set the `baseUrl` when they turn on
`useAbsoluteUrl`.

Breaking change:
If you use `useAbsoluteUrl` to setup `platform-server`, you now need to
also specify `baseUrl`.
We are intentionally making this a breaking change in a minor release,
because if `useAbsoluteUrl` is set to `true` then the behavior of the
application could be unpredictable, resulting in issues that are hard to
discover but could be affecting production environments.

PR Close #39334

(cherry picked from commit 7768aeb62f)

.circleci/bazel.windows.rc

@@ -6,10 +6,6 @@
 # https://docs.bazel.build/versions/master/guide.html#bazelrc-syntax-and-semantics
 try-import %workspace%/.circleci/bazel.common.rc
 
-# Save downloaded repositories in a location that can be cached by CircleCI. This helps us
-# speeding up the analysis time significantly with Bazel managed node dependencies on the CI.
-build --repository_cache=C:/Users/circleci/bazel_repository_cache
-
 # Manually set the local resources used in windows CI runs
 build --local_ram_resources=120000
 build --local_cpu_resources=32

.circleci/config.yml

@@ -27,8 +27,6 @@ var_3: &cache_key v7-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum
 # folder will contain all previously used versions and ultimately cause the cache restoring to
 # be slower due to its growing size.
 var_4: &cache_key_fallback v7-angular-node-12-{{ checksum ".bazelversion" }}
-var_3_win: &cache_key_win v7-angular-win-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
-var_4_win: &cache_key_win_fallback v7-angular-win-node-12-{{ checksum ".bazelversion" }}
 
 # Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the
 # cache keys also update the SHA for the "COMPONENTS_REPO_COMMIT" environment variable.
@@ -183,23 +181,12 @@ commands:
   setup_win:
     description: Setup windows node environment
     steps:
-      # Use the Linux workspace directly, as it already has checkout, rebased and node modules.
-      - custom_attach_workspace
+      - checkout
       # Install Bazel pre-requisites that aren't in the preconfigured CircleCI Windows VM.
       - run: ./.circleci/windows-env.ps1
       - run: node --version
       - run: yarn --version
-      - restore_cache:
-          keys:
-            - *cache_key_win
-            - *cache_key_win_fallback
-      # Reinstall to get windows binaries.
       - run: yarn install --frozen-lockfile --non-interactive
-      # Install @bazel/bazelisk globally and use that for the first run.
-      # Workaround for https://github.com/bazelbuild/rules_nodejs/issues/894
-      # NB: the issue was for @bazel/bazel but the same problem applies to @bazel/bazelisk
-      - run: yarn global add @bazel/bazelisk@$env:BAZELISK_VERSION
-      - run: bazelisk info
 
   notify_webhook_on_fail:
     description: Notify a webhook about failure
@@ -756,25 +743,26 @@ jobs:
     steps:
       - setup_win
       - run:
-          # Ran into a command parsing problem where `-browser:chromium-local` was converted to
-          # `-browser: chromium-local` (a space was added) in https://circleci.com/gh/angular/angular/357511.
-          # Probably a powershell command parsing thing. There's no problem using a yarn script though.
-          command: yarn circleci-win-ve
-          no_output_timeout: 45m
-      # Save bazel repository cache to use on subsequent runs.
-      # We don't save node_modules because it's faster to use the linux workspace and reinstall.
-      - save_cache:
-          key: *cache_key_win
-          paths:
-            - "C:/Users/circleci/bazel_repository_cache"
+          name: Build all windows CI targets
+          command: yarn bazel build --build_tag_filters=-ivy-only //packages/compiler-cli/... //tools/ts-api-guardian/...
+          no_output_timeout: 15m
+      - run:
+          name: Test all windows CI targets
+          command: yarn bazel test --test_tag_filters="-ivy-only,-browser:chromium-local" //packages/compiler-cli/... //tools/ts-api-guardian/...
+          no_output_timeout: 15m
 
   test_ivy_aot_win:
     executor: windows-executor
     steps:
       - setup_win
       - run:
-          command: yarn circleci-win-ivy
-          no_output_timeout: 45m
+          name: Build all windows CI targets
+          command: yarn bazel build --config=ivy --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot //packages/compiler-cli/... //tools/ts-api-guardian/...
+          no_output_timeout: 15m
+      - run:
+          name: Test all windows CI targets
+          command: yarn bazel test --config=ivy --test_tag_filters="-no-ivy-aot,-fixme-ivy-aot,-browser:chromium-local" //packages/compiler-cli/... //tools/ts-api-guardian/...
+          no_output_timeout: 15m
 
 
 workflows:
@@ -871,20 +859,12 @@ workflows:
       - test_zonejs:
           requires:
             - setup
-      # Windows Jobs
-      # These are very slow so we run them on non-PRs only for now.
-      # TODO: remove the filter when CircleCI makes Windows FS faster.
-      # The Windows jobs are only run after their non-windows counterparts finish successfully.
-      # This isn't strictly necessary as there is no artifact dependency, but helps economize
-      # CI resources by not attempting to build when we know should fail.
       - test_win:
-          <<: *skip_on_pull_requests
           requires:
-            - test
+            - setup
       - test_ivy_aot_win:
-          <<: *skip_on_pull_requests
           requires:
-            - test_ivy_aot
+            - setup
 
   monitoring:
     jobs:

.circleci/windows-env.ps1

@@ -2,8 +2,8 @@
 # https://docs.bazel.build/versions/master/install-windows.html
 # https://docs.bazel.build/versions/master/windows.html
 # Install MSYS2 and packages
-choco install msys2 --version 20180531.0.0 --no-progress --package-parameters "/NoUpdate"
-C:\tools\msys64\usr\bin\bash.exe -l -c "pacman --needed --noconfirm -S zip unzip patch diffutils git"
+choco install msys2 --version 20200903.0.0 --no-progress --package-parameters "/NoUpdate"
+C:\tools\msys64\usr\bin\bash.exe -l -c "pacman --needed --noconfirm -S zip unzip patch diffutils"
 
 # Add PATH modifications to the Powershell profile. This is the win equivalent of .bash_profile.
 # https://docs.microsoft.com/en-us/previous-versions//bb613488(v=vs.85)

.pullapprove.yml

@@ -186,6 +186,7 @@ groups:
          - IgorMinar               # Igor Minar
          - jbogarthyde             # Judy Bogart
          - jelbourn                # Jeremy Elbourn
+         - jessicajaniuk           # Jessica Janiuk
          - JiaLiPassion            # Jia Li
          - JoostK                  # Joost Koehoorn
          - josephperrott           # Joey Perrott
@@ -325,6 +326,8 @@ groups:
           'aio/content/guide/component-interaction.md',
           'aio/content/examples/component-interaction/**',
           'aio/content/images/guide/component-interaction/**',
+          'aio/content/guide/component-overview.md',
+          'aio/content/examples/component-overview/**',
           'aio/content/guide/component-styles.md',
           'aio/content/guide/view-encapsulation.md',
           'aio/content/examples/component-styles/**',
@@ -379,6 +382,7 @@ groups:
           'aio/content/examples/binding-syntax/**',
           'aio/content/guide/property-binding.md',
           'aio/content/examples/property-binding/**',
+          'aio/content/guide/property-binding-best-practices.md',
           'aio/content/guide/attribute-binding.md',
           'aio/content/examples/attribute-binding/**',
           'aio/content/guide/two-way-binding.md',
@@ -407,6 +411,7 @@ groups:
           'aio/content/guide/structural-directives.md',
           'aio/content/examples/structural-directives/**',
           'aio/content/guide/svg-in-templates.md',
+          'aio/content/guide/style-precedence.md',
           'aio/content/images/guide/structural-directives/**',
           'aio/content/guide/template-statements.md',
           'aio/content/guide/user-input.md',
@@ -1122,6 +1127,7 @@ groups:
           'docs/SAVED_REPLIES.md',
           'docs/TOOLS.md',
           'docs/TRIAGE_AND_LABELS.md',
+          'docs/images/**',
           'goldens/*',
           'modules/*',
           'packages/*',

CHANGELOG.md

@@ -1,3 +1,24 @@
+<a name="10.2.0"></a>
+# 10.2.0 (2020-10-21)
+
+
+### Bug Fixes
+
+* **core:** guard reading of global `ngDevMode` for undefined. ([#36055](https://github.com/angular/angular/issues/36055)) ([02405f1](https://github.com/angular/angular/commit/02405f1))
+* **platform-server:** Resolve absolute URL from baseUrl ([#39334](https://github.com/angular/angular/issues/39334)) ([71fb99f](https://github.com/angular/angular/commit/71fb99f))
+
+
+### BREAKING CHANGES
+
+* **platform-server:** If you use `useAbsoluteUrl` to setup `platform-server`, you now need to
+also specify `baseUrl`.
+We are intentionally making this a breaking change in a minor release,
+because if `useAbsoluteUrl` is set to `true` then the behavior of the
+application could be unpredictable, resulting in issues that are hard to
+discover but could be affecting production environments.
+
+
+
 <a name="10.1.6"></a>
 ## 10.1.6 (2020-10-14)
 

CONTRIBUTING.md

@@ -248,7 +248,7 @@ Any line of the commit message cannot be longer than 100 characters.
   │                          platform-webworker-dynamic|router|service-worker|upgrade|zone.js|
   │                          packaging|changelog|dev-infra|docs-infra|migrations|ngcc|ve
   │
-  └─⫸ Commit Type: build|ci|docs|feat|fix|perf|refactor|style|test
+  └─⫸ Commit Type: build|ci|docs|feat|fix|perf|refactor|test
 ```
 
 The `<type>` and `<summary>` fields are mandatory, the `(<scope>)` field is optional.
@@ -311,7 +311,7 @@ There are currently a few exceptions to the "use package name" rule:
 
 * `ve`: used for changes specific to ViewEngine (legacy compiler/renderer).
 
-* none/empty string: useful for `style`, `test` and `refactor` changes that are done across all packages (e.g. `style: add missing semicolons`) and for docs changes that are not related to a specific package (e.g. `docs: fix typo in tutorial`).
+* none/empty string: useful for `test` and `refactor` changes that are done across all packages (e.g. `test: add missing unit tests`) and for docs changes that are not related to a specific package (e.g. `docs: fix typo in tutorial`).
 
 
 ##### Summary

README.md

@@ -1,27 +1,151 @@
-[![CircleCI](https://circleci.com/gh/angular/angular/tree/master.svg?style=shield)](https://circleci.com/gh/angular/workflows/angular/tree/master)
-[![Discord](https://img.shields.io/discord/463752820026376202.svg?label=&logo=discord&logoColor=ffffff&color=7389D8&labelColor=6A7EC2)](https://discord.gg/angular)
-[![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)
-[![npm version](https://badge.fury.io/js/%40angular%2Fcore.svg)](https://www.npmjs.com/@angular/core)
+<h1 align="center">Angular - One framework. Mobile & desktop.</h1>
 
+<p align="center">
+  <img src="aio/src/assets/images/logos/angular/angular.png" alt="angular-logo" width="120px" height="120px"/>
+  <br>
+  <i>Angular is a development platform for building mobile and desktop web applications
+    <br> using Typescript/JavaScript and other languages.</i>
+  <br>
+</p>
 
-# Angular
+<p align="center">
+  <a href="https://www.angular.io"><strong>www.angular.io</strong></a>
+  <br>
+</p>
 
-Angular is a development platform for building mobile and desktop web applications using TypeScript/JavaScript and other languages.
+<p align="center">
+  <a href="CONTRIBUTING.md">Contributing Guidelines</a>
+  ·
+  <a href="https://github.com/angular/angular/issues">Submit an Issue</a>
+  ·
+  <a href="https://blog.angular.io/">Blog</a>
+  <br>
+  <br>
+</p>
+
+<p align="center">
+  <a href="https://circleci.com/gh/angular/workflows/angular/tree/master">
+    <img src="https://img.shields.io/circleci/build/github/angular/angular/master.svg?logo=circleci&logoColor=fff&label=CircleCI" alt="CI status" />
+  </a>&nbsp;
+  <a href="https://www.npmjs.com/@angular/core">
+    <img src="https://img.shields.io/npm/v/@angular/core.svg?logo=npm&logoColor=fff&label=NPM+package&color=limegreen" alt="Angular on npm" />
+  </a>&nbsp;
+  <a href="https://discord.gg/angular">
+    <img src="https://img.shields.io/discord/463752820026376202.svg?logo=discord&logoColor=fff&label=Discord&color=7389d8" alt="Discord conversation" />
+  </a>
+</p>
+
+<hr>
+
+## Documentation
+
+Get started with Angular, learn the fundamentals and explore advanced topics on our documentation website.
+
+- [Getting Started][quickstart]
+- [Architecture][architecture]
+- [Components and Templates][componentstemplates]
+- [Forms][forms]
+- [API][api]
+
+### Advanced
+
+- [Angular Elements][angularelements]
+- [Server Side Rendering][ssr]
+- [Schematics][schematics]
+- [Lazy Loading][lazyloading]
+
+## Development Setup
+
+### Prerequisites
+
+- Install [Node.js] which includes [Node Package Manager][npm]
+
+### Setting Up a Project
+
+Intall the Angular CLI globally:
+
+```
+npm install -g @angular/cli
+```
+
+Create workspace:
+
+```
+ng new [PROJECT NAME]
+```
+
+Run the application:
+
+```
+cd [PROJECT NAME]
+ng serve
+```
 
 ## Quickstart
 
 [Get started in 5 minutes][quickstart].
 
+## Ecosystem
+
+<p>
+  <img src="/docs/images/angular-ecosystem-logos.png" alt="angular ecosystem logos" width="500px" height="auto">
+</p>
+
+- [Angular Command Line (CLI)][cli]
+- [Angular Material][angularmaterial]
+
 ## Changelog
 
 [Learn about the latest improvements][changelog].
 
-## Want to help?
+## Upgrading
 
-Want to file a bug, contribute some code, or improve documentation? Excellent! Read up on our
-guidelines for [contributing][contributing] and then check out one of our issues in the [hotlist: community-help](https://github.com/angular/angular/labels/hotlist%3A%20community-help).
+Check out our [upgrade guide](https://update.angular.io/) to find out the best way to upgrade your project.
 
-[contributing]: https://github.com/angular/angular/blob/master/CONTRIBUTING.md
+## Contributing
+
+### Contributing Guidelines
+
+Read through our [contributing guidelines][contributing] to learn about our submission process, coding rules and more.
+
+### Want to Help?
+
+Want to file a bug, contribute some code, or improve documentation? Excellent! Read up on our guidelines for [contributing][contributing] and then check out one of our issues in the [hotlist: community-help](https://github.com/angular/angular/labels/hotlist%3A%20community-help).
+
+### Code of Conduct
+
+Help us keep Angular open and inclusive. Please read and follow our [Code of Conduct][codeofconduct].
+
+## Community
+
+Join the conversation and help the community.
+
+- [Twitter][twitter]
+- [Gitter][gitter]
+- Find a Local [Meetup][meetup]
+
+[![Love Angular badge](https://img.shields.io/badge/angular-love-blue?logo=angular&angular=love)](https://www.github.com/angular/angular)
+
+**Love Angular? Give our repo a star :star: :arrow_up:.**
+
+[contributing]: CONTRIBUTING.md
 [quickstart]: https://angular.io/start
-[changelog]: https://github.com/angular/angular/blob/master/CHANGELOG.md
+[changelog]: CHANGELOG.md
 [ng]: https://angular.io
+[documentation]: https://angular.io/docs
+[angularmaterial]: https://material.angular.io/
+[cli]: https://cli.angular.io/
+[architecture]: https://angular.io/guide/architecture
+[componentstemplates]: https://angular.io/guide/displaying-data
+[forms]: https://angular.io/guide/forms-overview
+[api]: https://angular.io/api
+[angularelements]: https://angular.io/guide/elements
+[ssr]: https://angular.io/guide/universal
+[schematics]: https://angular.io/guide/schematics
+[lazyloading]: https://angular.io/guide/lazy-loading-ngmodules
+[node.js]: https://nodejs.org/
+[npm]: https://www.npmjs.com/get-npm
+[codeofconduct]: CODE_OF_CONDUCT.md
+[twitter]: https://www.twitter.com/angular
+[gitter]: https://gitter.im/angular/angular
+[meetup]: https://www.meetup.com/find/?keywords=angular"

aio/README.md

@@ -36,8 +36,9 @@ Here are the most important tasks you might need to use:
 
 * `yarn boilerplate:add` - generate all the boilerplate code for the examples, so that they can be run locally.
 * `yarn boilerplate:add:viewengine` - same as `boilerplate:add` but also turns on `ViewEngine` (pre-Ivy) mode.
-
 * `yarn boilerplate:remove` - remove all the boilerplate code that was added via `yarn boilerplate:add`.
+* `yarn create-example` - create a new example directory containing initial source files.
+
 * `yarn generate-stackblitz` - generate the stackblitz 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.
 

aio/content/examples/.gitignore

@@ -32,6 +32,8 @@
 **/karma-test-shim.js
 **/browser-test-shim.js
 **/node_modules
+**/yarn.lock
+**/package-lock.json
 
 # built files
 *.map

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

@@ -12,7 +12,7 @@ describe('Accessibility example e2e tests', () => {
 
   it('should take a number and change progressbar width', () => {
     element(by.css('input')).sendKeys('16');
-    expect(element(by.css('input')).getAttribute('value')).toEqual('016');
+    expect(element(by.css('input')).getAttribute('value')).toEqual('16');
     expect(element(by.css('app-example-progressbar div')).getCssValue('width')).toBe('48px');
   });
 

aio/content/examples/accessibility/src/app/app.component.html

@@ -3,7 +3,7 @@
 <label>
   Enter an example progress value
   <input type="number" min="0" max="100"
-      [value]="progress" (input)="progress = $event.target.value">
+      [value]="progress" (input)="setProgress($event)">
 </label>
 
 <!-- The user of the progressbar sets an aria-label to communicate what the progress means. -->

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

@@ -7,4 +7,8 @@ import { Component } from '@angular/core';
 })
 export class AppComponent  {
   progress = 0;
+
+  setProgress($event: Event) {
+    this.progress = +($event.target as HTMLInputElement).value;
+  }
 }

aio/content/examples/attribute-binding/src/app/app.component.html

@@ -3,8 +3,10 @@
 <h2>Attribute binding</h2>
 <!-- #docregion attrib-binding-colspan -->
 <table border=1>
+  <!-- #docregion colspan -->
   <!--  expression calculates colspan=2 -->
   <tr><td [attr.colspan]="1 + 1">One-Two</td></tr>
+  <!-- #enddocregion colspan -->
 
   <!-- ERROR: There is no `colspan` property to set!
     <tr><td colspan="{{1 + 1}}">Three-Four</td></tr>
@@ -32,31 +34,31 @@
 <!-- #docregion basic-specificity -->
 <h3>Basic specificity</h3>
 
-<!-- The `class.special` binding will override any value for the `special` class in `classExpr`.  -->
-<div [class.special]="isSpecial" [class]="classExpr">Some text.</div>
+<!-- The `class.special` binding overrides any value for the `special` class in `classExpression`.  -->
+<div [class.special]="isSpecial" [class]="classExpression">Some text.</div>
 
-<!-- The `style.color` binding will override any value for the `color` property in `styleExpr`.  -->
-<div [style.color]="color" [style]="styleExpr">Some text.</div>
+<!-- The `style.color` binding overrides any value for the `color` property in `styleExpression`.  -->
+<div [style.color]="color" [style]="styleExpression">Some text.</div>
 <!-- #enddocregion basic-specificity -->
 
 <!-- #docregion source-specificity -->
 <h3>Source specificity</h3>
 
-<!-- The `class.special` template binding will override any host binding to the `special` class set by `dirWithClassBinding` or `comp-with-host-binding`.-->
+<!-- The `class.special` template binding overrides any host binding to the `special` class set by `dirWithClassBinding` or `comp-with-host-binding`.-->
 <comp-with-host-binding [class.special]="isSpecial" dirWithClassBinding>Some text.</comp-with-host-binding>
 
-<!-- The `style.color` template binding will override any host binding to the `color` property set by `dirWithStyleBinding` or `comp-with-host-binding`. -->
+<!-- The `style.color` template binding overrides any host binding to the `color` property set by `dirWithStyleBinding` or `comp-with-host-binding`. -->
 <comp-with-host-binding [style.color]="color" dirWithStyleBinding>Some text.</comp-with-host-binding>
 <!-- #enddocregion source-specificity -->
 
 <!-- #docregion dynamic-priority -->
 <h3>Dynamic vs static</h3>
 
-<!-- If `classExpr` has a value for the `special` class, this value will override the `class="special"` below -->
-<div class="special" [class]="classExpr">Some text.</div>
+<!-- If `classExpression` has a value for the `special` class, this value overrides the `class="special"` below -->
+<div class="special" [class]="classExpression">Some text.</div>
 
-<!-- If `styleExpr` has a value for the `color` property, this value will override the `style="color: blue"` below -->
-<div style="color: blue" [style]="styleExpr">Some text.</div>
+<!-- If `styleExpression` has a value for the `color` property, this value overrides the `style="color: blue"` below -->
+<div style="color: blue" [style]="styleExpression">Some text.</div>
 
 <!-- #enddocregion dynamic-priority -->
 

aio/content/examples/attribute-binding/src/app/app.component.ts

@@ -9,7 +9,7 @@ export class AppComponent {
   actionName = 'Go for it';
   isSpecial = true;
   canSave = true;
-  classExpr = 'special clearance';
-  styleExpr = 'color: red';
+  classExpression = 'special clearance';
+  styleExpression = 'color: red';
   color = 'blue';
 }

aio/content/examples/attribute-binding/src/app/comp-with-host-binding.component.ts

@@ -11,6 +11,9 @@ export class CompWithHostBindingComponent {
   @HostBinding('style.color')
   color = 'green';
 
+  // #docregion hostbinding
   @HostBinding('style.width')
   width = '200px';
+  // #enddocregion hostbinding
+
 }

aio/content/examples/component-overview/e2e/src/app.e2e-spec.ts

@@ -0,0 +1,13 @@
+import { browser, element, by } from 'protractor';
+
+describe('Component Overview', () => {
+
+  beforeAll(() => {
+    browser.get('');
+  });
+
+  it('should display component overview works ', () => {
+    expect(element(by.css('p')).getText()).toEqual('component-overview works!');
+  });
+
+});

aio/content/examples/component-overview/src/app/app.component.html

@@ -0,0 +1 @@
+<app-component-overview></app-component-overview>

aio/content/examples/component-overview/src/app/app.component.spec.ts

@@ -0,0 +1,31 @@
+import { TestBed, async } from '@angular/core/testing';
+import { AppComponent } from './app.component';
+
+describe('AppComponent', () => {
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [
+        AppComponent
+      ],
+    }).compileComponents();
+  }));
+
+  it('should create the app', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app).toBeTruthy();
+  });
+
+  it(`should have as title 'component-overview'`, () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app.title).toEqual('component-overview');
+  });
+
+  it('should render title', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    fixture.detectChanges();
+    const compiled = fixture.nativeElement;
+    expect(compiled.querySelector('.content span').textContent).toContain('component-overview app is running!');
+  });
+});

aio/content/examples/component-overview/src/app/app.component.ts

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

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

@@ -0,0 +1,18 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+import { AppComponent } from './app.component';
+import { ComponentOverviewComponent } from './component-overview/component-overview.component';
+
+@NgModule({
+  declarations: [
+    AppComponent,
+    ComponentOverviewComponent
+  ],
+  imports: [
+    BrowserModule
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }

aio/content/examples/component-overview/src/app/component-overview/component-overview.component.1.ts

@@ -0,0 +1,14 @@
+// #docplaster
+import { Component } from '@angular/core';
+
+// #docregion template
+@Component({
+  selector: 'app-component-overview',
+  template: '<h1>Hello World!</h1>',
+})
+// #enddocregion template
+
+export class ComponentOverviewComponent {
+
+}
+

aio/content/examples/component-overview/src/app/component-overview/component-overview.component.2.ts

@@ -0,0 +1,16 @@
+// #docplaster
+import { Component } from '@angular/core';
+
+// #docregion templatebacktick
+@Component({
+  selector: 'app-component-overview',
+  template: `<h1>Hello World!</h1>
+             <p>This template definition spans
+              multiple lines.</p>`
+})
+// #enddocregion templatebacktick
+
+export class ComponentOverviewComponent {
+
+}
+

aio/content/examples/component-overview/src/app/component-overview/component-overview.component.3.ts

@@ -0,0 +1,15 @@
+// #docplaster
+import { Component } from '@angular/core';
+
+// #docregion styles
+@Component({
+  selector: 'app-component-overview',
+  template: '<h1>Hello World!</h1>',
+  styles: ['h1 { font-weight: normal; }']
+})
+// #enddocregion styles
+
+export class ComponentOverviewComponent {
+
+}
+

aio/content/examples/component-overview/src/app/component-overview/component-overview.component.html

@@ -0,0 +1 @@
+<p>component-overview works!</p>

aio/content/examples/component-overview/src/app/component-overview/component-overview.component.spec.ts

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ComponentOverviewComponent } from './component-overview.component';
+
+describe('ComponentOverviewComponent', () => {
+  let component: ComponentOverviewComponent;
+  let fixture: ComponentFixture<ComponentOverviewComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ComponentOverviewComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ComponentOverviewComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

aio/content/examples/component-overview/src/app/component-overview/component-overview.component.ts

@@ -0,0 +1,22 @@
+// #docplaster
+// #docregion import
+import { Component } from '@angular/core';
+// #enddocregion import
+
+// #docregion decorator, decorator-skeleton, selector, templateUrl
+@Component({
+// #enddocregion decorator-skeleton
+  selector: 'app-component-overview',
+// #enddocregion selector
+  templateUrl: './component-overview.component.html',
+// #enddocregion templateUrl
+  styleUrls: ['./component-overview.component.css']
+// #docregion decorator-skeleton, selector, templateUrl
+})
+// #enddocregion decorator, decorator-skeleton, selector, templateUrl
+
+// #docregion class
+export class ComponentOverviewComponent {
+
+}
+// #enddocregion class

aio/content/examples/component-overview/src/index.html

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

aio/content/examples/component-overview/src/main.ts

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

aio/content/examples/component-overview/stackblitz.json

@@ -0,0 +1,8 @@
+{
+  "description": "Component Overview",
+  "files":[
+    "!**/*.d.ts",
+    "!**/*.js"
+  ],
+  "tags":["overview", "component"]
+}

aio/content/examples/property-binding/src/app/app.component.ts

@@ -7,9 +7,15 @@ import { Component } from '@angular/core';
   styleUrls: ['./app.component.css']
 })
 export class AppComponent {
+  // #docregion item-image
   itemImageUrl = '../assets/phone.png';
+  // #enddocregion item-image
+  // #docregion boolean
   isUnchanged = true;
+  // #enddocregion boolean
+  // #docregion directive-property
   classes = 'special';
+  // #enddocregion directive-property
   // #docregion parent-data-type
   parentItem = 'lamp';
   // #enddocregion parent-data-type

aio/content/examples/rx-library/src/retry-on-error.spec.ts

@@ -23,13 +23,13 @@ describe('retry-on-error', () => {
     docRegionDefault(mockConsole, ajax);
     expect(mockConsole.log.calls.allArgs()).toEqual([
       ['Subscribed to AJAX'],
-      ['Error occured.'],
+      ['Error occurred.'],
       ['Subscribed to AJAX'],
-      ['Error occured.'],
+      ['Error occurred.'],
       ['Subscribed to AJAX'],
-      ['Error occured.'],
+      ['Error occurred.'],
       ['Subscribed to AJAX'],
-      ['Error occured.'],
+      ['Error occurred.'],
       ['data: ', []],
     ]);
   });

aio/content/examples/rx-library/src/retry-on-error.ts

@@ -17,7 +17,7 @@ export function docRegionDefault(console, ajax) {
   const apiData = ajax('/api/data').pipe(
     map((res: any) => {
       if (!res.response) {
-        console.log('Error occured.');
+        console.log('Error occurred.');
         throw new Error('Value expected!');
       }
       return res.response;

aio/content/guide/architecture-components.md

@@ -89,7 +89,7 @@ This example from the `HeroListComponent` template uses three of these forms.
 
 <code-example path="architecture/src/app/hero-list.component.1.html" header="src/app/hero-list.component.html (binding)" region="binding"></code-example>
 
-* The `{{hero.name}}` [*interpolation*](guide/displaying-data#interpolation)
+* The `{{hero.name}}` [*interpolation*](guide/interpolation)
 displays the component's `hero.name` property value within the `<li>` element.
 
 * The `[hero]` [*property binding*](guide/property-binding) passes the value of
@@ -166,8 +166,8 @@ The example template uses two built-in structural directives to add application
 
 <code-example path="architecture/src/app/hero-list.component.1.html" header="src/app/hero-list.component.html (structural)" region="structural"></code-example>
 
-* [`*ngFor`](guide/displaying-data#ngFor) is an iterative; it tells Angular to stamp out one `<li>` per hero in the `heroes` list.
-* [`*ngIf`](guide/displaying-data#ngIf) is a conditional; it includes the `HeroDetail` component only if a selected hero exists.
+* [`*ngFor`](guide/structural-directives#inside-ngfor) is an iterative; it tells Angular to stamp out one `<li>` per hero in the `heroes` list.
+* [`*ngIf`](guide/structural-directives#ngif-case-study) is a conditional; it includes the `HeroDetail` component only if a selected hero exists.
 
 #### Attribute directives
 

aio/content/guide/architecture-next-steps.md

@@ -11,7 +11,7 @@ about the features and tools that can help you develop and deliver Angular appli
 
 ## Application architecture
 
-* The [Components and templates](guide/displaying-data) guide explains how to connect the application data in your [components](guide/glossary#component) to your page-display [templates](guide/glossary#template), to create a complete interactive application.
+* The **Main Concepts** section located in the table of contents contains several topics that explain how to connect the application data in your [components](guide/glossary#component) to your page-display [templates](guide/glossary#template), to create a complete interactive application.
 
 * The [NgModules](guide/ngmodules) guide provides in-depth information on the modular structure of an Angular application.
 
@@ -21,7 +21,7 @@ about the features and tools that can help you develop and deliver Angular appli
 
 ## Responsive programming
 
-The **Components and Templates** guide provides guidance and details of the [template syntax](guide/template-syntax) that you use to display your component data when and where you want it within a view, and to collect input from users that you can respond to.
+The [template syntax](guide/template-syntax) and related topics contain details about how to display your component data when and where you want it within a view, and how to collect input from users that you can respond to.
 
 Additional pages and sections describe some basic programming techniques for Angular apps.
 
@@ -52,8 +52,6 @@ For some platforms and applications, you might also want to use the PWA (Progres
 
 ## Support for the development cycle
 
-The **Development Workflow** section describes the tools and processes you use to compile, test, and deploy Angular applications.
-
 * [CLI Command Reference](cli): The Angular CLI is a command-line tool that you use to create projects, generate application and library code, and perform a variety of ongoing development tasks such as testing, bundling, and deployment.
 
 * [Compilation](guide/aot-compiler): Angular provides just-in-time (JIT) compilation for the development environment, and ahead-of-time (AOT) compilation for the production environment.
@@ -68,7 +66,6 @@ The **Development Workflow** section describes the tools and processes you use t
 
 * [Accessibility](guide/accessibility): Make your app accessible to all users.
 
-
 ## File structure, configuration, and dependencies
 
 * [Workspace and file structure](guide/file-structure): Understand the structure of Angular workspace and project folders.

aio/content/guide/architecture.md

@@ -5,7 +5,7 @@ Angular is written in TypeScript.
 It implements core and optional functionality as a set of TypeScript libraries that you import into your apps.
 
 The architecture of an Angular application relies on certain fundamental concepts.
-The basic building blocks are *NgModules*, which provide a compilation context for *components*. NgModules collect related code into functional sets; an Angular app is defined by a set of NgModules. An app always has at least a *root module* that enables bootstrapping, and typically has many more *feature modules*.
+The basic building blocks of the Angular framework are Angular components that are organized into *NgModules*. NgModules collect related code into functional sets; an Angular app is defined by a set of NgModules. An app always has at least a *root module* that enables bootstrapping, and typically has many more *feature modules*.
 
 * Components define *views*, which are sets of screen elements that Angular can choose among and modify according to your program logic and data.
 

aio/content/guide/attribute-binding.md

@@ -1,6 +1,7 @@
 # Attribute, class, and style bindings
 
-The template syntax provides specialized one-way bindings for scenarios less well-suited to property binding.
+Attribute binding in Angular helps you set values for attributes directly.
+With attribute binding, you can improve accessibility, style your application dynamically, and manage multiple CSS classes or styles simultaneously.
 
 <div class="alert is-helpful">
 
@@ -8,23 +9,36 @@ See the <live-example></live-example> for a working example containing the code
 
 </div>
 
+## Binding to an attribute
 
-## Attribute binding
+It is recommended that you set an element property with a [property binding](guide/property-binding) whenever possible.
+However, sometimes you don't have an element property to bind.
+In those situations, you can use attribute binding.
 
-Set the value of an attribute directly with an **attribute binding**. This is the only exception to the rule that a binding sets a target property and the only binding that creates and sets an attribute.
+For example, [ARIA](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA) and
+[SVG](https://developer.mozilla.org/en-US/docs/Web/SVG) are purely attributes.
+Neither ARIA nor SVG correspond to element properties and don't set element properties.
+In these cases, you must use attribute binding because there are no corresponding property targets.
 
-Usually, setting an element property with a [property binding](guide/property-binding)
-is preferable to setting the attribute with a string. However, sometimes
-there is no element property to bind, so attribute binding is the solution.
 
-Consider the [ARIA](https://developer.mozilla.org/en-US/docs/Web/Accessibility/ARIA) and
-[SVG](https://developer.mozilla.org/en-US/docs/Web/SVG). They are purely attributes, don't correspond to element properties, and don't set element properties. In these cases, there are no property targets to bind to.
+## Syntax
 
-Attribute binding syntax resembles property binding, but
-instead of an element property between brackets, start with the prefix `attr`,
-followed by a dot (`.`), and the name of the attribute.
-You then set the attribute value, using an expression that resolves to a string,
-or remove the attribute when the expression resolves to `null`.
+Attribute binding syntax resembles [property binding](guide/property-binding), but instead of an element property between brackets, you precede the name of the attribute with the prefix `attr`, followed by a dot.
+Then, you set the attribute value with an expression that resolves to a string.
+
+<code-example language="html">
+
+ &lt;p [attr.attribute-you-are-targeting]="expression"&gt;&lt;/p&gt;
+
+</code-example>
+
+<div class="alert is-helpful">
+
+When the expression resolves to `null`, Angular removes the attribute altogether.
+
+</div>
+
+## Binding ARIA attributes
 
 One of the primary use cases for attribute binding
 is to set ARIA attributes, as in this example:
@@ -33,32 +47,30 @@ is to set ARIA attributes, as in this example:
 
 {@a colspan}
 
+## Binding to `colspan`
+
+Another common use case for attribute binding is with the `colspan` attribute in tables.
+Binding to the `colspan` attribute helps you keep your tables programmatically dynamic.
+Depending on the amount of data that your application populates a table with, the number of columns that a row spans could change.
+
+To use attribute binding with the `<td>` attribute `colspan`:
+
+1. Specify the `colspan` attribute by using the following syntax: `[attr.colspan]`.
+1. Set `[attr.colspan]` equal to an expression.
+
+In the following example, binds the `colspan` attribute to the expression `1 + 1`.
+
+<code-example path="attribute-binding/src/app/app.component.html" region="colspan" header="src/app/app.component.html"></code-example>
+
+This binding causes the `<tr>` to span two columns.
+
 <div class="alert is-helpful">
 
-#### `colspan` and `colSpan`
+Sometimes there are differences between the name of property and an attribute.
 
-Notice the difference between the `colspan` attribute and the `colSpan` property.
-
-If you wrote something like this:
-
-<code-example language="html">
-  &lt;tr&gt;&lt;td colspan="{{1 + 1}}"&gt;Three-Four&lt;/td&gt;&lt;/tr&gt;
-</code-example>
-
-You'd get this error:
-
-<code-example language="bash">
-  Template parse errors:
-  Can't bind to 'colspan' since it isn't a known native property
-</code-example>
-
-As the message says, the `<td>` element does not have a `colspan` property. This is true
-because `colspan` is an attribute&mdash;`colSpan`, with a capital `S`, is the
-corresponding property. Interpolation and property binding can set only *properties*, not attributes.
-
-Instead, you'd use property binding and write it like this:
-
-<code-example path="attribute-binding/src/app/app.component.html" region="colSpan" header="src/app/app.component.html"></code-example>
+`colspan` is an attribute of `<tr>`, while `colSpan`  with a capital "S" is a property.
+When using attribute binding, use `colspan` with a lowercase "s".
+For more information on how to bind to the `colSpan` property, see the [`colspan` and `colSpan`](guide/property-binding#colspan) section of [Property Binding](guide/property-binding).
 
 </div>
 
@@ -66,28 +78,32 @@ Instead, you'd use property binding and write it like this:
 
 {@a class-binding}
 
-## Class binding
+## Binding to the `class` attribute
 
-Here's how to set the `class` attribute without a binding in plain HTML:
+You can use class binding to add and remove CSS class names from an element's `class` attribute.
 
-```html
-<!-- standard class attribute setting -->
-<div class="foo bar">Some text</div>
-```
+### Binding to a single CSS `class`
 
-You can also add and remove CSS class names from an element's `class` attribute with a **class binding**.
+To create a single class binding, use the prefix `class` followed by a dot and the name of the CSS class&mdash;for example, `[class.sale]="onSale"`.
+Angular adds the class when the bound expression, `onSale` is truthy, and it removes the class when the expression is falsy&mdash;with the exception of `undefined`.
+See [styling delegation](guide/style-precedence#styling-delegation) for more information.
 
-To create a single class binding, start with the prefix `class` followed by a dot (`.`) and the name of the CSS class (for example, `[class.foo]="hasFoo"`).
-Angular adds the class when the bound expression is truthy, and it removes the class when the expression is falsy (with the exception of `undefined`, see [styling delegation](#styling-delegation)).
+### Binding to multiple CSS classes
 
-To create a binding to multiple classes, use a generic `[class]` binding without the dot (for example, `[class]="classExpr"`).
-The expression can be a space-delimited string of class names, or you can format it as an object with class names as the keys and truthy/falsy expressions as the values.
-With object format, Angular will add a class only if its associated value is truthy.
+To bind to multiple classes, use `[class]` set to an expression&mdash;for example, `[class]="classExpression"`.
+The expression can be a space-delimited string of class names, or an object with class names as the keys and truthy or falsy expressions as the values.
+With an object format, Angular adds a class only if its associated value is truthy.
 
-It's important to note that with any object-like expression (`object`, `Array`, `Map`, `Set`, etc), the identity of the object must change for the class list to be updated.
-Updating the property without changing object identity will have no effect.
+<div class="alert is-important">
 
-If there are multiple bindings to the same class name, conflicts are resolved using [styling precedence](#styling-precedence).
+With any object-like expression&mdash;such as `object`, `Array`, `Map`, or `Set`&mdash;the identity of the object must change for Angular to update the class list.
+Updating the property without changing object identity has no effect.
+
+</div>
+
+If there are multiple bindings to the same class name, Angular uses [styling precedence](guide/style-precedence) to determine which binding to use.
+
+The following table summarizes class binding syntax.
 
 <style>
   td, th {vertical-align: top}
@@ -118,13 +134,13 @@ If there are multiple bindings to the same class name, conflicts are resolved us
   </tr>
   <tr>
     <td>Single class binding</td>
-    <td><code>[class.foo]="hasFoo"</code></td>
+    <td><code>[class.sale]="onSale"</code></td>
     <td><code>boolean | undefined | null</code></td>
     <td><code>true</code>, <code>false</code></td>
   </tr>
   <tr>
     <td rowspan=3>Multi-class binding</td>
-    <td rowspan=3><code>[class]="classExpr"</code></td>
+    <td rowspan=3><code>[class]="classExpression"</code></td>
     <td><code>string</code></td>
     <td><code>"my-class-1 my-class-2 my-class-3"</code></td>
   </tr>
@@ -138,44 +154,44 @@ If there are multiple bindings to the same class name, conflicts are resolved us
   </tr>
 </table>
 
-
-The [NgClass](guide/built-in-directives/#ngclass) directive can be used as an alternative to direct `[class]` bindings.
-However, using the above class binding syntax without `NgClass` is preferred because due to improvements in class binding in Angular, `NgClass` no longer provides significant value, and might eventually be removed in the future.
-
-
 <hr/>
 
-## Style binding
+{@a style-binding}
 
-Here's how to set the `style` attribute without a binding in plain HTML:
+## Binding to the style attribute
 
-```html
-<!-- standard style attribute setting -->
-<div style="color: blue">Some text</div>
-```
+You can use style binding to set styles dynamically.
 
-You can also set styles dynamically with a **style binding**.
+### Binding to a single style
 
-To create a single style binding, start with the prefix `style` followed by a dot (`.`) and the name of the CSS style property (for example, `[style.width]="width"`).
-The property will be set to the value of the bound expression, which is normally a string.
+To create a single style binding, use the prefix `style` followed by a dot and the name of the CSS style property&mdash;for example, `[style.width]="width"`.
+Angular sets the property to the value of the bound expression, which is usually a string.
 Optionally, you can add a unit extension like `em` or `%`, which requires a number type.
 
 <div class="alert is-helpful">
 
-Note that a _style property_ name can be written in either
-[dash-case](guide/glossary#dash-case), as shown above, or
-[camelCase](guide/glossary#camelcase), such as `fontSize`.
+You can write a style property name in either [dash-case](guide/glossary#dash-case), or
+[camelCase](guide/glossary#camelcase).
 
 </div>
 
-If there are multiple styles you'd like to toggle, you can bind to the `[style]` property directly without the dot (for example, `[style]="styleExpr"`).
-The expression attached to the `[style]` binding is most often a string list of styles like `"width: 100px; height: 100px;"`.
+### Binding to multiple styles
 
-You can also format the expression as an object with style names as the keys and style values as the values, like `{width: '100px', height: '100px'}`.
-It's important to note that with any object-like expression (`object`, `Array`, `Map`, `Set`, etc), the identity of the object must change for the class list to be updated.
-Updating the property without changing object identity will have no effect.
+To toggle multiple styles, bind to the `[style]` attribute&mdash;for example, `[style]="styleExpression"`).
+The expression is often a string list of styles such as `"width: 100px; height: 100px;"`.
 
-If there are multiple bindings to the same style property, conflicts are resolved using [styling precedence rules](#styling-precedence).
+You can also format the expression as an object with style names as the keys and style values as the values, such as `{width: '100px', height: '100px'}`.
+
+<div class="alert is-important">
+
+With any object-like expression&mdash;such as `object`, `Array`, `Map`, or `Set`&mdash;the identity of the object must change for Angular to update the class list.
+Updating the property without changing object identity has no effect.
+
+</div>
+
+If there are multiple bindings to the same style attribute, Angular uses [styling precedence](guide/style-precedence) to determine which binding to use.
+
+The following table summarizes style binding syntax.
 
 <style>
   td, th {vertical-align: top}
@@ -219,7 +235,7 @@ If there are multiple bindings to the same style property, conflicts are resolve
   </tr>
     <tr>
     <td rowspan=3>Multi-style binding</td>
-    <td rowspan=3><code>[style]="styleExpr"</code></td>
+    <td rowspan=3><code>[style]="styleExpression"</code></td>
     <td><code>string</code></td>
     <td><code>"width: 100px; height: 100px"</code></td>
   </tr>
@@ -232,72 +248,3 @@ If there are multiple bindings to the same style property, conflicts are resolve
     <td><code>['width', '100px']</code></td>
   </tr>
 </table>
-
-The [NgStyle](guide/built-in-directives/#ngstyle) directive can be used as an alternative to direct `[style]` bindings.
-However, using the above style binding syntax without `NgStyle` is preferred because due to improvements in style binding in Angular, `NgStyle` no longer provides significant value, and might eventually be removed in the future.
-
-
-<hr/>
-
-{@a styling-precedence}
-
-## Styling Precedence
-
-A single HTML element can have its CSS class list and style values bound to multiple sources (for example, host bindings from multiple directives).
-
-When there are multiple bindings to the same class name or style property, Angular uses a set of precedence rules to resolve conflicts and determine which classes or styles are ultimately applied to the element.
-
-<div class="alert is-helpful">
-<h4>Styling precedence (highest to lowest)</h4>
-
-1. Template bindings
-    1. Property binding (for example, `<div [class.foo]="hasFoo">` or `<div [style.color]="color">`)
-    1. Map binding (for example, `<div [class]="classExpr">` or `<div [style]="styleExpr">`)
-    1. Static value (for example, `<div class="foo">` or `<div style="color: blue">`)
-1. Directive host bindings
-    1. Property binding (for example, `host: {'[class.foo]': 'hasFoo'}` or `host: {'[style.color]': 'color'}`)
-    1. Map binding (for example, `host: {'[class]': 'classExpr'}` or `host: {'[style]': 'styleExpr'}`)
-    1. Static value (for example, `host: {'class': 'foo'}` or `host: {'style': 'color: blue'}`)
-1. Component host bindings
-    1. Property binding (for example, `host: {'[class.foo]': 'hasFoo'}` or `host: {'[style.color]': 'color'}`)
-    1. Map binding (for example, `host: {'[class]': 'classExpr'}` or `host: {'[style]': 'styleExpr'}`)
-    1. Static value (for example, `host: {'class': 'foo'}` or `host: {'style': 'color: blue'}`)
-
-</div>
-
-The more specific a class or style binding is, the higher its precedence.
-
-A binding to a specific class (for example, `[class.foo]`) will take precedence over a generic `[class]` binding, and a binding to a specific style (for example, `[style.bar]`) will take precedence over a generic `[style]` binding.
-
-<code-example path="attribute-binding/src/app/app.component.html" region="basic-specificity" header="src/app/app.component.html"></code-example>
-
-Specificity rules also apply when it comes to bindings that originate from different sources.
-It's possible for an element to have bindings in the template where it's declared, from host bindings on matched directives, and from host bindings on matched components.
-
-Template bindings are the most specific because they apply to the element directly and exclusively, so they have the highest precedence.
-
-Directive host bindings are considered less specific because directives can be used in multiple locations, so they have a lower precedence than template bindings.
-
-Directives often augment component behavior, so host bindings from components have the lowest precedence.
-
-<code-example path="attribute-binding/src/app/app.component.html" region="source-specificity" header="src/app/app.component.html"></code-example>
-
-In addition, bindings take precedence over static attributes.
-
-In the following case, `class` and `[class]` have similar specificity, but the `[class]` binding will take precedence because it is dynamic.
-
-<code-example path="attribute-binding/src/app/app.component.html" region="dynamic-priority" header="src/app/app.component.html"></code-example>
-
-{@a styling-delegation}
-### Delegating to styles with lower precedence
-
-It is possible for higher precedence styles to "delegate" to lower precedence styles using `undefined` values.
-Whereas setting a style property to `null` ensures the style is removed, setting it to `undefined` will cause Angular to fall back to the next-highest precedence binding to that style.
-
-For example, consider the following template:
-
-<code-example path="attribute-binding/src/app/app.component.html" region="style-delegation" header="src/app/app.component.html"></code-example>
-
-Imagine that the `dirWithHostBinding` directive and the `comp-with-host-binding` component both have a `[style.width]` host binding.
-In that case, if `dirWithHostBinding` sets its binding to `undefined`, the `width` property will fall back to the value of the `comp-with-host-binding` host binding.
-However, if `dirWithHostBinding` sets its binding to `null`, the `width` property will be removed entirely.

aio/content/guide/built-in-directives.md

@@ -194,7 +194,7 @@ which explains the following:
 * Using [`<ng-container>`](guide/structural-directives#ngcontainer "<ng-container>")
 to group elements when there is no suitable host element for the directive.
 * How to write your own structural directive.
-* That you can only apply [one structural directive](guide/structural-directives#one-per-element "one per host element") to an element.
+* Why you [can only apply one structural directive](guide/structural-directives#one-per-element "one per host element") to an element.
 
 </div>
 
@@ -281,7 +281,7 @@ You define a block of HTML that defines how a single item should be displayed
 and then you tell Angular to use that block as a template for rendering each item in the list.
 The text assigned to `*ngFor` is the instruction that guides the repeater process.
 
-The following example shows `NgFor` applied to a simple `<div>`. (Don't forget the asterisk (`*`) in front of `ngFor`.)
+The following example shows `NgFor` applied to a simple `<div>`.
 
 <code-example path="built-in-directives/src/app/app.component.html" region="NgFor-1" header="src/app/app.component.html"></code-example>
 

aio/content/guide/component-overview.md

@@ -0,0 +1,182 @@
+# Angular Components Overview
+
+Components are the main building block for Angular applications. Each component consists of:
+
+* An HTML template that declares what renders on the page
+* A Typescript class that defines behavior
+* A CSS selector that defines how the component is used in a template
+* Optionally, CSS styles applied to the template
+
+This topic describes how to create and configure an Angular component.
+
+<div class="alert is-helpful">
+
+To view or download the example code used in this topic, see the <live-example></live-example>.
+
+</div>
+
+## Prerequisites
+
+To create a component, verify that you have met the following prerequisites:
+
+1. Install the Angular CLI.
+1. Create an Angular project.
+   If you don't have a project, you can create one using `ng new <project-name>`, where `<project-name>` is the name of your Angular application.
+
+## Creating a component
+
+The easiest way to create a component is with the Angular CLI. You can also create a component manually.
+
+### Creating a component using the Angular CLI
+
+To create a component using the Angular CLI:
+
+1. From a terminal window, navigate to the directory containing your application.
+1. Run the `ng generate component <component-name>` command, where `<component-name>` is the name of your new component.
+
+By default, this command creates the following:
+
+* A folder named after the component
+* A component file, `<component-name>.component.ts`
+* A template file, `<component-name>.component.ts`
+* A CSS file, `<component-name>.component.css`
+* A testing specification file, `<component-name>.component.spec.ts`
+
+Where `<component-name>` is the name of your component.
+
+<div class="alert is-helpful">
+
+You can change how `ng generate component` creates new components.
+For more information, see [ng generate component](cli/generate#component-command) in the Angular CLI documentation.
+
+</div>
+
+### Creating a component manually
+
+Although the Angular CLI is the easiest way to create an Angular component, you can also create a component manually.
+This section describes how to create the core component file within an existing Angular project.
+
+To create a new component manually:
+
+1. Navigate to your Angular project directory.
+1. Create a new file, `<component-name>.component.ts`.
+1. At the top of the file, add the following import statement.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="import">
+   </code-example>
+
+1. After the `import` statement, add a `@Component` decorator.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="decorator-skeleton">
+   </code-example>
+
+1. Choose a CSS selector for the component.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="selector">
+   </code-example>
+
+   For more information on choosing a selector, see [Specifying a component's selector](#specifying-a-components-css-selector).
+
+1. Define the HTML template that the component uses to display information.
+   In most cases, this template is a separate HTML file.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="templateUrl">
+   </code-example>
+
+   For more information on defining a component's template, see [Defining a component's template](#defining-a-components-template).
+
+1. Select the styles for the component's template.
+   In most cases, you define the styles for you component's template in a separate file.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="decorator">
+   </code-example>
+
+1. Add a `class` statement that includes the code for the component.
+
+   <code-example
+        path="component-overview/src/app/component-overview/component-overview.component.ts"
+        region="class">
+   </code-example>
+
+## Specifying a component's CSS selector
+
+Every component requires a CSS _selector_. A selector instructs Angular to instantiate this component wherever it finds the corresponding tag in template HTML. For example, consider a component, `hello-world.component.ts` that defines its selector as `app-hello-world`. This selector instructs angular to instantiate this component any time the tag, `<app-hellow-world>` in a template.
+
+To specify a component's selector, add a `selector` statement to the `@Component` decorator.
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.ts"
+    region="selector">
+</code-example>
+
+## Defining a component's template
+
+A template is a block of HTML that tells Angular how to render the component in your application.
+You can define a template for your component in one of two ways: by referencing an external file, or directly within the component.
+
+To define a template as an external file, add a `templateUrl` property to the `@Component` decorator.
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.ts"
+    region="templateUrl">
+</code-example>
+
+To define a template within the component, add a `template` property to the `@Component` decorator that contains the HTML you want to use.
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.1.ts"
+    region="template">
+</code-example>
+
+If your want your template to span multiple lines, you can use backticks (<code> ` </code>).
+For example:
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.2.ts"
+    region="templatebacktick">
+</code-example>
+
+<div class="alert is-helpful">
+
+An Angular component requires a template defined using `template` or `templateUrl`. You cannot have both statements in a component.
+
+</div>
+
+## Declaring a component's styles
+
+You can declare component styles uses for its template in one of two ways: by referencing an external file, or directly within the component.
+
+To declare the styles for a component in a separate file, add a `stylesUrls` property to the `@Component` decorator.
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.ts"
+    region="decorator">
+</code-example>
+
+To select the styles within the component, add a `styles` property to the `@Component` decorator that contains the styles you want to use.
+
+<code-example
+    path="component-overview/src/app/component-overview/component-overview.component.3.ts"
+    region="styles">
+</code-example>
+
+The `styles` property takes an array of strings that contain the CSS rule declarations.
+
+
+## Next steps
+
+* For an archictural overview of components, see [Introduction to components and templates](guide/architecture-components).
+* For additional options you can use when creating a component, see [Component](api/core/Component) in the API Reference.
+* For more information on styling components, see [Component styles](guide/component-styles).
+* For more information on templates, see [Template syntax](guide/template-syntax).
+

aio/content/guide/deployment.md

@@ -97,7 +97,7 @@ For the simplest deployment, create a production build and copy the output direc
   </code-example>
 
 
-2. Copy _everything_ within the output folder (`dist/` by default) to a folder on the server.
+2. Copy _everything_ within the output folder (`dist/project-name/` by default) to a folder on the server.
 
 3. Configure the server to redirect requests for missing files to `index.html`.
 Learn more about server-side redirects [below](#fallback).
@@ -211,11 +211,11 @@ modified to serve `index.html`:
   # .
   # -- server.rb
   # -- public
-  #    |-- dist
+  #    |-- project-name
   #        |-- index.html
 
   get '/' do
-      folderDir = settings.public_folder + '/dist'  # ng build output folder
+      folderDir = settings.public_folder + '/project-name'  # ng build output folder
       send_file File.join(folderDir, 'index.html')
   end
   ```
@@ -383,11 +383,11 @@ Build your app for production _including the source maps_
 
 </code-example>
 
-List the generated bundles in the `dist/` folder.
+List the generated bundles in the `dist/project-name/` folder.
 
 <code-example language="none" class="code-shell">
 
-  ls dist/*.js
+  ls dist/project-name/*.js
 
 </code-example>
 
@@ -396,7 +396,7 @@ The following example displays the graph for the _main_ bundle.
 
 <code-example language="none" class="code-shell">
 
-  node_modules/.bin/source-map-explorer dist/main*
+  node_modules/.bin/source-map-explorer dist/project-name/main*
 
 </code-example>
 

aio/content/guide/displaying-data.md

@@ -1,312 +0,0 @@
-# Displaying data in views
-
-Angular [components](guide/glossary#component) form the data structure of your application.
-The HTML [template](guide/glossary#template) associated with a component provides the means to display that data in the context of a web page.
-Together, a component's class and template form a [view](guide/glossary#view) of your application data.
-
-The process of combining data values with their representation on the page is called [data binding](guide/glossary#data-binding).
-You display your data to a user (and collect data from the user) by *binding* controls in the HTML template to the data properties of the component class.
-
-In addition, you can add logic to the template by including [directives](guide/glossary#directive), which tell Angular how to modify the page as it is rendered.
-
-Angular defines a *template language* that expands HTML notation with syntax that allows you to define various kinds of data binding and logical directives.
-When the page is rendered, Angular interprets the template syntax to update the HTML according to your logic and current data state.
-Before you read the complete [template syntax guide](guide/template-syntax), the exercises on this page give you a quick demonstration of how template syntax works.
-
-In this demo, you'll create a component with a list of heroes.
-You'll display the list of hero names and conditionally show a message below the list.
-The final UI looks like this:
-
-<div class="lightbox">
-  <img src="generated/images/guide/displaying-data/final.png" alt="Final UI">
-</div>
-
-<div class="alert is-helpful">
-
-The <live-example></live-example> demonstrates all of the syntax and code snippets described in this page.
-
-</div>
-
-{@a interpolation}
-
-## Showing component properties with interpolation
-The easiest way to display a component property is to bind the property name through interpolation.
-With interpolation, you put the property name in the view template, enclosed in double curly braces: `{{myHero}}`.
-
-Use the CLI command [`ng new displaying-data`](cli/new) to create a workspace and app named `displaying-data`.
-
-Delete the <code>app.component.html</code> file. It is not needed for this example.
-
-Then modify the <code>app.component.ts</code> file by
-changing the template and the body of the component.
-
-When you're done, it should look like this:
-
-<code-example path="displaying-data/src/app/app.component.1.ts" header="src/app/app.component.ts"></code-example>
-
-You added two properties to the formerly empty component: `title` and `myHero`.
-
-The template displays the two component properties using double curly brace
-interpolation:
-
-<code-example path="displaying-data/src/app/app.component.1.ts" header="src/app/app.component.ts (template)" region="template"></code-example>
-
-<div class="alert is-helpful">
-
-The template is a multi-line string within ECMAScript 2015 backticks (<code>\`</code>).
-The backtick (<code>\`</code>)&mdash;which is *not* the same character as a single
-quote (`'`)&mdash;allows you to compose a string over several lines, which makes the
-HTML more readable.
-
-</div>
-
-Angular automatically pulls the value of the `title` and `myHero` properties from the component and
-inserts those values into the browser. Angular updates the display
-when these properties change.
-
-<div class="alert is-helpful">
-
-More precisely, the redisplay occurs after some kind of asynchronous event related to
-the view, such as a keystroke, a timer completion, or a response to an HTTP request.
-
-</div>
-
-Notice that you don't call **new** to create an instance of the `AppComponent` class.
-Angular is creating an instance for you. How?
-
-The CSS `selector` in the `@Component` decorator specifies an element named `<app-root>`.
-That element is a placeholder in the body of your `index.html` file:
-
-<code-example path="displaying-data/src/index.html" header="src/index.html (body)" region="body"></code-example>
-
-When you bootstrap with the `AppComponent` class (in <code>main.ts</code>), Angular looks for a `<app-root>`
-in the `index.html`, finds it, instantiates an instance of `AppComponent`, and renders it
-inside the `<app-root>` tag.
-
-Now run the app. It should display the title and hero name:
-
-<div class="lightbox">
-  <img src="generated/images/guide/displaying-data/title-and-hero.png" alt="Title and Hero">
-</div>
-
-The next few sections review some of the coding choices in the app.
-
-
-## Choosing the template source
-
-The `@Component` metadata tells Angular where to find the component's template.
-You can store your component's template in one of two places.
-
-* You can define the template *inline* using the `template` property of the `@Component` decorator. An inline template is useful for a small demo or test.
-* Alternatively, you can define the template in a separate HTML file and link to that file in the `templateUrl` property of the `@Component` decorator. This configuration is typical for anything more complex than a small test or demo, and is the default when you generate a new component.
-
-In either style, the template data bindings have the same access to the component's properties.
-Here the app uses inline HTML because the template is small and the demo is simpler without the additional HTML file.
-
-<div class="alert is-helpful">
-
-  By default, the Angular CLI command [`ng generate component`](cli/generate) generates components with a template file.
-  You can override that by adding the "-t" (short for `inlineTemplate=true`) option:
-
-  <code-example hideCopy language="sh" class="code-shell">
-    ng generate component hero -t
-  </code-example>
-
-</div>
-
-
-## Initialization
-
-The following example uses variable assignment to initialize the components.
-
-<code-example path="displaying-data/src/app/app-ctor.component.1.ts" region="class"></code-example>
-
- You could instead declare and initialize the properties using a constructor.
- This app uses more terse "variable assignment" style simply for brevity.
-
-
-{@a ngFor}
-
-## Add logic to loop through data
-
-The `*ngFor` directive (predefined by Angular) lets you loop through data. The following example uses the directive to show all of the values in an array property.
-
-To display a list of heroes, begin by adding an array of hero names to the component and redefine `myHero` to be the first name in the array.
-
-
-<code-example path="displaying-data/src/app/app.component.2.ts" header="src/app/app.component.ts (class)" region="class"></code-example>
-
-
-Now use the Angular `ngFor` directive in the template to display each item in the `heroes` list.
-
-
-<code-example path="displaying-data/src/app/app.component.2.ts" header="src/app/app.component.ts (template)" region="template"></code-example>
-
-
-This UI uses the HTML unordered list with `<ul>` and `<li>` tags. The `*ngFor`
-in the `<li>` element is the Angular "repeater" directive.
-It marks that `<li>` element (and its children) as the "repeater template":
-
-
-<code-example path="displaying-data/src/app/app.component.2.ts" header="src/app/app.component.ts (li)" region="li"></code-example>
-
-<div class="alert is-important">
-
-Don't forget the leading asterisk (\*) in `*ngFor`. It is an essential part of the syntax.
-Read more about `ngFor` and `*` in the [ngFor section](guide/built-in-directives#ngfor) of the [Built-in directives](guide/built-in-directives) page.
-
-</div>
-
-Notice the `hero` in the `ngFor` double-quoted instruction;
-it is an example of a template input variable. Read
-more about template input variables in the [microsyntax](guide/built-in-directives#microsyntax) section of
-the [Built-in directives](guide/built-in-directives) page.
-
-Angular duplicates the `<li>` for each item in the list, setting the `hero` variable
-to the item (the hero) in the current iteration. Angular uses that variable as the
-context for the interpolation in the double curly braces.
-
-<div class="alert is-helpful">
-
-In this case, `ngFor` is displaying an array, but `ngFor` can
-repeat items for any [iterable](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Iteration_protocols) object.
-
-</div>
-
-Now the heroes appear in an unordered list.
-
-<div class="lightbox">
-  <img src="generated/images/guide/displaying-data/hero-names-list.png" alt="After ngfor">
-</div>
-
-
-## Creating a class for the data
-
-The app's code defines the data directly inside the component, which isn't best practice.
-In a simple demo, however, it's fine.
-
-At the moment, the binding is to an array of strings.
-In real applications, most bindings are to more specialized objects.
-
-To convert this binding to use specialized objects, turn the array
-of hero names into an array of `Hero` objects. For that you'll need a `Hero` class:
-
-<code-example language="sh" class="code-shell">
-  ng generate class hero
-</code-example>
-
-This command creates the following code.
-
-
-<code-example path="displaying-data/src/app/hero.ts" header="src/app/hero.ts"></code-example>
-
-You've defined a class with a constructor and two properties: `id` and `name`.
-
-It might not look like the class has properties, but it does.
-The declaration of the constructor parameters takes advantage of a TypeScript shortcut.
-
-Consider the first parameter:
-
-
-<code-example path="displaying-data/src/app/hero.ts" header="src/app/hero.ts (id)" region="id"></code-example>
-
-That brief syntax does a lot:
-
-* Declares a constructor parameter and its type.
-* Declares a public property of the same name.
-* Initializes that property with the corresponding argument when creating an instance of the class.
-
-
-### Using the Hero class
-
-After importing the `Hero` class, the `AppComponent.heroes` property can return a _typed_ array
-of `Hero` objects:
-
-
-<code-example path="displaying-data/src/app/app.component.3.ts" header="src/app/app.component.ts (heroes)" region="heroes"></code-example>
-
-
-
-Next, update the template.
-At the moment it displays the hero's `id` and `name`.
-Fix that to display only the hero's `name` property.
-
-
-<code-example path="displaying-data/src/app/app.component.3.ts" header="src/app/app.component.ts (template)" region="template"></code-example>
-
-
-The display looks the same, but the code is clearer.
-
-{@a ngIf}
-
-## Conditional display with NgIf
-
-Sometimes an app needs to display a view or a portion of a view only under specific circumstances.
-
-Let's change the example to display a message if there are more than three heroes.
-
-The Angular `ngIf` directive inserts or removes an element based on a _truthy/falsy_ condition.
-To see it in action, add the following paragraph at the bottom of the template:
-
-
-<code-example path="displaying-data/src/app/app.component.ts" header="src/app/app.component.ts (message)" region="message"></code-example>
-
-
-<div class="alert is-important">
-
-Don't forget the leading asterisk (\*) in `*ngIf`. It is an essential part of the syntax.
-Read more about `ngIf` and `*` in the [ngIf section](guide/built-in-directives#ngIf) of the [Built-in directives](guide/built-in-directives) page.
-
-</div>
-
-
-The template expression inside the double quotes,
-`*ngIf="heroes.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, see [template expression operators](guide/interpolation#template-expressions).
-
-
-<div class="alert is-helpful">
-
-Angular isn't showing and hiding the message. It is adding and removing the paragraph element from the DOM. That improves performance, especially in larger projects when conditionally including or excluding
-big chunks of HTML with many data bindings.
-
-</div>
-
-Try it out. Because the array has four items, the message should appear.
-Go back into <code>app.component.ts</code> and delete or comment out one of the elements from the heroes array.
-The browser should refresh automatically and the message should disappear.
-
-
-## Summary
-Now you know how to use:
-
-* **Interpolation** with double curly braces to display a component property.
-* **ngFor** to display an array of items.
-* A TypeScript class to shape the **model data** for your component and display properties of that model.
-* **ngIf** to conditionally display a chunk of HTML based on a boolean expression.
-
-Here's the final code:
-
-<code-tabs>
-
-  <code-pane header="src/app/app.component.ts" path="displaying-data/src/app/app.component.ts" region="final">
-
-  </code-pane>
-
-  <code-pane header="src/app/hero.ts" path="displaying-data/src/app/hero.ts">
-
-  </code-pane>
-
-  <code-pane header="src/app/app.module.ts" path="displaying-data/src/app/app.module.ts">
-
-  </code-pane>
-
-  <code-pane header="main.ts" path="displaying-data/src/main.ts">
-
-  </code-pane>
-
-</code-tabs>

aio/content/guide/entry-components.md

@@ -4,7 +4,7 @@ An entry component is any component that Angular loads imperatively, (which mean
 
 <div class="alert is-helpful">
 
-To contrast the two types of components, there are components which are included in the template, which are declarative. Additionally, there are components which you load imperatively; that is, entry components.
+    To contrast the two types of components, there are components which are included in the template, which are declarative. Additionally, there are components which you load imperatively; that is, entry components.
 
 </div>
 
@@ -75,10 +75,9 @@ All router components must be entry components. Because this would require you t
 
 
 ## The `entryComponents` array
-
 <div class="alert is-helpful">
 
-Since 9.0.0 with Ivy, the `entryComponents` property is no longer necessary. See [deprecations guide](guide/deprecations#entryComponents).
+   Since 9.0.0 with Ivy, the `entryComponents` property is no longer necessary. See [deprecations guide](guide/deprecations#entryComponents).
 
 </div>
 

aio/content/guide/event-binding.md

@@ -99,7 +99,7 @@ in the `$event` variable.
 
 ## Template statements have side effects
 
-Though [template expressions](guide/interpolation#template-expressions) shouldn't have [side effects](guide/property-binding#avoid-side-effects), template
+Though [template expressions](guide/interpolation#template-expressions) shouldn't have [side effects](guide/property-binding-best-practices#avoid-side-effects), template
 statements usually do. The `deleteItem()` method does have
 a side effect: it deletes an item.
 

aio/content/guide/glossary.md

@@ -627,10 +627,11 @@ The [npm package manager](https://docs.npmjs.com/getting-started/what-is-npm) is
 
 Learn more about how Angular uses [Npm Packages](guide/npm-packages).
 
-{@ ngc}
+{@a ngc}
+
 ## ngc
 `ngc` is a Typescript-to-Javascript transpiler that processes Angular decorators, metadata, and templates, and emits JavaScript code.
-The most recent implementation is internally refered to as `ngtsc` because it's a minimalistic wrapper around the TypeScript compiler `tsc` that adds a transform for processing Angular code.
+The most recent implementation is internally referred to as `ngtsc` because it's a minimalistic wrapper around the TypeScript compiler `tsc` that adds a transform for processing Angular code.
 
 {@a O}
 

aio/content/guide/property-binding-best-practices.md

@@ -0,0 +1,65 @@
+# Property binding best practices
+
+By following a few guidelines, you can use property binding in a way that helps you minimize bugs and keep your code readable.
+
+<div class="alert is-helpful">
+
+See the <live-example name="property-binding"></live-example> for a working example containing the code snippets in this guide.
+
+</div>
+
+## Avoid side effects
+
+Evaluation of a template expression should have no visible side effects.
+Use the syntax for template expressions to help avoid side effects.
+In general, the correct syntax prevents you from assigning a value to anything in a property binding expression.
+The syntax also prevents you from using increment and decrement operators.
+
+### An example of producing side effects
+
+If you had an expression that changed the value of something else that you were binding to, that change of value would be a side effect.
+Angular might or might not display the changed value.
+If Angular does detect the change, it throws an error.
+
+As a best practice, use only properties and methods that return values.
+
+## Return the proper type
+
+A template expression should evaluate to the type of value that the target property expects.
+For example, return a string if the target property expects a string, a number if it expects a number, or an object if it expects an object.
+
+### Passing in a string
+
+In the following example, the `childItem` property of the `ItemDetailComponent` expects a string.
+
+<code-example path="property-binding/src/app/app.component.html" region="model-property-binding" header="src/app/app.component.html"></code-example>
+
+You can confirm this expectation by looking in the `ItemDetailComponent` where the `@Input()` type is `string`:
+
+<code-example path="property-binding/src/app/item-detail/item-detail.component.ts" region="input-type" header="src/app/item-detail/item-detail.component.ts (setting the @Input() type)"></code-example>
+
+The `parentItem` in `AppComponent` is a string, which means that the expression, `parentItem` within `[childItem]="parentItem"`, evaluates to a string.
+
+<code-example path="property-binding/src/app/app.component.ts" region="parent-data-type" header="src/app/app.component.ts"></code-example>
+
+If `parentItem` were some other type, you would need to specify `childItem`  `@Input()` as that type as well.
+
+### Passing in an object
+
+In this example, `ItemListComponent` is a child component of `AppComponent` and the `items` property expects an array of objects.
+
+<code-example path="property-binding/src/app/app.component.html" region="pass-object" header="src/app/app.component.html"></code-example>
+
+In the `ItemListComponent` the `@Input()`, `items`, has a type of `Item[]`.
+
+<code-example path="property-binding/src/app/item-list/item-list.component.ts" region="item-input" header="src/app/item-list.component.ts"></code-example>
+
+Notice that `Item` is an object that it has two properties; an `id` and a `name`.
+
+<code-example path="property-binding/src/app/item.ts" region="item-class" header="src/app/item.ts"></code-example>
+
+In `app.component.ts`, `currentItems` is an array of objects in the same shape as the `Item` object in `items.ts`, with an `id` and a `name`.
+
+<code-example path="property-binding/src/app/app.component.ts" region="pass-object" header="src/app.component.ts"></code-example>
+
+By supplying an object in the same shape, you satisfy the expectations of `items` when Angular evaluates the expression `currentItems`.

aio/content/guide/property-binding.md

@@ -1,8 +1,8 @@
 
-# Property binding `[property]`
+# Property binding
 
-Use property binding to _set_ properties of target elements or
-directive `@Input()` decorators.
+Property binding in Angular helps you set values for properties of HTML elements or directives.
+With property binding, you can do things such as toggle button functionality, set paths programatically, and share values between components.
 
 <div class="alert is-helpful">
 
@@ -10,36 +10,86 @@ See the <live-example></live-example> for a working example containing the code
 
 </div>
 
-## One-way in
+## Prerequisites
 
-Property binding flows a value in one direction,
-from a component's property into a target element property.
+To get the most out of property binding, you should be familiar with the following:
 
-You can't use property
-binding to read or pull values out of target elements. Similarly, you cannot use
-property binding to call a method on the target element.
-If the element raises events, you can listen to them with an [event binding](guide/event-binding).
+* [Basics of components](guide/architecture-components)
+* [Basics of templates](guide/glossary#template)
+* [Binding syntax](guide/binding-syntax)
 
-If you must read a target element property or call one of its methods,
-see the API reference for [ViewChild](api/core/ViewChild) and
-[ContentChild](api/core/ContentChild).
+<hr />
 
-## Examples
+## Understanding the flow of data
 
-The most common property binding sets an element property to a component
-property value. An example is
-binding the `src` property of an image element to a component's `itemImageUrl` property:
+Property binding moves a value in one direction, from a component's property into a target element property.
+
+<div class="alert is-helpful">
+
+For more information on listening for events, see [Event binding](guide/event-binding).
+
+</div>
+
+To read a target element property or call one of its methods, see the API reference for [ViewChild](api/core/ViewChild) and [ContentChild](api/core/ContentChild).
+
+## Binding to a property
+
+To bind to an element's property, enclose it in square brackets, `[]`, which identifies the property as a target property.
+A target property is the DOM property to which you want to assign a value.
+For example, the target property in the following code is the image element's `src` property.
 
 <code-example path="property-binding/src/app/app.component.html" region="property-binding" header="src/app/app.component.html"></code-example>
 
-Here's an example of binding to the `colSpan` property. Notice that it's not `colspan`,
-which is the attribute, spelled with a lowercase `s`.
 
-<code-example path="property-binding/src/app/app.component.html" region="colSpan" header="src/app/app.component.html"></code-example>
+In most cases, the target name is the name of a property, even when it appears to be the name of an attribute.
+In this example, `src` is the name of the `<img>` element property.
 
-For more details, see the [MDN HTMLTableCellElement](https://developer.mozilla.org/en-US/docs/Web/API/HTMLTableCellElement) documentation.
+The brackets, `[]`, cause Angular to evaluate the right-hand side of the assignment as a dynamic expression.
+Without the brackets, Angular treats the the right-hand side as a string literal and sets the property to that static value.
+
+<code-example path="property-binding/src/app/app.component.html" region="no-evaluation" header="src/app.component.html"></code-example>
+
+Omitting the brackets renders the string `parentItem`, not the value of `parentItem`.
+
+## Setting an element property to a component property value
+
+To bind the `src` property of an `<img>` element to a component's property, place the target, `src`, in square brackets followed by an equal sign and then the property.
+The property here is `itemImageUrl`.
+
+<code-example path="property-binding/src/app/app.component.html" region="property-binding" header="src/app/app.component.html"></code-example>
+
+Declare the `itemImageUrl` property in the class, in this case `AppComponent`.
+
+<code-example path="property-binding/src/app/app.component.ts" region="item-image" header="src/app/app.component.ts"></code-example>
+
+{@a colspan}
+
+#### `colspan` and `colSpan`
+
+A common point of confusion is between the attribute, `colspan`, and the property, `colSpan`.
+Notice that these two names differ by only a single letter.
+
+If you wrote something like this:
+
+<code-example language="html">
+  &lt;tr&gt;&lt;td colspan="{{1 + 1}}"&gt;Three-Four&lt;/td&gt;&lt;/tr&gt;
+</code-example>
+
+You'd get this error:
+
+<code-example language="bash">
+  Template parse errors:
+  Can't bind to 'colspan' since it isn't a known native property
+</code-example>
+
+As the message says, the `<td>` element does not have a `colspan` property. This is true
+because `colspan` is an attribute&mdash;`colSpan`, with a capital `S`, is the
+corresponding property. Interpolation and property binding can set only *properties*, not attributes.
+
+Instead, you'd use property binding and write it like this:
+
+<code-example path="attribute-binding/src/app/app.component.html" region="colSpan" header="src/app/app.component.html"></code-example>
 
-For more information about `colSpan` and `colspan`, see the [Attribute binding](guide/attribute-binding#colspan) guide.
 
 Another example is disabling a button when the component says that it `isUnchanged`:
 
@@ -54,175 +104,100 @@ for parent and child components to communicate:
 
 <code-example path="property-binding/src/app/app.component.html" region="model-property-binding" header="src/app/app.component.html"></code-example>
 
-## Binding targets
 
-An element property between enclosing square brackets identifies the target property.
-The target property in the following code is the image element's `src` property.
+## Toggling button functionality
 
-<code-example path="property-binding/src/app/app.component.html" region="property-binding" header="src/app/app.component.html"></code-example>
+To disable a button's functionality depending on a Boolean value, bind the DOM `disabled` property to a property in the class that is `true` or `false`.
 
-There's also the `bind-` prefix alternative:
+<code-example path="property-binding/src/app/app.component.html" region="disabled-button" header="src/app/app.component.html"></code-example>
 
-<code-example path="property-binding/src/app/app.component.html" region="bind-prefix" header="src/app/app.component.html"></code-example>
+Because the value of the property `isUnchanged` is `true` in the `AppComponent`, Angular disables the button.
+
+<code-example path="property-binding/src/app/app.component.ts" region="boolean" header="src/app/app.component.ts"></code-example>
 
 
-In most cases, the target name is the name of a property, even
-when it appears to be the name of an attribute.
-So in this case, `src` is the name of the `<img>` element property.
+## Setting a directive property
 
-Element properties may be the more common targets,
-but Angular looks first to see if the name is a property of a known directive,
-as it is in the following example:
+To set a property of a directive, place the directive within square brackets , such as `[ngClass]`, followed by an equal sign and the property.
+Here, the property is `classes`.
 
 <code-example path="property-binding/src/app/app.component.html" region="class-binding" header="src/app/app.component.html"></code-example>
 
-Technically, Angular is matching the name to a directive `@Input()`,
-one of the property names listed in the directive's `inputs` array
-or a property decorated with `@Input()`.
-Such inputs map to the directive's own properties.
+To use the property, you must declare it in the class, which in this example is `AppComponent`.
+The value of `classes` is `special`.
 
-If the name fails to match a property of a known directive or element, Angular reports an “unknown directive” error.
+<code-example path="property-binding/src/app/app.component.ts" region="directive-property" header="src/app/app.component.ts"></code-example>
 
-<div class="alert is-helpful">
+Angular applies the class `special` to the `<p>` element so that you can use `special` to apply CSS styles.
 
-Though the target name is usually the name of a property,
-there is an automatic attribute-to-property mapping in Angular for
-several common attributes. These include `class`/`className`, `innerHtml`/`innerHTML`, and
-`tabindex`/`tabIndex`.
+## Bind values between components
 
-</div>
-
-
-## Avoid side effects
-
-Evaluation of a template expression should have no visible side effects.
-The expression language itself, or the way you write template expressions,
-helps to a certain extent;
-you can't assign a value to anything in a property binding expression
-nor use the increment and decrement operators.
-
-For example, you could have an expression that invoked a property or method that had
-side effects. The expression could call something like `getFoo()` where only you
-know what `getFoo()` does. If `getFoo()` changes something
-and you happen to be binding to that something,
-Angular may or may not display the changed value. Angular may detect the
-change and throw a warning error.
-As a best practice, stick to properties and to methods that return
-values and avoid side effects.
-
-## Return the proper type
-
-The template expression should evaluate to the type of value
-that the target property expects.
-Return a string if the target property expects a string, a number if it
-expects a number, an object if it expects an object, and so on.
-
-In the following example, the `childItem` property of the `ItemDetailComponent` expects a string, which is exactly what you're sending in the property binding:
+To set the model property of a custom component, place the target, here `childItem`, between square brackets `[]` followed by an equal sign and the property.
+Here, the property is `parentItem`.
 
 <code-example path="property-binding/src/app/app.component.html" region="model-property-binding" header="src/app/app.component.html"></code-example>
 
-You can confirm this by looking in the `ItemDetailComponent` where the `@Input` type is set to a string:
-<code-example path="property-binding/src/app/item-detail/item-detail.component.ts" region="input-type" header="src/app/item-detail/item-detail.component.ts (setting the @Input() type)"></code-example>
+To use the target and the property, you must declare them in their respective classes.
+
+Declare the target of `childItem` in its component class, in this case `ItemDetailComponent`.
+
+For example, the following code declares the target of `childItem` in its component class, in this case `ItemDetailComponent`.
+
+Then, the code contains an `@Input()` decorator with the `childItem` property so data can flow into it.
+
+<code-example path="property-binding/src/app/item-detail/item-detail.component.ts" region="input-type" header="src/app/item-detail/item-detail.component.ts"></code-example>
+
+Next, the code declares the property of `parentItem` in its component class, in this case `AppComponent`.
+In this example the type of `childItem` is `string`, so `parentItem` needs to be a string.
+Here, `parentItem` has the string value of `lamp`.
 
-As you can see here, the `parentItem` in `AppComponent` is a string, which the `ItemDetailComponent` expects:
 <code-example path="property-binding/src/app/app.component.ts" region="parent-data-type" header="src/app/app.component.ts"></code-example>
 
-### Passing in an object
+With this configuration, the view of `<app-item-detail>` uses the value of `lamp` for `childItem`.
 
-The previous simple example showed passing in a string. To pass in an object,
-the syntax and thinking are the same.
+## Property binding and security
 
-In this scenario, `ItemListComponent` is nested within `AppComponent` and the `items` property expects an array of objects.
-
-<code-example path="property-binding/src/app/app.component.html" region="pass-object" header="src/app/app.component.html"></code-example>
-
-The `items` property is declared in the `ItemListComponent` with a type of `Item` and decorated with `@Input()`:
-
-<code-example path="property-binding/src/app/item-list/item-list.component.ts" region="item-input" header="src/app/item-list.component.ts"></code-example>
-
-In this sample app, an `Item` is an object that has two properties; an `id` and a `name`.
-
-<code-example path="property-binding/src/app/item.ts" region="item-class" header="src/app/item.ts"></code-example>
-
-While a list of items exists in another file, `mock-items.ts`, you can
-specify a different item in `app.component.ts` so that the new item will render:
-
-<code-example path="property-binding/src/app/app.component.ts" region="pass-object" header="src/app.component.ts"></code-example>
-
-You just have to make sure, in this case, that you're supplying an array of objects because that's the type of `Item` and is what the nested component, `ItemListComponent`, expects.
-
-In this example, `AppComponent` specifies a different `item` object
-(`currentItems`) and passes it to the nested `ItemListComponent`. `ItemListComponent` was able to use `currentItems` because it matches what an `Item` object is according to `item.ts`. The `item.ts` file is where
-`ItemListComponent` gets its definition of an `item`.
-
-## Remember the brackets
-
-The brackets, `[]`, tell Angular to evaluate the template expression.
-If you omit the brackets, Angular treats the string as a constant
-and *initializes the target property* with that string:
-
-<code-example path="property-binding/src/app/app.component.html" region="no-evaluation" header="src/app.component.html"></code-example>
-
-
-Omitting the brackets will render the string
-`parentItem`, not the value of `parentItem`.
-
-## One-time string initialization
-
-You *should* omit the brackets when all of the following are true:
-
-* The target property accepts a string value.
-* The string is a fixed value that you can put directly into the template.
-* This initial value never changes.
-
-You routinely initialize attributes this way in standard HTML, and it works
-just as well for directive and component property initialization.
-The following example initializes the `prefix` property of the `StringInitComponent` to a fixed string,
-not a template expression. Angular sets it and forgets about it.
-
-<code-example path="property-binding/src/app/app.component.html" region="string-init" header="src/app/app.component.html"></code-example>
-
-The `[item]` binding, on the other hand, remains a live binding to the component's `currentItems` property.
-
-## Property binding vs. interpolation
-
-You often have a choice between interpolation and property binding.
-The following binding pairs do the same thing:
-
-<code-example path="property-binding/src/app/app.component.html" region="property-binding-interpolation" header="src/app/app.component.html"></code-example>
-
-Interpolation is a convenient alternative to property binding in
-many cases. When rendering data values as strings, there is no
-technical reason to prefer one form to the other, though readability
-tends to favor interpolation. However, *when setting an element
-property to a non-string data value, you must use property binding*.
-
-## Content security
-
-Imagine the following malicious content.
+Property binding can help keep content secure.
+For example, consider the following malicious content.
 
 <code-example path="property-binding/src/app/app.component.ts" region="malicious-content" header="src/app/app.component.ts"></code-example>
 
-In the component template, the content might be used with interpolation:
+The component template interpolates the content as follows:
 
 <code-example path="property-binding/src/app/app.component.html" region="malicious-interpolated" header="src/app/app.component.html"></code-example>
 
-Fortunately, Angular data binding is on alert for dangerous HTML. In the above case,
-the HTML displays as is, and the Javascript does not execute. Angular **does not**
-allow HTML with script tags to leak into the browser, neither with interpolation
-nor property binding.
-
-In the following example, however, Angular [sanitizes](guide/security#sanitization-and-security-contexts)
-the values before displaying them.
-
-<code-example path="property-binding/src/app/app.component.html" region="malicious-content" header="src/app/app.component.html"></code-example>
-
-Interpolation handles the `<script>` tags differently than
-property binding but both approaches render the
-content harmlessly. The following is the browser output
-of the `evilTitle` examples.
+The browser doesn't process the HTML and instead displays it raw, as follows.
 
 <code-example language="bash">
 "Template &lt;script&gt;alert("evil never sleeps")&lt;/script&gt; Syntax" is the interpolated evil title.
+</code-example>
+
+
+Angular does not allow HTML with `<script>` tags, neither with [interpolation](guide/interpolation) nor property binding, which prevents the JavaScript from running.
+
+In the following example, however, Angular [sanitizes](guide/security#sanitization-and-security-contexts) the values before displaying them.
+
+<code-example path="property-binding/src/app/app.component.html" region="malicious-content" header="src/app/app.component.html"></code-example>
+
+Interpolation handles the `<script>` tags differently than property binding, but both approaches render the content harmlessly.
+The following is the browser output of the sanitized `evilTitle` example.
+
+<code-example language="bash">
 "Template Syntax" is the property bound evil title.
 </code-example>
+
+## Property binding and interpolation
+
+Often [interpolation](guide/interpolation) and property binding can achieve the same results.
+The following binding pairs do the same thing.
+
+<code-example path="property-binding/src/app/app.component.html" region="property-binding-interpolation" header="src/app/app.component.html"></code-example>
+
+You can use either form when rendering data values as strings, though interpolation is preferable for readability.
+However, when setting an element property to a non-string data value, you must use property binding.
+
+<hr />
+
+## What's next
+
+* [Property binding best practices](guide/property-binding-best-practices)

aio/content/guide/router-tutorial-toh.md

@@ -1656,7 +1656,7 @@ _before_ the `AppRoutingModule`:
 
 </code-tabs>
 
-Remove the initial crisis center route from the `app-routing.module.ts` because now the `HeroesModule` and the `CrisisCenter` modules provide teh feature routes.
+Remove the initial crisis center route from the `app-routing.module.ts` because now the `HeroesModule` and the `CrisisCenter` modules provide the feature routes.
 
 The `app-routing.module.ts` file retains the top-level application routes such as the default and wildcard routes.
 

aio/content/guide/style-precedence.md

@@ -0,0 +1,133 @@
+# Style Precedence
+
+When there are multiple bindings to the same class name or style attribute, Angular uses a set of precedence rules to determine which classes or styles to apply to the element.
+These rules specify an order for which style- and class-related bindings have priority.
+This styling precedence is as follows, from the most specific with the highest priority to least specific with the lowest priorty:
+
+1. Template bindings are the most specific because they apply to the element directly and exclusively, so they have the highest precedence.
+  <table width="100%">
+    <col width="40%"></col>
+    <col width="60%"></col>
+    <thead>
+      <tr>
+        <th>Binding type</th>
+        <th>Example</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Property binding</td>
+        <td><code>&lt;div [class.foo]="hasFoo"&gt;</code><br><code>&lt;div [style.color]="color"&gt;</code></td>
+      </tr>
+      <tr>
+        <td>Map binding</td>
+        <td><code>&lt;div [class]="classExpression"&gt;</code><br><code>&lt;div [style]="styleExpression"&gt;</code></td>
+      </tr>
+      <tr>
+        <td>Static value</td>
+        <td><code>&lt;div class="foo"&gt;</code><br><code>&lt;div style="color: blue"&gt;</code></td>
+      </tr>
+    </tbody>
+  </table>
+1. Directive host bindings are less specific because you can use directives in multiple locations, so they have a lower precedence than template bindings.
+  <table width="100%">
+    <col width="40%"></col>
+    <col width="60%"></col>
+    <thead>
+      <tr>
+        <th>Binding type</th>
+        <th>Example</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Property binding</td>
+        <td><code>host: {'[class.foo]': 'hasFoo'}</code><br><code>host: {'[style.color]': 'color'}</code></td>
+      </tr>
+      <tr>
+        <td>Map binding</td>
+        <td><code>host: {'[class]': 'classExpr'}</code><br><code>host: {'[style]': 'styleExpr'}</code></td>
+      </tr>
+      <tr>
+        <td>Static value</td>
+        <td><code>host: {'class': 'foo'}</code><br><code>host: {'style': 'color: blue'}</code></td>
+      </tr>
+    </tbody>
+  </table>
+1. Component host bindings have the lowest precedence.
+    <table width="100%">
+    <col width="40%"></col>
+    <col width="60%"></col>
+    <thead>
+      <tr>
+        <th>Binding type</th>
+        <th>Example</th>
+      </tr>
+    </thead>
+    <tbody>
+      <tr>
+        <td>Property binding</td>
+        <td><code>host: {'[class.foo]': 'hasFoo'}</code><br><code>host: {'[style.color]': 'color'}</code></td>
+      </tr>
+      <tr>
+        <td>Map binding</td>
+        <td><code>host: {'[class]': 'classExpression'}</code><br><code>host: {'[style]': 'styleExpression'}</code></td>
+      </tr>
+      <tr>
+        <td>Static value</td>
+        <td><code>host: {'class': 'foo'}</code><br><code>host: {'style': 'color: blue'}</code></td>
+      </tr>
+    </tbody>
+  </table>
+
+## Precedence and specificity
+
+In the following example, binding to a specific class, as in `[class.special]`, takes precedence over a generic `[class]` binding.
+Similarly, binding to a specific style, as in `[style.color]`, takes precedence over a generic `[style]` binding.
+
+<code-example path="attribute-binding/src/app/app.component.html" region="basic-specificity" header="src/app/app.component.html"></code-example>
+
+## Precedence and bindings from different sources
+
+Specificity rules also apply to bindings even when they originate from different sources.
+An element can have bindings that originate from its own template, from host bindings on matched directives, and from host bindings on matched components.
+
+<code-example path="attribute-binding/src/app/app.component.html" region="source-specificity" header="src/app/app.component.html"></code-example>
+
+## Precedence of bindings and static attributes
+
+Bindings take precedence over static attributes because they are dynamic.
+In the following case, `class` and `[class]` have similar specificity, but the `[class]` binding takes precedence.
+
+<code-example path="attribute-binding/src/app/app.component.html" region="dynamic-priority" header="src/app/app.component.html"></code-example>
+
+{@a styling-delegation}
+
+## Delegating to styles with lower precedence
+
+Higher precedence styles can defer to lower precedence styles using `undefined` values.
+For example, consider the following template:
+
+<code-example path="attribute-binding/src/app/app.component.html" region="style-delegation" header="src/app/app.component.html"></code-example>
+
+Imagine that the `dirWithHostBinding` directive and the `comp-with-host-binding` component both have a `[style.width]` host binding.
+
+<code-example path="attribute-binding/src/app/comp-with-host-binding.component.ts" region="hostbinding" header="src/app/comp-with-host-binding.component.ts and dirWithHostBinding.directive.ts"></code-example>
+
+If `dirWithHostBinding` sets its binding to `undefined`, the `width` property falls back to the value of the `comp-with-host-binding` host binding.
+
+<code-example header="dirWithHostBinding directive">
+@HostBinding('style.width')
+width = ''; // undefined
+</code-example>
+
+<div class="alert is-helpful">
+
+  If `dirWithHostBinding` sets its binding to `null`, Angular removes the `width` property entirely.
+
+  <code-example header="dirWithHostBinding">
+  @HostBinding('style.width')
+  width = null;
+  </code-example>
+
+</div>

aio/content/guide/template-statements.md

@@ -14,7 +14,7 @@ In the following example, the template statement `deleteHero()` appears in quote
 
 <code-example path="template-syntax/src/app/app.component.html" region="context-component-statement" header="src/app/app.component.html"></code-example>
 
-When the user clicks the **Delete hero** button, Angular calls the `deleteHero()` function in the component class.
+When the user clicks the **Delete hero** button, Angular calls the `deleteHero()` method in the component class.
 
 You can use template statements with elements, components, or directives in response to events.
 

aio/content/guide/user-input.md

@@ -234,8 +234,8 @@ To fix this issue, listen to both the _Enter_ key and the _blur_ event.
 
 
 ## Put it all together
-The previous page showed how to [display data](guide/displaying-data).
-This page demonstrated event binding techniques.
+
+This page demonstrated several event binding techniques.
 
 Now, put it all together in a micro-app
 that can display a list of heroes and add new heroes to the list.

aio/content/guide/zone.md

@@ -9,7 +9,7 @@ To understand the benefits of `NgZone`, it is important to have a clear grasp of
 
 ### Displaying and updating data in Angular
 
-In Angular, you can [display data](guide/displaying-data) by binding controls in an HTML template to the properties of an Angular component.
+In Angular, you can display data by binding controls in an HTML template to the properties of an Angular component.
 
 <code-example path="displaying-data/src/app/app.component.1.ts" header="src/app/app.component.ts"></code-example>
 
@@ -102,13 +102,13 @@ In Angular, this step is unnecessary. Whenever you update the data, your HTML is
 
 To understand how change detection works, first consider when the application needs to update the HTML. Typically, updates occur for one of the following reasons:
 
-1. Component initialization. For example, when bootstrapping an Angular application, Angular loads the bootstrap component and triggers the [ApplicationRef.tick()](api/core/ApplicationRef#tick) to call change detection and View Rendering. Just as in the [displaying data](guide/displaying-data) sample, the `AppComponent` is the bootstrap component. This component has the properties `title` and `myHero`, which the application renders in the HTML.
+1. Component initialization. For example, when bootstrapping an Angular application, Angular loads the bootstrap component and triggers the [ApplicationRef.tick()](api/core/ApplicationRef#tick) to call change detection and View Rendering.
 
-2. Event listener. The DOM event listener can update the data in an Angular component and also trigger change detection, as in the following example.
+1. Event listener. The DOM event listener can update the data in an Angular component and also trigger change detection, as in the following example.
 
 <code-example path="user-input/src/app/click-me.component.ts" region="click-me-component" header="src/app/click-me.component.ts"></code-example>
 
-3. HTTP Data Request. You can also get data from a server through an HTTP request. For example:
+1. HTTP Data Request. You can also get data from a server through an HTTP request. For example:
 
 ```typescript
 @Component({

aio/content/marketing/contributors.json

@@ -826,5 +826,30 @@
     "website": "https://thekiba.io",
     "bio": "Andrew is a software engineer using Angular and .NET. He spends most of his spare time staying up-to-date, helping other people, and experimenting with web tech.",
     "groups": ["GDE"]
+  },
+  "fmalcher": {
+    "name": "Ferdinand Malcher",
+    "picture": "fmalcher.jpg",
+    "twitter": "fmalcher01",
+    "website": "https://angular.schule",
+    "bio": "Ferdinand is a developer, trainer, and international speaker from Leipzig, Germany. He is co-author of the German Angular book and loves to share knowledge – that's why he writes books and blog posts, speaks at meetups and conferences, does Angular training and works as a consultant in his company \"Angular.Schule\".",
+    "groups": ["GDE"]
+  },
+  "johanneshoppe": {
+    "name": "Johannes Hoppe",
+    "picture": "johanneshoppe.jpg",
+    "twitter": "johanneshoppe",
+    "website": "https://angular.schule",
+    "bio": "Johannes works as a software architect and consultant for Angular. He is co-author of the German Angular book and a passionate speaker. With his company \"Angular.Schule\" he offers public Angular training and consulting. Johannes is head of the Angular Meetup in Heidelberg, Germany, and is engaged in a couple of open source projects.",
+    "groups": ["GDE"]
+  },
+  "jessicajaniuk": {
+    "name": "Jessica Janiuk",
+    "picture": "jessicajaniuk.jpg",
+    "twitter": "thepunderwoman",
+    "website": "https://github.com/jessicajaniuk",
+    "bio": "Jessica is a software engineer at Google. In her free time she is a historical fencer, astromech droid builder, photographer, pun purveyor, occasional cosplayer, and full time cat mom.",
+    "groups": ["Angular"],
+    "lead": "jelbourn"
   }
 }

aio/content/navigation.json

@@ -101,16 +101,16 @@
           "title": "Components",
           "tooltip": "Building dynamic views with data binding",
           "children": [
+            {
+              "url": "guide/component-overview",
+              "title": "Overview",
+              "tooltip": "Overview of how to create Angular components."
+            },
             {
               "url": "guide/user-input",
               "title": "User Input",
               "tooltip": "User input triggers DOM events. Angular listens to those events with event bindings that funnel updated values back into your app's components and models."
             },
-            {
-              "url": "guide/pipes",
-              "title": "Pipes",
-              "tooltip": "Pipes transform displayed values within a template."
-            },
             {
               "url": "guide/lifecycle-hooks",
               "title": "Component Lifecycle",
@@ -167,6 +167,11 @@
               "title": "Template statements",
               "tooltip": "Introductory guide to statements in templates that respond to events that components, directives, or elements raise."
             },
+            {
+              "url": "guide/pipes",
+              "title": "Pipes",
+              "tooltip": "Pipes transform displayed values within a template."
+            },
             {
               "url": "guide/binding-syntax",
               "title": "Binding syntax",
@@ -417,6 +422,11 @@
           "title": "Keeping Up-to-Date",
           "tooltip": "Information about updating Angular applications and libraries to the latest version."
         },
+        {
+          "url": "guide/property-binding-best-practices",
+          "title": "Property Binding Best Practices",
+          "tooltip": "Use property binding efficiently."
+        },
         {
           "title": "Testing",
           "tooltip": "Testing your Angular apps.",
@@ -609,11 +619,6 @@
           "title": "Building a Template-driven Form",
           "tooltip": "Create a template-driven form using directives and Angular template syntax."
         },
-        {
-          "url": "guide/displaying-data",
-          "title": "Data binding",
-          "tooltip": "Property binding helps show app data in the UI."
-        },
         {
           "url": "guide/web-worker",
           "title": "Web Workers",

aio/content/tutorial/toh-pt6.md

@@ -180,7 +180,7 @@ give it a `catchError()` operator.
 </code-example>
 
 The `catchError()` operator intercepts an **`Observable` that failed**.
-It passes the error an error handler that can do what it wants with the error.
+The operator then passes the error to the error handling function.
 
 The following `handleError()` method reports the error and then returns an
 innocuous result so that the application keeps working.

aio/firebase.json

@@ -31,6 +31,7 @@
       {"type": 301, "source": "/guide/quickstart", "destination": "/start"},
       {"type": 301, "source": "/getting-started", "destination": "/start"},
       {"type": 301, "source": "/getting-started/:rest*", "destination": "/start/:rest*"},
+      {"type": 301, "source": "/guide/displaying-data", "destination": "/start#template-syntax"},
 
       // Renaming of Getting Started topics
       {"type": 301, "source": "/start/data", "destination": "/start/start-data"},

aio/ngsw-config.json

@@ -102,6 +102,9 @@
     "!/guide/cli-quickstart",
     "!/guide/cli-quickstart.html",
     "!/guide/cli-quickstart/",
+    "!/guide/displaying-data",
+    "!/guide/displaying-data.html",
+    "!/guide/displaying-data/",
     "!/guide/learning-angular",
     "!/guide/learning-angular.html",
     "!/guide/learning-angular/",

aio/package.json

@@ -23,7 +23,7 @@
     "build-local-with-viewengine": "yarn ~~build",
     "prebuild-local-with-viewengine-ci": "node scripts/switch-to-viewengine && yarn setup-local-ci",
     "build-local-with-viewengine-ci": "yarn ~~build --progress=false",
-    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js ab97bc382",
+    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js cba6d86ca",
     "lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
     "test": "yarn check-env && ng test",
     "pree2e": "yarn check-env && yarn update-webdriver",
@@ -71,6 +71,7 @@
     "boilerplate:test": "node tools/examples/test.js",
     "generate-stackblitz": "node ./tools/stackblitz-builder/generateStackblitz",
     "generate-zips": "node ./tools/example-zipper/generateZips",
+    "create-example": "node ./tools/examples/create-example.js",
     "build-404-page": "node scripts/build-404-page",
     "update-webdriver": "node ../scripts/webdriver-manager-update.js",
     "~~audit-web-app": "node scripts/audit-web-app",
@@ -172,6 +173,6 @@
     "unist-util-visit-parents": "^1.1.1",
     "watchr": "^3.0.1",
     "xregexp": "^4.0.0",
-    "yargs": "^7.0.2"
+    "yargs": "^16.1.0"
   }
 }

aio/tests/deployment/shared/URLS_TO_REDIRECT.txt

@@ -177,6 +177,7 @@
 /getting-started/forms	/start/start-forms
 /getting-started/deployment	/start/start-deployment
 /guide/cli-quickstart	/start
+/guide/displaying-data	/start#template-syntax
 /guide/learning-angular	/start
 /guide/learning-angular.html	/start
 /guide/metadata	/guide/aot-compiler

aio/tools/README.md

@@ -29,11 +29,12 @@ sub-folder. Also there are a number of common boilerplate files that are needed
 example's project. We maintain these common boilerplate files centrally to reduce the amount of effort
 if one of them needs to change.
 
-This `examples` tool folder contains two utilities:
+This `examples` tool folder contains three utilities:
 
 * example-boilerplate.js - install/remove the npm dependencies and boilerplate files into/from each of the
   examples' subfolders.
 * run-example-e2e.js - run the e2e tests for one or more examples
+* create-example.js - create a new example from the `example-scaffold/` directory or by importing files from a CLI project.
 
 See the [README.md](examples/README.md) for more details.
 

aio/tools/examples/README.md

@@ -150,6 +150,14 @@ See [aio/README.md](../../README.md#developer-tasks) for the available command-l
 
 Running the script will create an `aio/protractor-results.txt` file with the results of the tests.
 
+### `create-example.js`
+
+The [create-example.js](./create-example.js) script creates a new example under the `aio/content/examples` directory.
+
+You must provide a new name for the example.
+By default the script will place basic scaffold files into the new example (from [shared/example-scaffold](./shared/example-scaffold)).
+But you can also specify the path to a separate CLI project, from which the script will copy files that would not be considered "boilerplate".
+See the [Boilerplate overview](#boilerplate-overview) for more information.
 
 ### Updating example dependencies
 

aio/tools/examples/UPDATING.md

@@ -7,9 +7,9 @@ Follow these steps to update the examples to the latest versions of Angular (and
   > NOTE:
   > The [angular-cli-diff](https://github.com/cexbrayat/angular-cli-diff) repo can be a useful resource for discovering what dependency versions are used for a basic CLI app at a specific CLI version.
 
-- In the [shared/](./shared) folder, run `yarn` to update the dependencies in the [shared/node_modules/](./shared/node_modules) folder and the [shared/yarn.lock](./shared/yarn.lock) file.
+- In the [shared/](./shared) directory, run `yarn` to update the dependencies in the [shared/node_modules/](./shared/node_modules) directory and the [shared/yarn.lock](./shared/yarn.lock) file.
 
-- In the [shared/](./shared) folder, run `yarn sync-deps` to update the dependency versions of the `package.json` files in each sub-folder of [shared/boilerplate/](./shared/boilerplate) to match the ones in [shared/package.json](./shared/package.json).
+- In the [shared/](./shared) directory, run `yarn sync-deps` to update the dependency versions of the `package.json` files in each sub-folder of [shared/boilerplate/](./shared/boilerplate) to match the ones in [shared/package.json](./shared/package.json).
 
 - Follow the steps in the following section to update the rest of the boilerplate files.
 
@@ -24,7 +24,7 @@ Any necessary changes to boilerplate files will be done automatically through mi
 > You have to make these changes (if any) manually.
 > Again, the [angular-cli-diff](https://github.com/cexbrayat/angular-cli-diff) repo can be a useful resource for discovering changes between versions.
 
-- In the [shared/boilerplate/cli/](./shared/boilerplate/cli) folder, run the following commands to migrate the the project to the current versions of Angular CLI and the Angular framework (updated in previous steps):
+- In the [shared/boilerplate/cli/](./shared/boilerplate/cli) directory, run the following commands to migrate the the project to the current versions of Angular CLI and the Angular framework (updated in previous steps):
   ```sh
   # Ensure dependencies are installed.
   yarn install
@@ -38,8 +38,11 @@ Any necessary changes to boilerplate files will be done automatically through mi
   > In order for `ng update` to work, there must be a `node_modules/` directory with installed dependencies inside the [shared/boilerplate/cli/](./shared/boilerplate/cli) directory.
   > This `node_modules/` directory is only needed during the update operation and is otherwise ignored (both by git and by the [example-boilerplate.js](./example-boilerplate.js) script) by means of the [shared/boilerplate/.gitignore](./shared/boilerplate/.gitignore) file.
 
-- The previous command made any necessary changes to boilerplate files inside the `cli/` folder, but the same changes need to be applied to the other CLI-based boilerplate folders.
-  Inspect the changes in `cli/` and manually apply the necessary ones to other CLI-based boilerplate folders.
+- The previous command made any necessary changes to boilerplate files inside the `cli/` directory, but the same changes need to be applied to the other CLI-based boilerplate directories.
+  Inspect the changes in `cli/` and manually apply the necessary ones to other CLI-based boilerplate directories.
+
+- Also ensure that any relevant changes in the [shared/boilerplate/cli/](./shared/boilerplate/cli) directory are copied to the [shared/example-scaffold/](./shared/example-scaffold) directory, which is used when creating new examples (via `yarn create-example ...`).
+  Only files that would not be considered boilerplate should be added to the `example-scaffold/` directory.
 
 - Ensure any changes to [cli/tslint.json](./shared/boilerplate/cli/tslint.json) are ported over to [systemjs/tslint.json](./shared/boilerplate/systemjs/tslint.json) and also [aio/content/examples/tslint.json](../../content/examples/tslint.json).
   This last part is important, since this file is used to lint example code on CI.

aio/tools/examples/constants.js

@@ -0,0 +1,6 @@
+const path = require('canonical-path');
+
+exports.EXAMPLES_BASE_PATH = path.resolve(__dirname, '../../content/examples');
+exports.EXAMPLE_CONFIG_FILENAME = 'example-config.json';
+exports.SHARED_PATH = path.resolve(__dirname, 'shared');
+exports.STACKBLITZ_CONFIG_FILENAME = 'stackblitz.json';

aio/tools/examples/create-example.js

@@ -0,0 +1,140 @@
+const fs = require('fs-extra');
+const glob = require('glob');
+const ignore = require('ignore');
+const path = require('canonical-path');
+const shelljs = require('shelljs');
+const yargs = require('yargs');
+
+const {EXAMPLES_BASE_PATH, EXAMPLE_CONFIG_FILENAME, SHARED_PATH, STACKBLITZ_CONFIG_FILENAME} =
+    require('./constants');
+const BASIC_SOURCE_PATH = path.resolve(SHARED_PATH, 'example-scaffold');
+
+shelljs.set('-e');
+
+if (require.main === module) {
+  const options =
+      yargs(process.argv.slice(2))
+          .command(
+              '$0 <name> [source]',
+              [
+                'Create a new <name> example.',
+                '',
+                'If [source] is provided then the relevant files from the CLI project at that path are copied into the example.',
+              ].join('\n'))
+          .strict()
+          .version(false)
+          .argv;
+
+  const exampleName = options.name;
+  const examplePath = path.resolve(EXAMPLES_BASE_PATH, exampleName);
+
+  console.log('Creating new example at', examplePath);
+  createEmptyExample(exampleName, examplePath);
+
+  const sourcePath =
+      options.source !== undefined ? path.resolve(options.source) : BASIC_SOURCE_PATH;
+  console.log('Copying files from', sourcePath);
+  copyExampleFiles(sourcePath, examplePath, exampleName);
+
+  console.log(`The new "${exampleName}" example has been created.`);
+  console.log('Now run "yarn boilerplate:add" to set it up for development.');
+  console.log(
+      'You can find more info on working with docs examples in aio/tools/examples/README.md.')
+}
+
+/**
+ * Create the directory and marker files for the new example.
+ */
+function createEmptyExample(exampleName, examplePath) {
+  ensureExamplePath(examplePath);
+  writeExampleConfigFile(examplePath);
+  writeStackBlitzFile(exampleName, examplePath);
+}
+
+/**
+ * Ensure that the new example directory exists.
+ */
+function ensureExamplePath(examplePath) {
+  if (fs.existsSync(examplePath)) {
+    throw new Error(
+        `Unable to create example. The path to the new example already exists: ${examplePath}`);
+  }
+  fs.ensureDirSync(examplePath);
+}
+
+/**
+ * Write the `example-config.json` file to the new example.
+ */
+function writeExampleConfigFile(examplePath) {
+  fs.writeFileSync(path.resolve(examplePath, EXAMPLE_CONFIG_FILENAME), '');
+}
+
+/**
+ * Write the `stackblitz.json` file into the new example.
+ */
+function writeStackBlitzFile(exampleName, examplePath) {
+  const config = {
+    description: titleize(exampleName),
+    files: ['!**/*.d.ts', '!**/*.js', '!**/*.[1,2].*'],
+    tags: [exampleName.split('-')]
+  };
+  fs.writeFileSync(
+      path.resolve(examplePath, STACKBLITZ_CONFIG_FILENAME),
+      JSON.stringify(config, null, 2) + '\n');
+}
+
+/**
+ * Copy all the files from the `sourcePath`, which are not ignored by the `.gitignore` file in the
+ * `EXAMPLES_BASE_PATH`, to the `examplePath`.
+ */
+function copyExampleFiles(sourcePath, examplePath, exampleName) {
+  const gitIgnoreSource = getGitIgnore(sourcePath);
+  const gitIgnoreExamples = getGitIgnore(EXAMPLES_BASE_PATH);
+
+  // Grab the files in the source folder and filter them based on the gitignore rules.
+  const sourceFiles =
+      glob.sync('**/*', {
+            cwd: sourcePath,
+            dot: true,
+            ignore: ['**/node_modules/**', '.git/**', '.gitignore'],
+            mark: true
+          })
+          // Filter out the directories, leaving only files
+          .filter(filePath => !/\/$/.test(filePath))
+          // Filter out files that match the source directory .gitignore rules
+          .filter(filePath => !gitIgnoreSource.ignores(filePath))
+          // Filter out files that match the examples directory .gitignore rules
+          .filter(filePath => !gitIgnoreExamples.ignores(path.join(exampleName, filePath)));
+
+  for (const sourceFile of sourceFiles) {
+    console.log(' - ', sourceFile);
+    const destPath = path.resolve(examplePath, sourceFile)
+    fs.ensureDirSync(path.dirname(destPath));
+    fs.copySync(path.resolve(sourcePath, sourceFile), destPath);
+  }
+}
+
+function getGitIgnore(directory) {
+  const gitIgnoreMatcher = ignore();
+  const gitignoreFilePath = path.resolve(directory, '.gitignore');
+  if (fs.existsSync(gitignoreFilePath)) {
+    const gitignoreFile = fs.readFileSync(gitignoreFilePath, 'utf8');
+    gitIgnoreMatcher.add(gitignoreFile);
+  }
+  return gitIgnoreMatcher;
+}
+
+/**
+ * Convert a kebab-case string to space separated Title Case string.
+ */
+function titleize(input) {
+  return input.replace(
+      /(-|^)(.)/g, (_, pre, char) => `${pre === '-' ? ' ' : ''}${char.toUpperCase()}`);
+}
+
+exports.createEmptyExample = createEmptyExample;
+exports.ensureExamplePath = ensureExamplePath;
+exports.writeExampleConfigFile = writeExampleConfigFile;
+exports.writeStackBlitzFile = writeStackBlitzFile;
+exports.copyExampleFiles = copyExampleFiles;
+exports.titleize = titleize;

aio/tools/examples/create-example.spec.js

@@ -0,0 +1,130 @@
+const path = require('canonical-path');
+const fs = require('fs-extra');
+const {glob} = require('glob');
+
+const {EXAMPLES_BASE_PATH, EXAMPLE_CONFIG_FILENAME, SHARED_PATH, STACKBLITZ_CONFIG_FILENAME} =
+    require('./constants');
+
+const {
+  copyExampleFiles,
+  createEmptyExample,
+  ensureExamplePath,
+  titleize,
+  writeExampleConfigFile,
+  writeStackBlitzFile
+} = require('./create-example');
+
+describe('create-example tool', () => {
+  describe('createEmptyExample', () => {
+    it('should create an empty example with marker files', () => {
+      spyOn(fs, 'existsSync').and.returnValue(false);
+      spyOn(fs, 'ensureDirSync');
+      const writeFileSpy = spyOn(fs, 'writeFileSync');
+
+      createEmptyExample('foo-bar', '/path/to/foo-bar');
+      expect(writeFileSpy).toHaveBeenCalledTimes(2);
+      expect(writeFileSpy)
+          .toHaveBeenCalledWith(`/path/to/foo-bar/${EXAMPLE_CONFIG_FILENAME}`, jasmine.any(String));
+      expect(writeFileSpy)
+          .toHaveBeenCalledWith(
+              `/path/to/foo-bar/${STACKBLITZ_CONFIG_FILENAME}`, jasmine.any(String));
+    });
+  });
+
+  describe('ensureExamplePath', () => {
+    it('should error if the path already exists', () => {
+      spyOn(fs, 'existsSync').and.returnValue(true);
+      expect(() => ensureExamplePath('foo/bar'))
+          .toThrowError(
+              `Unable to create example. The path to the new example already exists: foo/bar`);
+    });
+
+    it('should create the directory on disk', () => {
+      spyOn(fs, 'existsSync').and.returnValue(false);
+      const spy = spyOn(fs, 'ensureDirSync');
+      ensureExamplePath('foo/bar');
+      expect(spy).toHaveBeenCalledWith('foo/bar');
+    });
+  });
+
+  describe('writeExampleConfigFile', () => {
+    it('should write a JSON file to disk', () => {
+      const spy = spyOn(fs, 'writeFileSync');
+      writeExampleConfigFile('/foo/bar');
+      expect(spy).toHaveBeenCalledWith(`/foo/bar/${EXAMPLE_CONFIG_FILENAME}`, '');
+    });
+  });
+
+  describe('writeStackBlitzFile', () => {
+    it('should write a JSON file to disk', () => {
+      const spy = spyOn(fs, 'writeFileSync');
+      writeStackBlitzFile('bar-bar', '/foo/bar-bar');
+      expect(spy).toHaveBeenCalledWith(`/foo/bar-bar/${STACKBLITZ_CONFIG_FILENAME}`, [
+        '{',
+        '  "description": "Bar Bar",',
+        '  "files": [',
+        '    "!**/*.d.ts",',
+        '    "!**/*.js",',
+        '    "!**/*.[1,2].*"',
+        '  ],',
+        '  "tags": [',
+        '    [',
+        '      "bar",',
+        '      "bar"',
+        '    ]',
+        '  ]',
+        '}',
+        '',
+      ].join('\n'));
+    });
+  });
+
+  describe('copyExampleFiles', () => {
+    it('should copy over files that are not ignored by git', () => {
+      const examplesGitIgnorePath = path.resolve(EXAMPLES_BASE_PATH, '.gitignore');
+      const sourceGitIgnorePath = path.resolve('/source/path', '.gitignore');
+
+      spyOn(console, 'log');
+      spyOn(fs, 'existsSync').and.returnValue(true);
+      const readFileSyncSpy = spyOn(fs, 'readFileSync').and.callFake(p => {
+        switch (p) {
+          case examplesGitIgnorePath:
+            return '**/a/b/**';
+          case sourceGitIgnorePath:
+            return '**/*.bad';
+          default:
+            throw new Error('Unexpected path');
+        }
+      });
+      spyOn(glob, 'sync').and.returnValue([
+        'a/', 'a/b/', 'a/c', 'x.ts', 'x.bad', 'a/b/y.ts', 'a/b/y.bad'
+      ]);
+      const ensureDirSyncSpy = spyOn(fs, 'ensureDirSync');
+      const copySyncSpy = spyOn(fs, 'copySync');
+
+      copyExampleFiles('/source/path', '/path/to/test-example', 'test-example');
+
+      expect(readFileSyncSpy).toHaveBeenCalledWith(examplesGitIgnorePath, 'utf8');
+      expect(readFileSyncSpy).toHaveBeenCalledWith(sourceGitIgnorePath, 'utf8');
+
+      expect(ensureDirSyncSpy.calls.allArgs()).toEqual([
+        ['/path/to/test-example/a'],
+        ['/path/to/test-example'],
+      ]);
+
+      expect(copySyncSpy.calls.allArgs()).toEqual([
+        ['/source/path/a/c', '/path/to/test-example/a/c'],
+        ['/source/path/x.ts', '/path/to/test-example/x.ts'],
+      ]);
+    });
+  });
+
+  describe('titleize', () => {
+    it('should convert a kebab-case string to title-case', () => {
+      expect(titleize('abc')).toEqual('Abc');
+      expect(titleize('abc-def')).toEqual('Abc Def');
+      expect(titleize('123')).toEqual('123');
+      expect(titleize('abc---def')).toEqual('Abc - Def');
+    });
+  });
+});

aio/tools/examples/example-boilerplate.js

@@ -4,8 +4,8 @@ const ignore = require('ignore');
 const path = require('canonical-path');
 const shelljs = require('shelljs');
 const yargs = require('yargs');
+const {EXAMPLES_BASE_PATH, EXAMPLE_CONFIG_FILENAME, SHARED_PATH} = require('./constants');
 
-const SHARED_PATH = path.resolve(__dirname, 'shared');
 const SHARED_NODE_MODULES_PATH = path.resolve(SHARED_PATH, 'node_modules');
 
 const BOILERPLATE_BASE_PATH = path.resolve(SHARED_PATH, 'boilerplate');
@@ -13,9 +13,6 @@ const BOILERPLATE_CLI_PATH = path.resolve(BOILERPLATE_BASE_PATH, 'cli');
 const BOILERPLATE_COMMON_PATH = path.resolve(BOILERPLATE_BASE_PATH, 'common');
 const BOILERPLATE_VIEWENGINE_PATH = path.resolve(BOILERPLATE_BASE_PATH, 'viewengine');
 
-const EXAMPLES_BASE_PATH = path.resolve(__dirname, '../../content/examples');
-const EXAMPLE_CONFIG_FILENAME = 'example-config.json';
-
 class ExampleBoilerPlate {
   /**
    * Add boilerplate files to all the examples

aio/tools/examples/shared/example-scaffold/e2e/src/app.e2e-spec.ts

@@ -0,0 +1,20 @@
+import { AppPage } from './app.po';
+import { browser, logging } from 'protractor';
+
+describe('workspace-project App', () => {
+  let page: AppPage;
+
+  beforeEach(() => {
+    page = new AppPage();
+  });
+
+  // Add your e2e tests here
+
+  afterEach(async () => {
+    // Assert that there are no errors emitted from the browser
+    const logs = await browser.manage().logs().get(logging.Type.BROWSER);
+    expect(logs).not.toContain(jasmine.objectContaining({
+      level: logging.Level.SEVERE,
+    } as logging.Entry));
+  });
+});

aio/tools/examples/shared/example-scaffold/src/app/app.component.html

@@ -0,0 +1 @@
+<h1>Replace the src folder in this {{title}} with yours.</h1>

aio/tools/examples/shared/example-scaffold/src/app/app.component.spec.ts

@@ -0,0 +1,20 @@
+import { TestBed } from '@angular/core/testing';
+import { AppComponent } from './app.component';
+
+describe('AppComponent', () => {
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [
+        AppComponent
+      ],
+    }).compileComponents();
+  });
+
+  it('should create the app', () => {
+    const fixture = TestBed.createComponent(AppComponent);
+    const app = fixture.componentInstance;
+    expect(app).toBeTruthy();
+  });
+
+  // Add your unit tests here
+});

aio/tools/examples/shared/example-scaffold/src/app/app.component.ts

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

aio/tools/examples/shared/example-scaffold/src/app/app.module.ts

@@ -0,0 +1,16 @@
+import { BrowserModule } from '@angular/platform-browser';
+import { NgModule } from '@angular/core';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  declarations: [
+    AppComponent
+  ],
+  imports: [
+    BrowserModule
+  ],
+  providers: [],
+  bootstrap: [AppComponent]
+})
+export class AppModule { }

aio/tools/examples/shared/example-scaffold/src/index.html

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

aio/tools/examples/shared/example-scaffold/src/main.ts

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

aio/yarn.lock

@@ -3075,11 +3075,6 @@ camelcase@^2.0.1:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
   integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
-camelcase@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-3.0.0.tgz#32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"
-  integrity sha1-MvxLn82vhF/N9+c7uXysImHwqwo=
-
 camelcase@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
@@ -3459,7 +3454,7 @@ cli-width@^3.0.0:
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-cliui@^3.0.3, cliui@^3.2.0:
+cliui@^3.0.3:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/cliui/-/cliui-3.2.0.tgz#120601537a916d29940f934da3b48d585a39213d"
   integrity sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=
@@ -3495,6 +3490,15 @@ cliui@^6.0.0:
     strip-ansi "^6.0.0"
     wrap-ansi "^6.2.0"
 
+cliui@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.2.tgz#e3a412e1d5ec0ccbe50d1b4120fc8164e97881f4"
+  integrity sha512-lhpKkuUj67j5JgZIPZxLe7nSa4MQoojzRVWQyzMqBp2hBg6gwRjUDAwC1YDeBaC3APDBKNnjWbv2mlDF4XgOSA==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
 clone@^1.0.2:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
@@ -4905,7 +4909,7 @@ errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -5017,6 +5021,11 @@ es6-weak-map@^2.0.1, es6-weak-map@^2.0.2:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
@@ -5583,14 +5592,6 @@ find-free-port@^2.0.0:
   resolved "https://registry.yarnpkg.com/find-free-port/-/find-free-port-2.0.0.tgz#4b22e5f6579eb1a38c41ac6bcb3efed1b6da9b1b"
   integrity sha1-SyLl9leesaOMQaxryz7+0bbamxs=
 
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
@@ -5925,7 +5926,7 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
-get-caller-file@^2.0.1:
+get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -7374,11 +7375,6 @@ is-url@^1.2.2:
   resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
   integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
 
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
 is-whitespace-character@^1.0.0:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-whitespace-character/-/is-whitespace-character-1.0.4.tgz#0858edd94a95594c7c9dd0b5c174ec6e45ee4aa7"
@@ -8137,17 +8133,6 @@ listenercount@~1.0.1:
   resolved "https://registry.yarnpkg.com/listenercount/-/listenercount-1.0.1.tgz#84c8a72ab59c4725321480c975e6508342e70937"
   integrity sha1-hMinKrWcRyUyFIDJdeZQg0LnCTc=
 
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -9824,13 +9809,6 @@ parse-entities@^1.0.2, parse-entities@^1.1.0:
     is-decimal "^1.0.0"
     is-hexadecimal "^1.0.0"
 
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -9910,13 +9888,6 @@ path-dirname@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -9959,15 +9930,6 @@ path-to-regexp@^1.7.0:
   dependencies:
     isarray "0.0.1"
 
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -10872,23 +10834,6 @@ read-package-tree@5.3.1:
     readdir-scoped-modules "^1.0.0"
     util-promisify "^2.1.0"
 
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -12381,7 +12326,7 @@ string-length@^1.0.0:
   dependencies:
     strip-ansi "^3.0.0"
 
-string-width@^1.0.1, string-width@^1.0.2:
+string-width@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
   integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
@@ -12513,13 +12458,6 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
-  dependencies:
-    is-utf8 "^0.2.0"
-
 strip-bom@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3"
@@ -14010,11 +13948,6 @@ when@~3.6.x:
   resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
   integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
 
-which-module@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
-  integrity sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=
-
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
@@ -14114,6 +14047,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -14246,7 +14188,7 @@ xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1:
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-y18n@^3.2.0, y18n@^3.2.1:
+y18n@^3.2.0:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41"
   integrity sha1-bRX7qITAhnnA136I53WegR4H+kE=
@@ -14256,6 +14198,11 @@ y18n@^3.2.0, y18n@^3.2.1:
   resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.0.tgz#95ef94f85ecc81d007c264e190a120f0a3c8566b"
   integrity sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==
 
+y18n@^5.0.2:
+  version "5.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.3.tgz#978115b82befe2b5c762bf55980b7b01a4a2d5d9"
+  integrity sha512-JeFbcHQ/7hVmMBXW6UB6Tg7apStHd/ztGz1JN78y3pFi/q0Ht1eA6PVkvw56gm7UA8fcJR/ziRlYEDMGoju0yQ==
+
 yallist@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
@@ -14295,12 +14242,10 @@ yargs-parser@^18.1.0, yargs-parser@^18.1.1, yargs-parser@^18.1.3:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
-  integrity sha1-J17PDX/+Bcd+ZOfIbkzZS/DhIoo=
-  dependencies:
-    camelcase "^3.0.0"
+yargs-parser@^20.2.2:
+  version "20.2.2"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.2.tgz#84562c6b1c41ccec2f13d346c7dd83f8d1a0dc70"
+  integrity sha512-XmrpXaTl6noDsf1dKpBuUNCOHqjs0g3jRMXf/ztRxdOmb+er8kE5z5b55Lz3p5u2T8KJ59ENBnASS8/iapVJ5g==
 
 yargs@15.3.0:
   version "15.3.0"
@@ -14383,24 +14328,18 @@ yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.1"
 
-yargs@^7.0.2:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
-  integrity sha1-a6MY6xaWFyf10oT46gA+jWFU0Mg=
+yargs@^16.1.0:
+  version "16.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.1.0.tgz#fc333fe4791660eace5a894b39d42f851cd48f2a"
+  integrity sha512-upWFJOmDdHN0syLuESuvXDmrRcWd1QafJolHskzaw79uZa7/x53gxQKiR07W59GWY1tFhhU/Th9DrtSfpS782g==
   dependencies:
-    camelcase "^3.0.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^1.4.0"
-    read-pkg-up "^1.0.1"
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
     require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^1.0.2"
-    which-module "^1.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^5.0.0"
+    string-width "^4.2.0"
+    y18n "^5.0.2"
+    yargs-parser "^20.2.2"
 
 yauzl@^2.10.0:
   version "2.10.0"

dev-infra/caretaker/check/g3.ts

@@ -35,31 +35,17 @@ export async function printG3Comparison(git: GitClient) {
     return;
   }
 
-  /** Random prefix to create unique branch names. */
-  const randomPrefix = `prefix${Math.floor(Math.random() * 1000000)}`;
-  /** Ref name of the temporary master branch. */
-  const masterRef = `${randomPrefix}-master`;
-  /** Ref name of the temporary g3 branch. */
-  const g3Ref = `${randomPrefix}-g3`;
-  /** Url of the ref for fetching master and g3 branches. */
-  const refUrl = `https://github.com/${git.remoteConfig.owner}/${git.remoteConfig.name}.git`;
-  /** The result fo the fetch command. */
-  const fetchResult =
-      git.runGraceful(['fetch', '-q', refUrl, `master:${masterRef}`, `g3:${g3Ref}`]);
+  /** The latest sha for the g3 branch. */
+  const g3Ref = getShaForBranchLatest('g3');
+  /** The latest sha for the master branch. */
+  const masterRef = getShaForBranchLatest('master');
 
-  // If the upstream repository does not have a g3 branch to compare to, skip the comparison.
-  if (fetchResult.status !== 0) {
-    if (fetchResult.stderr.includes(`couldn't find remote ref g3`)) {
-      return debug('No g3 branch exists on upstream, skipping.');
-    }
-    throw Error('Fetch of master and g3 branches for comparison failed.');
+  if (!g3Ref && !masterRef) {
+    return debug('Exiting early as either the g3 or master was unable to be retrieved');
   }
 
   /** The statistical information about the git diff between master and g3. */
-  const stats = getDiffStats(git);
-
-  // Delete the temporarily created mater and g3 branches.
-  git.runGraceful(['branch', '-D', masterRef, g3Ref]);
+  const stats = getDiffStats();
 
   info.group(bold('g3 branch check'));
   info(`${stats.commits} commits between g3 and master`);
@@ -73,11 +59,27 @@ export async function printG3Comparison(git: GitClient) {
   info();
 
 
+  /** Fetch and retrieve the latest sha for a specific branch. */
+  function getShaForBranchLatest(branch: string) {
+    /** The result fo the fetch command. */
+    const fetchResult = git.runGraceful([
+      'fetch', '-q', `https://github.com/${git.remoteConfig.owner}/${git.remoteConfig.name}.git`,
+      branch
+    ]);
+
+    if (fetchResult.status !== 0 &&
+        fetchResult.stderr.includes(`couldn't find remote ref ${branch}`)) {
+      debug(`No '${branch}' branch exists on upstream, skipping.`);
+      return false;
+    }
+    return git.runGraceful(['rev-parse', 'FETCH_HEAD']).stdout.trim();
+  }
+
   /**
    * Get git diff stats between master and g3, for all files and filtered to only g3 affecting
    * files.
    */
-  function getDiffStats(git: GitClient) {
+  function getDiffStats() {
     /** The diff stats to be returned. */
     const stats = {
       insertions: 0,
@@ -86,7 +88,6 @@ export async function printG3Comparison(git: GitClient) {
       commits: 0,
     };
 
-
     // Determine the number of commits between master and g3 refs. */
     stats.commits = parseInt(git.run(['rev-list', '--count', `${g3Ref}..${masterRef}`]).stdout, 10);
 

dev-infra/pr/merge/messages.ts

@@ -11,5 +11,11 @@ import {PullRequest} from './pull-request';
 
 export function getCaretakerNotePromptMessage(pullRequest: PullRequest): string {
   return red('Pull request has a caretaker note applied. Please make sure you read it.') +
-      `\nQuick link to PR: ${pullRequest.url}`;
+      `\nQuick link to PR: ${pullRequest.url}\nDo you want to proceed merging?`;
+}
+
+export function getTargettedBranchesConfirmationPromptMessage(pullRequest: PullRequest): string {
+  const targetBranchListAsString = pullRequest.targetBranches.map(b => ` - ${b}\n`).join('');
+  return `Pull request #${pullRequest.prNumber} will merge into:\n${
+      targetBranchListAsString}\nDo you want to proceed merging?`;
 }

dev-infra/pr/merge/task.ts

@@ -9,9 +9,9 @@
 import {promptConfirm} from '../../utils/console';
 import {GitClient, GitCommandError} from '../../utils/git';
 
-import {MergeConfig, MergeConfigWithRemote} from './config';
+import {MergeConfigWithRemote} from './config';
 import {PullRequestFailure} from './failures';
-import {getCaretakerNotePromptMessage} from './messages';
+import {getCaretakerNotePromptMessage, getTargettedBranchesConfirmationPromptMessage} from './messages';
 import {isPullRequest, loadAndValidatePullRequest,} from './pull-request';
 import {GithubApiMergeStrategy} from './strategies/api-merge';
 import {AutosquashMergeStrategy} from './strategies/autosquash-merge';
@@ -78,11 +78,16 @@ export class PullRequestMergeTask {
       return {status: MergeStatus.FAILED, failure: pullRequest};
     }
 
+
+    if (!await promptConfirm(getTargettedBranchesConfirmationPromptMessage(pullRequest))) {
+      return {status: MergeStatus.USER_ABORTED};
+    }
+
+
     // If the pull request has a caretaker note applied, raise awareness by prompting
     // the caretaker. The caretaker can then decide to proceed or abort the merge.
     if (pullRequest.hasCaretakerNote &&
-        !await promptConfirm(
-            getCaretakerNotePromptMessage(pullRequest) + `\nDo you want to proceed merging?`)) {
+        !await promptConfirm(getCaretakerNotePromptMessage(pullRequest))) {
       return {status: MergeStatus.USER_ABORTED};
     }
 

goldens/public-api/platform-server/platform-server.d.ts

@@ -3,6 +3,7 @@ export declare const BEFORE_APP_SERIALIZED: InjectionToken<(() => void | Promise
 export declare const INITIAL_CONFIG: InjectionToken<PlatformConfig>;
 
 export declare interface PlatformConfig {
+    baseUrl?: string;
     document?: string;
     url?: string;
     useAbsoluteUrl?: boolean;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "10.1.6",
+  "version": "10.2.0",
   "private": true,
   "description": "Angular - a web framework for modern web apps",
   "homepage": "https://github.com/angular/angular",
@@ -28,9 +28,6 @@
     "test-non-ivy": "bazelisk test --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only",
     "test-fixme-ivy-aot": "bazelisk test --config=ivy --build_tag_filters=-no-ivy-aot --test_tag_filters=-no-ivy-aot",
     "list-fixme-ivy-targets": "bazelisk query --output=label 'attr(\"tags\", \"\\[.*fixme-ivy.*\\]\", //...) except kind(\"sh_binary\", //...) except kind(\"devmode_js_sources\", //...)' | sort",
-    "//circleci-win-comment": "See the test-win circleci job for why these are needed. If they are not needed anymore, remove them.",
-    "circleci-win-ve": "bazelisk test --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only,-browser:chromium-local //packages/compiler-cli/... //tools/ts-api-guardian/...",
-    "circleci-win-ivy": "bazelisk test --config=ivy --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot --test_tag_filters=-no-ivy-aot,-fixme-ivy-aot,-browser:chromium-local //packages/compiler-cli/... //tools/ts-api-guardian/...",
     "lint": "yarn -s tslint && yarn -s ng-dev format changed --check",
     "tslint": "tsc -p tools/tsconfig.json && tslint -c tslint.json \"+(dev-infra|packages|modules|scripts|tools)/**/*.+(js|ts)\"",
     "public-api:check": "node goldens/public-api/manage.js test",

packages/core/src/render3/bindings.ts

@@ -11,7 +11,7 @@ import {assertIndexInRange, assertLessThan, assertNotSame} from '../util/assert'
 
 import {getExpressionChangedErrorDetails, throwErrorIfNoChangesMode} from './errors';
 import {LView} from './interfaces/view';
-import {getCheckNoChangesMode} from './state';
+import {isInCheckNoChangesMode} from './state';
 import {NO_CHANGE} from './tokens';
 
 
@@ -52,7 +52,7 @@ export function bindingUpdated(lView: LView, bindingIndex: number, value: any):
   if (Object.is(oldValue, value)) {
     return false;
   } else {
-    if (ngDevMode && getCheckNoChangesMode()) {
+    if (ngDevMode && isInCheckNoChangesMode()) {
       // View engine didn't report undefined values as changed on the first checkNoChanges pass
       // (before the change detection was run).
       const oldValueToCompare = oldValue !== NO_CHANGE ? oldValue : undefined;

packages/core/src/render3/hooks.ts

@@ -13,7 +13,7 @@ import {NgOnChangesFeatureImpl} from './features/ng_onchanges_feature';
 import {DirectiveDef} from './interfaces/definition';
 import {TNode} from './interfaces/node';
 import {FLAGS, HookData, InitPhaseState, LView, LViewFlags, PREORDER_HOOK_FLAGS, PreOrderHookFlags, TView} from './interfaces/view';
-import {getCheckNoChangesMode} from './state';
+import {isInCheckNoChangesMode} from './state';
 
 
 
@@ -205,8 +205,8 @@ function callHooks(
     currentNodeIndex: number|null|undefined): void {
   ngDevMode &&
       assertEqual(
-          getCheckNoChangesMode(), false,
-          'Hooks should never be run in the check no changes mode.');
+          isInCheckNoChangesMode(), false,
+          'Hooks should never be run when in check no changes mode.');
   const startIndex = currentNodeIndex !== undefined ?
       (currentView[PREORDER_HOOK_FLAGS] & PreOrderHookFlags.IndexOfTheNextPreOrderHookMaskMask) :
       0;

packages/core/src/render3/instructions/advance.ts

@@ -8,7 +8,7 @@
 import {assertGreaterThan, assertIndexInRange} from '../../util/assert';
 import {executeCheckHooks, executeInitAndCheckHooks} from '../hooks';
 import {FLAGS, HEADER_OFFSET, InitPhaseState, LView, LViewFlags, TView} from '../interfaces/view';
-import {getCheckNoChangesMode, getLView, getSelectedIndex, getTView, setSelectedIndex} from '../state';
+import {getLView, getSelectedIndex, getTView, isInCheckNoChangesMode, setSelectedIndex} from '../state';
 
 
 /**
@@ -36,7 +36,7 @@ import {getCheckNoChangesMode, getLView, getSelectedIndex, getTView, setSelected
  */
 export function ɵɵadvance(delta: number): void {
   ngDevMode && assertGreaterThan(delta, 0, 'Can only advance forward');
-  selectIndexInternal(getTView(), getLView(), getSelectedIndex() + delta, getCheckNoChangesMode());
+  selectIndexInternal(getTView(), getLView(), getSelectedIndex() + delta, isInCheckNoChangesMode());
 }
 
 export function selectIndexInternal(

packages/core/src/render3/instructions/all.ts

@@ -48,3 +48,4 @@ export * from './class_map_interpolation';
 export * from './style_map_interpolation';
 export * from './style_prop_interpolation';
 export * from './host_property';
+export * from './i18n';

packages/core/src/render3/instructions/i18n.ts

@@ -17,7 +17,7 @@ import {HEADER_OFFSET} from '../interfaces/view';
 import {getLView, getTView, nextBindingIndex} from '../state';
 import {getConstant} from '../util/view_utils';
 
-import {setDelayProjection} from './all';
+import {setDelayProjection} from './projection';
 
 /**
  * Marks a block of text as translatable.

packages/core/src/render3/instructions/shared.ts

@@ -33,7 +33,7 @@ import {isComponentDef, isComponentHost, isContentQueryHost, isLContainer, isRoo
 import {CHILD_HEAD, CHILD_TAIL, CLEANUP, CONTEXT, DECLARATION_COMPONENT_VIEW, DECLARATION_VIEW, FLAGS, HEADER_OFFSET, HOST, InitPhaseState, INJECTOR, LView, LViewFlags, NEXT, PARENT, RENDERER, RENDERER_FACTORY, RootContext, RootContextFlags, SANITIZER, T_HOST, TData, TRANSPLANTED_VIEWS_TO_REFRESH, TVIEW, TView, TViewType} from '../interfaces/view';
 import {assertNodeNotOfTypes, assertNodeOfPossibleTypes} from '../node_assert';
 import {isInlineTemplate, isNodeMatchingSelectorList} from '../node_selector_matcher';
-import {enterView, getBindingsEnabled, getCheckNoChangesMode, getCurrentDirectiveIndex, getCurrentTNode, getSelectedIndex, isCurrentTNodeParent, leaveView, setBindingIndex, setBindingRootForHostBindings, setCheckNoChangesMode, setCurrentDirectiveIndex, setCurrentQueryIndex, setCurrentTNode, setSelectedIndex} from '../state';
+import {enterView, getBindingsEnabled, getCurrentDirectiveIndex, getCurrentTNode, getSelectedIndex, isCurrentTNodeParent, isInCheckNoChangesMode, leaveView, setBindingIndex, setBindingRootForHostBindings, setCurrentDirectiveIndex, setCurrentQueryIndex, setCurrentTNode, setIsInCheckNoChangesMode, setSelectedIndex} from '../state';
 import {NO_CHANGE} from '../tokens';
 import {isAnimationProp, mergeHostAttrs} from '../util/attrs_utils';
 import {INTERPOLATION_DELIMITER, renderStringify, stringifyForError} from '../util/misc_utils';
@@ -383,7 +383,9 @@ export function refreshView<T>(
   const flags = lView[FLAGS];
   if ((flags & LViewFlags.Destroyed) === LViewFlags.Destroyed) return;
   enterView(lView);
-  const checkNoChangesMode = getCheckNoChangesMode();
+  // Check no changes mode is a dev only mode used to verify that bindings have not changed
+  // since they were assigned. We do not want to execute lifecycle hooks in that mode.
+  const isInCheckNoChangesPass = isInCheckNoChangesMode();
   try {
     resetPreOrderHookFlags(lView);
 
@@ -397,7 +399,7 @@ export function refreshView<T>(
 
     // execute pre-order hooks (OnInit, OnChanges, DoCheck)
     // PERF WARNING: do NOT extract this to a separate function without running benchmarks
-    if (!checkNoChangesMode) {
+    if (!isInCheckNoChangesPass) {
       if (hooksInitPhaseCompleted) {
         const preOrderCheckHooks = tView.preOrderCheckHooks;
         if (preOrderCheckHooks !== null) {
@@ -425,7 +427,7 @@ export function refreshView<T>(
 
     // execute content hooks (AfterContentInit, AfterContentChecked)
     // PERF WARNING: do NOT extract this to a separate function without running benchmarks
-    if (!checkNoChangesMode) {
+    if (!isInCheckNoChangesPass) {
       if (hooksInitPhaseCompleted) {
         const contentCheckHooks = tView.contentCheckHooks;
         if (contentCheckHooks !== null) {
@@ -459,7 +461,7 @@ export function refreshView<T>(
 
     // execute view hooks (AfterViewInit, AfterViewChecked)
     // PERF WARNING: do NOT extract this to a separate function without running benchmarks
-    if (!checkNoChangesMode) {
+    if (!isInCheckNoChangesPass) {
       if (hooksInitPhaseCompleted) {
         const viewCheckHooks = tView.viewCheckHooks;
         if (viewCheckHooks !== null) {
@@ -489,7 +491,7 @@ export function refreshView<T>(
     // refresh a `NgClass` binding should work. If we would reset the dirty state in the check
     // no changes cycle, the component would be not be dirty for the next update pass. This would
     // be different in production mode where the component dirty state is not reset.
-    if (!checkNoChangesMode) {
+    if (!isInCheckNoChangesPass) {
       lView[FLAGS] &= ~(LViewFlags.Dirty | LViewFlags.FirstLViewPass);
     }
     if (lView[FLAGS] & LViewFlags.RefreshTransplantedView) {
@@ -504,7 +506,7 @@ export function refreshView<T>(
 export function renderComponentOrTemplate<T>(
     tView: TView, lView: LView, templateFn: ComponentTemplate<{}>|null, context: T) {
   const rendererFactory = lView[RENDERER_FACTORY];
-  const normalExecutionPath = !getCheckNoChangesMode();
+  const normalExecutionPath = !isInCheckNoChangesMode();
   const creationModeIsActive = isCreationMode(lView);
   try {
     if (normalExecutionPath && !creationModeIsActive && rendererFactory.begin) {
@@ -529,7 +531,7 @@ function executeTemplate<T>(
     if (rf & RenderFlags.Update && lView.length > HEADER_OFFSET) {
       // When we're updating, inherently select 0 so we don't
       // have to generate that instruction for most update blocks.
-      selectIndexInternal(tView, lView, 0, getCheckNoChangesMode());
+      selectIndexInternal(tView, lView, 0, isInCheckNoChangesMode());
     }
     templateFn(rf, context);
   } finally {
@@ -1918,11 +1920,11 @@ export function detectChangesInRootView(lView: LView): void {
 }
 
 export function checkNoChangesInternal<T>(tView: TView, view: LView, context: T) {
-  setCheckNoChangesMode(true);
+  setIsInCheckNoChangesMode(true);
   try {
     detectChangesInternal(tView, view, context);
   } finally {
-    setCheckNoChangesMode(false);
+    setIsInCheckNoChangesMode(false);
   }
 }
 
@@ -1936,11 +1938,11 @@ export function checkNoChangesInternal<T>(tView: TView, view: LView, context: T)
  * @param lView The view which the change detection should be checked on.
  */
 export function checkNoChangesInRootView(lView: LView): void {
-  setCheckNoChangesMode(true);
+  setIsInCheckNoChangesMode(true);
   try {
     detectChangesInRootView(lView);
   } finally {
-    setCheckNoChangesMode(false);
+    setIsInCheckNoChangesMode(false);
   }
 }
 

packages/core/src/render3/state.ts

@@ -159,14 +159,17 @@ interface InstructionState {
    * In this mode, any changes in bindings will throw an ExpressionChangedAfterChecked error.
    *
    * Necessary to support ChangeDetectorRef.checkNoChanges().
+   *
+   * checkNoChanges Runs only in devmode=true and verifies that no unintended changes exist in
+   * the change detector or its children.
    */
-  checkNoChangesMode: boolean;
+  isInCheckNoChangesMode: boolean;
 }
 
 export const instructionState: InstructionState = {
   lFrame: createLFrame(null),
   bindingsEnabled: true,
-  checkNoChangesMode: false,
+  isInCheckNoChangesMode: false,
 };
 
 
@@ -287,13 +290,13 @@ export function getContextLView(): LView {
   return instructionState.lFrame.contextLView;
 }
 
-export function getCheckNoChangesMode(): boolean {
+export function isInCheckNoChangesMode(): boolean {
   // TODO(misko): remove this from the LView since it is ngDevMode=true mode only.
-  return instructionState.checkNoChangesMode;
+  return instructionState.isInCheckNoChangesMode;
 }
 
-export function setCheckNoChangesMode(mode: boolean): void {
-  instructionState.checkNoChangesMode = mode;
+export function setIsInCheckNoChangesMode(mode: boolean): void {
+  instructionState.isInCheckNoChangesMode = mode;
 }
 
 // top level variables should not be exported for performance reasons (PERF_NOTES.md)

packages/core/src/util/ng_dev_mode.ts

@@ -115,7 +115,7 @@ export function initNgDevMode(): boolean {
     if (typeof ngDevMode !== 'object') {
       ngDevModeResetPerfCounters();
     }
-    return !!ngDevMode;
+    return typeof ngDevMode !== 'undefined' && !!ngDevMode;
   }
   return false;
 }

packages/core/test/bundling/cyclic_import/bundle.golden_symbols.json

@@ -156,7 +156,7 @@
     "name": "generatePropertyAliases"
   },
   {
-    "name": "getCheckNoChangesMode"
+    "name": "isInCheckNoChangesMode"
   },
   {
     "name": "getClosureSafeProperty"

packages/core/test/bundling/forms/bundle.golden_symbols.json

@@ -951,7 +951,7 @@
     "name": "generatePropertyAliases"
   },
   {
-    "name": "getCheckNoChangesMode"
+    "name": "isInCheckNoChangesMode"
   },
   {
     "name": "getClosureSafeProperty"
@@ -1488,7 +1488,7 @@
     "name": "setBindingRootForHostBindings"
   },
   {
-    "name": "setCheckNoChangesMode"
+    "name": "setIsInCheckNoChangesMode"
   },
   {
     "name": "setCurrentDirectiveIndex"

packages/core/test/bundling/hello_world/bundle.golden_symbols.json

@@ -108,7 +108,7 @@
     "name": "extractPipeDef"
   },
   {
-    "name": "getCheckNoChangesMode"
+    "name": "isInCheckNoChangesMode"
   },
   {
     "name": "getClosureSafeProperty"

packages/core/test/bundling/router/bundle.golden_symbols.json

@@ -1263,7 +1263,7 @@
     "name": "getBootstrapListener"
   },
   {
-    "name": "getCheckNoChangesMode"
+    "name": "isInCheckNoChangesMode"
   },
   {
     "name": "getClosureSafeProperty"
@@ -1821,7 +1821,7 @@
     "name": "setBindingRootForHostBindings"
   },
   {
-    "name": "setCheckNoChangesMode"
+    "name": "setIsInCheckNoChangesMode"
   },
   {
     "name": "setCurrentDirectiveIndex"

packages/core/test/bundling/todo/bundle.golden_symbols.json

@@ -330,7 +330,7 @@
     "name": "generatePropertyAliases"
   },
   {
-    "name": "getCheckNoChangesMode"
+    "name": "isInCheckNoChangesMode"
   },
   {
     "name": "getClosureSafeProperty"
@@ -642,7 +642,7 @@
     "name": "setBindingRootForHostBindings"
   },
   {
-    "name": "setCheckNoChangesMode"
+    "name": "setIsInCheckNoChangesMode"
   },
   {
     "name": "setCurrentDirectiveIndex"

packages/core/test/render3/perf/BUILD.bazel

@@ -227,7 +227,20 @@ ng_rollup_bundle(
 
 ng_benchmark(
     name = "host_binding",
-    bundle = ":host_binding",
+    bundle = ":host_binding_lib",
+)
+
+ng_rollup_bundle(
+    name = "i18n_lib",
+    entry_point = ":i18n/index.ts",
+    deps = [
+        ":perf_lib",
+    ],
+)
+
+ng_benchmark(
+    name = "i18n",
+    bundle = ":i18n_lib",
 )
 
 ng_rollup_bundle(