docs: add changelog for 5.2.5

fixes #22089

PR Close #22154

.circleci/bazel.rc

@@ -15,16 +15,11 @@ build --experimental_remote_spawn_cache --remote_rest_cache=http://localhost:764
 # Prevent unstable environment variables from tainting cache keys
 build --experimental_strict_action_env
 
-# Save downloaded repositories such as the go toolchain
-# This directory can then be included in the CircleCI cache
-# It should save time running the first build
-build --experimental_repository_cache=/home/circleci/bazel_repository_cache
-
 # Workaround https://github.com/bazelbuild/bazel/issues/3645
 # Bazel doesn't calculate the memory ceiling correctly when running under Docker.
-# Limit Bazel to consuming resources that fit in CircleCI "xlarge" class
+# Limit Bazel to consuming resources that fit in CircleCI "medium" class which is the default:
 # https://circleci.com/docs/2.0/configuration-reference/#resource_class
-build --local_resources=14336,8.0,1.0
+build --local_resources=3072,2.0,1.0
 
 # Retry in the event of flakes, eg. https://circleci.com/gh/angular/angular/31309
 test --flaky_test_attempts=2

.circleci/config.yml

@@ -13,7 +13,7 @@
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
 var_1: &docker_image angular/ngcontainer:0.1.0
-var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.1.0
+var_2: &cache_key angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.1.0
 
 # See remote cache documentation in /docs/BAZEL.md
 var_3: &setup-bazel-remote-cache
@@ -41,14 +41,14 @@ jobs:
     steps:
       - checkout:
           <<: *post_checkout
+      # See remote cache documentation in /docs/BAZEL.md
+      - run: .circleci/setup_cache.sh
+      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
+      - *setup-bazel-remote-cache
 
-      # Check BUILD.bazel formatting before we have a node_modules directory
-      # Then we don't need any exclude pattern to avoid checking those files
-      - run: 'buildifier -mode=check $(find . -type f \( -name BUILD.bazel -or -name BUILD \)) ||
-              (echo "BUILD files not formatted. Please run ''yarn buildifier''" ; exit 1)'
-      # Run the skylark linter to check our Bazel rules
-      - run: 'find . -type f -name "*.bzl" |
-              xargs java -jar /usr/local/bin/Skylint_deploy.jar ||
+      - run: 'yarn buildifier -mode=check ||
+              (echo -e "\nBUILD files not formatted. Please run ''yarn buildifier''" ; exit 1)'
+      - run: 'yarn skylint ||
               (echo -e "\n.bzl files have lint errors. Please run ''yarn skylint''"; exit 1)'
 
       - restore_cache:
@@ -59,7 +59,7 @@ jobs:
 
   build:
     <<: *job_defaults
-    resource_class: xlarge
+    resource_class: large
     steps:
       - checkout:
           <<: *post_checkout
@@ -71,7 +71,6 @@ jobs:
       - restore_cache:
           key: *cache_key
 
-      - run: ls /home/circleci/bazel_repository_cache || true
       - run: bazel info release
       - run: bazel run @yarn//:yarn
       # Use bazel query so that we explicitly ask for all buildable targets to be built as well
@@ -79,20 +78,10 @@ jobs:
       # See https://github.com/bazelbuild/bazel/issues/4257
       - run: bazel query --output=label '//modules/... union //packages/... union //tools/...' | xargs bazel test
 
-      # CircleCI will allow us to go back and view/download these artifacts from past builds.
-      # Also we can use a service like https://buildsize.org/ to automatically track binary size of these artifacts.
-      - store_artifacts:
-          path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js
-          destination: packages/core/test/bundling/hello_world/bundle.min.js
-      - store_artifacts:
-          path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js.brotli
-          destination: packages/core/test/bundling/hello_world/bundle.min.js.brotli
-
       - save_cache:
           key: *cache_key
           paths:
             - "node_modules"
-            - "~/bazel_repository_cache"
 
 workflows:
   version: 2

.github/ISSUE_TEMPLATE.md

@@ -25,7 +25,7 @@ ISSUES MISSING IMPORTANT INFORMATION MAY BE CLOSED WITHOUT INVESTIGATION.
 ## Minimal reproduction of the problem with instructions
 <!--
 For bug reports please provide the *STEPS TO REPRODUCE* and if possible a *MINIMAL DEMO* of the problem via
-https://stackblitz.com or similar (you can use this template as a starting point: https://stackblitz.com/fork/angular-gitter).
+https://plnkr.co or similar (you can use this template as a starting point: http://plnkr.co/edit/tpl:AvJOMERrnz94ekVua0u5).
 -->
 
 ## What is the motivation / use case for changing the behavior?

.github/angular-robot.yml

@@ -26,7 +26,9 @@ merge:
     # list of patterns to check for the files changed by the PR
     # this list must be manually kept in sync with google3/third_party/javascript/angular2/copy.bara.sky
     include:
+      - "BUILD.bazel"
       - "LICENSE"
+      - "WORKSPACE"
       - "modules/**"
       - "packages/**"
     # list of patterns to ignore for the files changed by the PR
@@ -34,11 +36,6 @@ merge:
       - "packages/language-service/**"
       - "**/.gitignore"
       - "**/.gitkeep"
-      - "**/tsconfig-build.json"
-      - "**/tsconfig.json"
-      - "**/rollup.config.js"
-      - "**/BUILD.bazel"
-      - "packages/**/test/**"
 
   # comment that will be added to a PR when there is a conflict, leave empty or set to false to disable
   mergeConflictComment: "Hi @{{PRAuthor}}! This PR has merge conflicts due to recent upstream merges.
@@ -83,14 +80,12 @@ merge:
 
 # options for the triage plugin
 triage:
-  # number of the milestone to apply when the issue has not been triaged yet
-  needsTriageMilestone: 83,
   # number of the milestone to apply when the issue is triaged
   defaultMilestone: 82,
   # arrays of labels that determine if an issue is triaged
   triagedLabels:
     -
-      - "type: bug/fix"
+      - "type: bug"
       - "severity*"
       - "freq*"
       - "comp: *"

.pullapprove.yml

@@ -68,7 +68,6 @@ groups:
           - "packages/*"
           - "tools/*"
     users:
-      - alexeagle
       - IgorMinar
       - mhevery
 
@@ -208,12 +207,6 @@ groups:
     conditions:
       files:
         - "packages/forms/*"
-        - "aio/content/guide/forms.md"
-        - "aio/content/guide/form-validation.md"
-        - "aio/content/guide/reactive-forms.md"
-        - "aio/content/examples/forms/*"
-        - "aio/content/examples/form-validation/*"
-        - "aio/content/examples/reactive-forms/*"
     users:
       - kara #primary
       - tinayuangao #secondary

BUILD.bazel

@@ -2,16 +2,8 @@ package(default_visibility = ["//visibility:public"])
 
 exports_files([
     "tsconfig.json",
-    "LICENSE",
 ])
 
-# Developers should always run `bazel run :install`
-# This ensures that package.json in subdirectories get installed as well.
-alias(
-    name = "install",
-    actual = "@yarn//:yarn",
-)
-
 # This rule belongs in node_modules/BUILD
 # It's here as a workaround for
 # https://github.com/bazelbuild/bazel/issues/374#issuecomment-296217940
@@ -40,7 +32,6 @@ filegroup(
         "reflect-metadata",
         "source-map-support",
         "minimist",
-        "tslib",
     ] for ext in [
         "*.js",
         "*.json",
@@ -57,7 +48,6 @@ filegroup(
         "//:node_modules/zone.js/dist/async-test.js",
         "//:node_modules/zone.js/dist/sync-test.js",
         "//:node_modules/zone.js/dist/fake-async-test.js",
-        "//:node_modules/zone.js/dist/task-tracking.js",
         "//:node_modules/zone.js/dist/proxy.js",
         "//:node_modules/zone.js/dist/jasmine-patch.js",
     ],

CHANGELOG.md

@@ -1,250 +1,21 @@
-<a name="6.0.0-beta.7"></a>
-# [6.0.0-beta.7](https://github.com/angular/angular/compare/6.0.0-beta.6...6.0.0-beta.7) (2018-03-07)
-
-
-### Bug Fixes
-
-* **bazel:** fixes for ng_package on Windows ([#22597](https://github.com/angular/angular/issues/22597)) ([4c40812](https://github.com/angular/angular/commit/4c40812))
-* **compiler:** allow tree-shakeable injectables to depend on string tokens ([#22376](https://github.com/angular/angular/issues/22376)) ([dd53447](https://github.com/angular/angular/commit/dd53447))
-* **router:** fix URL serialization so special characters are only encoded where needed ([#22337](https://github.com/angular/angular/issues/22337)) ([fa974c7](https://github.com/angular/angular/commit/fa974c7)), closes [#10280](https://github.com/angular/angular/issues/10280)
-
-
-
-<a name="5.2.8"></a>
-## [5.2.8](https://github.com/angular/angular/compare/5.2.7...5.2.8) (2018-03-07)
-
-
-### Bug Fixes
-
-* **platform-server:** generate correct stylings for camel case names ([#22263](https://github.com/angular/angular/issues/22263)) ([de02a7a](https://github.com/angular/angular/commit/de02a7a)), closes [#19235](https://github.com/angular/angular/issues/19235)
-* **router:** don't mutate route configs ([#22358](https://github.com/angular/angular/issues/22358)) ([8f0a064](https://github.com/angular/angular/commit/8f0a064)), closes [#22203](https://github.com/angular/angular/issues/22203)
-* **router:** fix URL serialization so special characters are only encoded where needed ([#22337](https://github.com/angular/angular/issues/22337)) ([789a47e](https://github.com/angular/angular/commit/789a47e)), closes [#10280](https://github.com/angular/angular/issues/10280)
-* **upgrade:** correctly destroy nested downgraded component ([#22400](https://github.com/angular/angular/issues/22400)) ([4aef9de](https://github.com/angular/angular/commit/4aef9de)), closes [#22392](https://github.com/angular/angular/issues/22392)
-* **upgrade:** correctly handle `=` bindings in `[@angular](https://github.com/angular)/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([6638390](https://github.com/angular/angular/commit/6638390))
-* **upgrade:** fix empty transclusion content with AngularJS@>=1.5.8 ([#22167](https://github.com/angular/angular/issues/22167)) ([a9a0e27](https://github.com/angular/angular/commit/a9a0e27)), closes [#22175](https://github.com/angular/angular/issues/22175)
-
-
-<a name="6.0.0-beta.6"></a>
-# [6.0.0-beta.6](https://github.com/angular/angular/compare/6.0.0-beta.5...6.0.0-beta.6) (2018-02-28)
-
-
-### Bug Fixes
-
-* **animations:** only use the WA-polyfill alongside AnimationBuilder ([#22143](https://github.com/angular/angular/issues/22143)) ([b2f366b](https://github.com/angular/angular/commit/b2f366b)), closes [#17496](https://github.com/angular/angular/issues/17496)
-* **animations:** report correct totalTime value even during noOp animations ([#22225](https://github.com/angular/angular/issues/22225)) ([e1bf067](https://github.com/angular/angular/commit/e1bf067))
-* **bazel:** ng_package includes transitive .d.ts and flatModuleMetadata ([#22499](https://github.com/angular/angular/issues/22499)) ([aabe16c](https://github.com/angular/angular/commit/aabe16c)), closes [#22419](https://github.com/angular/angular/issues/22419)
-* **common:** correct mapping of Observable methods ([#20518](https://github.com/angular/angular/issues/20518)) ([2639b4b](https://github.com/angular/angular/commit/2639b4b)), closes [#20516](https://github.com/angular/angular/issues/20516)
-* **common:** then and else template might be set to null ([#22298](https://github.com/angular/angular/issues/22298)) ([8115edc](https://github.com/angular/angular/commit/8115edc))
-* **compiler-cli:** add missing entry point to package, update tsickle ([#22295](https://github.com/angular/angular/issues/22295)) ([28ac244](https://github.com/angular/angular/commit/28ac244))
-* **core:** export inject() from [@angular](https://github.com/angular)/core ([#22389](https://github.com/angular/angular/issues/22389)) ([f8749bf](https://github.com/angular/angular/commit/f8749bf)), closes [#22388](https://github.com/angular/angular/issues/22388)
-* **core:** properly handle function without prototype in reflector ([#22284](https://github.com/angular/angular/issues/22284)) ([a7ebf5a](https://github.com/angular/angular/commit/a7ebf5a)), closes [#19978](https://github.com/angular/angular/issues/19978)
-* **core:** require factory to be provided for shakeable InjectionToken ([#22207](https://github.com/angular/angular/issues/22207)) ([f755db7](https://github.com/angular/angular/commit/f755db7)), closes [#22205](https://github.com/angular/angular/issues/22205)
-* **forms:** set state before emitting a value from ngModelChange ([#21514](https://github.com/angular/angular/issues/21514)) ([3e6a86f](https://github.com/angular/angular/commit/3e6a86f)), closes [#21513](https://github.com/angular/angular/issues/21513)
-* **platform-server:** generate correct stylings for camel case names ([#22263](https://github.com/angular/angular/issues/22263)) ([40ba009](https://github.com/angular/angular/commit/40ba009)), closes [#19235](https://github.com/angular/angular/issues/19235)
-* **router:** don't mutate route configs ([#22358](https://github.com/angular/angular/issues/22358)) ([45eff4c](https://github.com/angular/angular/commit/45eff4c)), closes [#22203](https://github.com/angular/angular/issues/22203)
-* **router:** fix URL serialization so special characters are only encoded where needed ([#22337](https://github.com/angular/angular/issues/22337)) ([094666d](https://github.com/angular/angular/commit/094666d)), closes [#10280](https://github.com/angular/angular/issues/10280)
-* **upgrade:** correctly destroy nested downgraded component ([#22400](https://github.com/angular/angular/issues/22400)) ([8a85888](https://github.com/angular/angular/commit/8a85888)), closes [#22392](https://github.com/angular/angular/issues/22392)
-* **upgrade:** correctly handle `=` bindings in `[@angular](https://github.com/angular)/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([f089bf5](https://github.com/angular/angular/commit/f089bf5))
-* **upgrade:** fix empty transclusion content with AngularJS@>=1.5.8 ([#22167](https://github.com/angular/angular/issues/22167)) ([13ab91e](https://github.com/angular/angular/commit/13ab91e)), closes [#22175](https://github.com/angular/angular/issues/22175)
-
-
-### Features
-
-* **bazel:** add an ng_package rule ([#22221](https://github.com/angular/angular/issues/22221)) ([b43b164](https://github.com/angular/angular/commit/b43b164))
-* **bazel:** introduce a binary stamping feature ([#22176](https://github.com/angular/angular/issues/22176)) ([bba65e0](https://github.com/angular/angular/commit/bba65e0))
-* **bazel:** ng_module produces bundle index ([#22176](https://github.com/angular/angular/issues/22176)) ([029dbf0](https://github.com/angular/angular/commit/029dbf0))
-* **bazel:** ng_package adds package.json props ([#22499](https://github.com/angular/angular/issues/22499)) ([b6c9410](https://github.com/angular/angular/commit/b6c9410)), closes [#22416](https://github.com/angular/angular/issues/22416)
-* **common:** better error message when non-template element used in NgIf ([#22274](https://github.com/angular/angular/issues/22274)) ([67cf11d](https://github.com/angular/angular/commit/67cf11d)), closes [#16410](https://github.com/angular/angular/issues/16410)
-* **common:** export functions to format numbers, percents, currencies & dates ([#22423](https://github.com/angular/angular/issues/22423)) ([4180912](https://github.com/angular/angular/commit/4180912)), closes [#20536](https://github.com/angular/angular/issues/20536)
-* **compiler-cli:** Check unvalidated combination of ngc and TypeScript ([#22293](https://github.com/angular/angular/issues/22293)) ([3ceee99](https://github.com/angular/angular/commit/3ceee99)), closes [#20669](https://github.com/angular/angular/issues/20669)
-* **core:** set preserveWhitespaces to false by default ([#22046](https://github.com/angular/angular/issues/22046)) ([f1a0632](https://github.com/angular/angular/commit/f1a0632)), closes [#22027](https://github.com/angular/angular/issues/22027)
-* **core:** support metadata reflection for native class types ([#22356](https://github.com/angular/angular/issues/22356)) ([5c89d6b](https://github.com/angular/angular/commit/5c89d6b)), closes [#21731](https://github.com/angular/angular/issues/21731)
-* **core:** support metadata reflection for native class types ([#22356](https://github.com/angular/angular/issues/22356)) ([b7544cc](https://github.com/angular/angular/commit/b7544cc)), closes [#21731](https://github.com/angular/angular/issues/21731)
-* **forms:** allow markAsPending to emit events ([#20212](https://github.com/angular/angular/issues/20212)) ([e86b64b](https://github.com/angular/angular/commit/e86b64b)), closes [#17958](https://github.com/angular/angular/issues/17958)
-* allow direct scoping of @Injectables to the root injector ([#22185](https://github.com/angular/angular/issues/22185)) ([7ac34e4](https://github.com/angular/angular/commit/7ac34e4))
-* **platform-browser:** do not throw error when Hammer.js not loaded ([#22257](https://github.com/angular/angular/issues/22257)) ([991300b](https://github.com/angular/angular/commit/991300b)), closes [#16992](https://github.com/angular/angular/issues/16992)
-* **platform-browser:** fix [#19604](https://github.com/angular/angular/issues/19604), can config hammerOptions ([#21979](https://github.com/angular/angular/issues/21979)) ([1d571b2](https://github.com/angular/angular/commit/1d571b2))
-* **platform-server:** bump Domino to v2.0 ([#22411](https://github.com/angular/angular/issues/22411)) ([d3827a0](https://github.com/angular/angular/commit/d3827a0))
-
-
-### BREAKING CHANGES
-
-* **platform-server:** * Bump the dependency on Domino to 2.0 to resolve issues with
-  namespacing
-* **forms:** - `AbstractControl#statusChanges` now emits an event of `'PENDING'` when you call `AbstractControl#markAsPending`
-- Previously it did not emit an event when you called `markAsPending`
-- To migrate you would need to ensure that if you are filtering or checking events from `statusChanges` that you account for the new event when calling `markAsPending`
-* **animations:** When animation is trigged within a disabled zone, the
-associated event (which an instance of AnimationEvent) will no longer
-report the totalTime as 0 (it will emit the actual time of the
-animation). To detect if an animation event is reporting a disabled
-animation then the `event.disabled` property can be used instead.
-
-
-
-<a name="5.2.7"></a>
-## [5.2.7](https://github.com/angular/angular/compare/5.2.6...5.2.7) (2018-02-28)
-
-
-### Bug Fixes
-
-* **platform-server:** generate correct stylings for camel case names ([#22263](https://github.com/angular/angular/issues/22263)) ([de02a7a](https://github.com/angular/angular/commit/de02a7a)), closes [#19235](https://github.com/angular/angular/issues/19235)
-* **router:** don't mutate route configs ([#22358](https://github.com/angular/angular/issues/22358)) ([8f0a064](https://github.com/angular/angular/commit/8f0a064)), closes [#22203](https://github.com/angular/angular/issues/22203)
-* **upgrade:** correctly destroy nested downgraded component ([#22400](https://github.com/angular/angular/issues/22400)) ([4aef9de](https://github.com/angular/angular/commit/4aef9de)), closes [#22392](https://github.com/angular/angular/issues/22392)
-* **upgrade:** correctly handle `=` bindings in `[@angular](https://github.com/angular)/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([6638390](https://github.com/angular/angular/commit/6638390))
-* **upgrade:** fix empty transclusion content with AngularJS@>=1.5.8 ([#22167](https://github.com/angular/angular/issues/22167)) ([a9a0e27](https://github.com/angular/angular/commit/a9a0e27)), closes [#22175](https://github.com/angular/angular/issues/22175)
-
-<a name="6.0.0-beta.5"></a>
-# [6.0.0-beta.5](https://github.com/angular/angular/compare/6.0.0-beta.4...6.0.0-beta.5) (2018-02-22)
-
-### Bug Fixes
-
-* **animations:** report correct totalTime value even during noOp animations ([#22225](https://github.com/angular/angular/issues/22225)) ([e1bf067](https://github.com/angular/angular/commit/e1bf067))
-* **common:** correct mapping of Observable methods ([#20518](https://github.com/angular/angular/issues/20518)) ([2639b4b](https://github.com/angular/angular/commit/2639b4b)), closes [#20516](https://github.com/angular/angular/issues/20516)
-* **common:** then and else template might be set to null ([#22298](https://github.com/angular/angular/issues/22298)) ([8115edc](https://github.com/angular/angular/commit/8115edc))
-* **compiler-cli:** add missing entry point to package, update tsickle ([#22295](https://github.com/angular/angular/issues/22295)) ([28ac244](https://github.com/angular/angular/commit/28ac244))
-* **core:** properly handle function without prototype in reflector ([#22284](https://github.com/angular/angular/issues/22284)) ([a7ebf5a](https://github.com/angular/angular/commit/a7ebf5a)), closes [#19978](https://github.com/angular/angular/issues/19978)
-* **core:** require factory to be provided for shakeable InjectionToken ([#22207](https://github.com/angular/angular/issues/22207)) ([f755db7](https://github.com/angular/angular/commit/f755db7)), closes [#22205](https://github.com/angular/angular/issues/22205)
-* **forms:** set state before emitting a value from ngModelChange ([#21514](https://github.com/angular/angular/issues/21514)) ([3e6a86f](https://github.com/angular/angular/commit/3e6a86f)), closes [#21513](https://github.com/angular/angular/issues/21513)
-* **core:** set `preserveWhitespaces` to false by default ([#22046](https://github.com/angular/angular/issues/22046)) ([f1a0632](https://github.com/angular/angular/commit/f1a0632)), closes [#22027](https://github.com/angular/angular/issues/22027)
-
-### Features
-
-* **common:** better error message when non-template element used in NgIf ([#22274](https://github.com/angular/angular/issues/22274)) ([67cf11d](https://github.com/angular/angular/commit/67cf11d)), closes [#16410](https://github.com/angular/angular/issues/16410)
-* **compiler-cli:** Check unvalidated combination of ngc and TypeScript ([#22293](https://github.com/angular/angular/issues/22293)) ([3ceee99](https://github.com/angular/angular/commit/3ceee99)), closes [#20669](https://github.com/angular/angular/issues/20669)
-* **core:** support metadata reflection for native class types ([#22356](https://github.com/angular/angular/issues/22356)) ([5c89d6b](https://github.com/angular/angular/commit/5c89d6b)), closes [#21731](https://github.com/angular/angular/issues/21731)
-* **platform-browser:** do not throw error when Hammer.js not loaded ([#22257](https://github.com/angular/angular/issues/22257)) ([991300b](https://github.com/angular/angular/commit/991300b)), closes [#16992](https://github.com/angular/angular/issues/16992)
-* **platform-browser:** fix [#19604](https://github.com/angular/angular/issues/19604), can config hammerOptions ([#21979](https://github.com/angular/angular/issues/21979)) ([1d571b2](https://github.com/angular/angular/commit/1d571b2))
-
-### BREAKING CHANGES
-
-* **animations:** When animation is triggered within a disabled zone, the
-associated event (which an instance of AnimationEvent) will no longer
-report the totalTime as 0 (it will emit the actual time of the
-animation). To detect if an animation event is reporting a disabled
-animation then the `event.disabled` property can be used instead.
-
-* **forms:** ngModelChange is now emitted after the value/validity is updated on its control.
-
-Previously, ngModelChange was emitted before its underlying control was updated.
-This was fine if you passed through the value directly through the $event keyword, e.g.
-
-```
-<input [(ngModel)]="name" (ngModelChange)="onChange($event)">
-
-onChange(value) {
-   console.log(value);               // would log updated value
-}
-```
-
-However, if you had a handler for the ngModelChange event that checked the value through the control,
-you would get the old value rather than the updated value. e.g:
-
-```
-<input #modelDir="ngModel" [(ngModel)]="name" (ngModelChange)="onChange(modelDir)">
-
-onChange(ngModel: NgModel) {
-  console.log(ngModel.value);        // would log old value, not updated value
-}
-```
-
-Now the value and validity will be updated before the ngModelChange event is emitted,
-so the same setup will log the updated value.
-
-```
-onChange(ngModel: NgModel) {
-   console.log(ngModel.value);       // will log updated value
-}
-```
-
-We think this order will be less confusing when the control is checked directly.
-You will only need to update your app if it has relied on this bug to keep track of the old control value.
-If that is the case, you should be able to track the old value directly by saving it on your component.
-
-<a name="5.2.6"></a>
-## [5.2.6](https://github.com/angular/angular/compare/5.2.5...5.2.6) (2018-02-22)
-
-### Bug Fixes
-
-* **common:** correct mapping of Observable methods ([#20518](https://github.com/angular/angular/issues/20518)) ([ce5e8fa](https://github.com/angular/angular/commit/ce5e8fa)), closes [#20516](https://github.com/angular/angular/issues/20516)
-* **common:** then and else template might be set to null ([#22298](https://github.com/angular/angular/issues/22298)) ([af6a056](https://github.com/angular/angular/commit/af6a056))
-* **compiler-cli:** add missing entry point to package, update tsickle ([#22295](https://github.com/angular/angular/issues/22295)) ([c5418c7](https://github.com/angular/angular/commit/c5418c7))
-* **core:** properly handle function without prototype in reflector ([#22284](https://github.com/angular/angular/issues/22284)) ([5ec38f2](https://github.com/angular/angular/commit/5ec38f2)), closes [#19978](https://github.com/angular/angular/issues/19978)
-* **core:** support metadata reflection for native class types ([#22356](https://github.com/angular/angular/issues/22356)) ([ee91de9](https://github.com/angular/angular/commit/ee91de9)), closes [#21731](https://github.com/angular/angular/issues/21731)
-
-<a name="6.0.0-beta.4"></a>
-# [6.0.0-beta.4](https://github.com/angular/angular/compare/6.0.0-beta.3...6.0.0-beta.4) (2018-02-14)
-
-### Bug Fixes
-
-* **bazel:** allow TS to read ambient typings ([#21876](https://github.com/angular/angular/issues/21876)) ([b081dfe](https://github.com/angular/angular/commit/b081dfe)), closes [#21872](https://github.com/angular/angular/issues/21872)
-* **bazel:** improve error message for missing assets ([#22096](https://github.com/angular/angular/issues/22096)) ([dcf64a0](https://github.com/angular/angular/commit/dcf64a0)), closes [#22095](https://github.com/angular/angular/issues/22095)
-* **common:** add locale currency values ([#21783](https://github.com/angular/angular/issues/21783)) ([420cc7a](https://github.com/angular/angular/commit/420cc7a)), closes [#20385](https://github.com/angular/angular/issues/20385)
-* **common:** round currencies based on decimal digits in `CurrencyPipe` ([#21783](https://github.com/angular/angular/issues/21783)) ([44154e7](https://github.com/angular/angular/commit/44154e7)), closes [#10189](https://github.com/angular/angular/issues/10189)
-* **common:** weaken AsyncPipe transform signature ([#22169](https://github.com/angular/angular/issues/22169)) ([be59c3a](https://github.com/angular/angular/commit/be59c3a))
-* **compiler:** make unary plus operator consistent to JavaScript ([#22154](https://github.com/angular/angular/issues/22154)) ([72f8abd](https://github.com/angular/angular/commit/72f8abd)), closes [#22089](https://github.com/angular/angular/issues/22089)
-* **core:** add stacktrace in log when error during cleanup component in TestBed ([#22162](https://github.com/angular/angular/issues/22162)) ([16d1700](https://github.com/angular/angular/commit/16d1700))
-* **core:** ensure initial value of QueryList length ([#21980](https://github.com/angular/angular/issues/21980)) ([#21982](https://github.com/angular/angular/issues/21982)) ([e56de10](https://github.com/angular/angular/commit/e56de10)), closes [#21980](https://github.com/angular/angular/issues/21980)
-* **core:** use appropriate inert document strategy for Firefox & Safari ([#17019](https://github.com/angular/angular/issues/17019)) ([a751649](https://github.com/angular/angular/commit/a751649))
-* **forms:** make Validators.email support optional controls ([#20869](https://github.com/angular/angular/issues/20869)) ([140e7c0](https://github.com/angular/angular/commit/140e7c0))
-* **forms:** prevent event emission on enable/disable when emitEvent is false ([#12366](https://github.com/angular/angular/issues/12366)) ([#21018](https://github.com/angular/angular/issues/21018)) ([0bcfae7](https://github.com/angular/angular/commit/0bcfae7))
-* **forms:** set state before emitting a value from ngModelChange ([#21514](https://github.com/angular/angular/issues/21514)) ([9744a1c](https://github.com/angular/angular/commit/9744a1c)), closes [#21513](https://github.com/angular/angular/issues/21513)
-* **language-service:** correct instructions to install the language service ([#22000](https://github.com/angular/angular/issues/22000)) ([b37cee3](https://github.com/angular/angular/commit/b37cee3))
-* **platform-browser:** add @Injectable where it was missing ([#22005](https://github.com/angular/angular/issues/22005)) ([0a1a397](https://github.com/angular/angular/commit/0a1a397))
-* **platform-browser:** support 0/false/null values in transfer_state ([#22179](https://github.com/angular/angular/issues/22179)) ([6435ecd](https://github.com/angular/angular/commit/6435ecd))
-
-
-### Features
-
-* **bazel:** allow explicit specification of factories ([#22003](https://github.com/angular/angular/issues/22003)) ([e442881](https://github.com/angular/angular/commit/e442881))
-* **compiler:** mark @NgModules in provider lists for identification at runtime ([#22005](https://github.com/angular/angular/issues/22005)) ([2d5e7d1](https://github.com/angular/angular/commit/2d5e7d1))
-* **forms:** multiple validators for array method ([#20766](https://github.com/angular/angular/issues/20766)) ([941e88f](https://github.com/angular/angular/commit/941e88f)), closes [#20665](https://github.com/angular/angular/issues/20665)
-* change @Injectable() to support tree-shakeable tokens ([#22005](https://github.com/angular/angular/issues/22005)) ([235a235](https://github.com/angular/angular/commit/235a235))
-
 <a name="5.2.5"></a>
 ## [5.2.5](https://github.com/angular/angular/compare/5.2.4...5.2.5) (2018-02-14)
 
+
 ### Bug Fixes
 
-* **aio:** update Firebase redirects and SW routes ([#21763](https://github.com/angular/angular/pull/21763)) ([#22104](https://github.com/angular/angular/pull/22104)) ([15ff7ba](https://github.com/angular/angular/commit/15ff7ba)), closes [#21377](https://github.com/angular/angular/issues/21377)
+(https://github.com/angular/angular/commit/15ff7ba)), closes [#21377](https://github.com/angular/angular/issues/21377)
 * **bazel:** allow TS to read ambient typings ([#21876](https://github.com/angular/angular/issues/21876)) ([d57fd0b](https://github.com/angular/angular/commit/d57fd0b)), closes [#21872](https://github.com/angular/angular/issues/21872)
 * **bazel:** improve error message for missing assets ([#22096](https://github.com/angular/angular/issues/22096)) ([c5ec8d9](https://github.com/angular/angular/commit/c5ec8d9)), closes [#22095](https://github.com/angular/angular/issues/22095)
 * **common:** weaken AsyncPipe transform signature ([#22169](https://github.com/angular/angular/issues/22169)) ([c6bdc83](https://github.com/angular/angular/commit/c6bdc83))
 * **compiler:** make unary plus operator consistent to JavaScript ([#22154](https://github.com/angular/angular/issues/22154)) ([1b8ea10](https://github.com/angular/angular/commit/1b8ea10)), closes [#22089](https://github.com/angular/angular/issues/22089)
 * **core:** add stacktrace in log when error during cleanup component in TestBed ([#22162](https://github.com/angular/angular/issues/22162)) ([c4f841f](https://github.com/angular/angular/commit/c4f841f))
-* **core:** ensure initial value of QueryList length ([#21980](https://github.com/angular/angular/issues/21980)) ([#21982](https://github.com/angular/angular/issues/21982)) ([47b73fd](https://github.com/angular/angular/commit/47b73fd)), closes [#21980](https://github.com/angular/angular/issues/21980)
+* **core:** ensure initial value of QueryList length ([#21980](https://github.com/angular/angular/issues/21980)) ([#21982](https://github.com/angular/angular/issues/21982)) ([47b73fd](https://github.com/angular/angular/commit/47b73fd)), closes [/github.com/angular/angular/commit/e54474215629aa6a0e0497fe61bfc896cea532c9#diff-a85dbe0991a7577ea24b49374e9ae90](https://github.com//github.com/angular/angular/commit/e54474215629aa6a0e0497fe61bfc896cea532c9/issues/diff-a85dbe0991a7577ea24b49374e9ae90)
 * **core:** use appropriate inert document strategy for Firefox & Safari ([#17019](https://github.com/angular/angular/issues/17019)) ([47b71d9](https://github.com/angular/angular/commit/47b71d9))
 * **forms:** prevent event emission on enable/disable when emitEvent is false ([#12366](https://github.com/angular/angular/issues/12366)) ([#21018](https://github.com/angular/angular/issues/21018)) ([56b9591](https://github.com/angular/angular/commit/56b9591))
 * **language-service:** correct instructions to install the language service ([#22000](https://github.com/angular/angular/issues/22000)) ([0b23573](https://github.com/angular/angular/commit/0b23573))
 * **platform-browser:** support 0/false/null values in transfer_state ([#22179](https://github.com/angular/angular/issues/22179)) ([da6ab91](https://github.com/angular/angular/commit/da6ab91))
 
-<a name="6.0.0-beta.3"></a>
-# [6.0.0-beta.3](https://github.com/angular/angular/compare/6.0.0-beta.2...6.0.0-beta.3) (2018-02-07)
-
-### Bug Fixes
-
-* **common:** don't convert null to a string when flushing a mock request ([#21417](https://github.com/angular/angular/issues/21417)) ([8b14488](https://github.com/angular/angular/commit/8b14488)), closes [#20744](https://github.com/angular/angular/issues/20744)
-* **core:** fix [#20582](https://github.com/angular/angular/issues/20582), don't need to wrap zone in location change listener ([#20640](https://github.com/angular/angular/issues/20640)) ([f791e9f](https://github.com/angular/angular/commit/f791e9f))
-* **core:** fix proper propagation of subscriptions in EventEmitter ([#22016](https://github.com/angular/angular/issues/22016)) ([e81606c](https://github.com/angular/angular/commit/e81606c)), closes [#21999](https://github.com/angular/angular/issues/21999)
-* **core:** should check Zone existance when scheduleMicroTask ([#20656](https://github.com/angular/angular/issues/20656)) ([3a86940](https://github.com/angular/angular/commit/3a86940))
-* **forms:** publish missing types ([#19941](https://github.com/angular/angular/issues/19941)) ([2707012](https://github.com/angular/angular/commit/2707012))
-* **ivy:** generate correct interpolations ([#21946](https://github.com/angular/angular/issues/21946)) ([3cc1d76](https://github.com/angular/angular/commit/3cc1d76))
-* **ivy:** generate lifecycle pattern ([#21865](https://github.com/angular/angular/issues/21865)) ([f816666](https://github.com/angular/angular/commit/f816666))
-* **ivy:** improve `bindV` perf and memory usage ([#21881](https://github.com/angular/angular/issues/21881)) ([0846784](https://github.com/angular/angular/commit/0846784))
-* **ivy:** remove unnecessary parameter of NgOnChangesFeature ([#21879](https://github.com/angular/angular/issues/21879)) ([65cf1ad](https://github.com/angular/angular/commit/65cf1ad))
-
-
-### Features
-
-* **compiler-cli:** reflect static methods added to classes in metadata ([#21926](https://github.com/angular/angular/issues/21926)) ([eb8ddd2](https://github.com/angular/angular/commit/eb8ddd2))
-* **ivy:** add canonical example of a pipe. ([#21834](https://github.com/angular/angular/issues/21834)) ([743d8bc](https://github.com/angular/angular/commit/743d8bc))
-* **ivy:** add support for attributes on ng-content nodes ([#21935](https://github.com/angular/angular/issues/21935)) ([1aa2947](https://github.com/angular/angular/commit/1aa2947))
-* **ivy:** memoize array literals in render3 ([#21973](https://github.com/angular/angular/issues/21973)) ([4d62be6](https://github.com/angular/angular/commit/4d62be6))
-
-
-### Performance Improvements
-
-* **ivy:** improve Uglify configuration in hello world integration test ([#21985](https://github.com/angular/angular/issues/21985)) ([7e51e52](https://github.com/angular/angular/commit/7e51e52))
 
 
 
@@ -261,17 +32,6 @@ If that is the case, you should be able to track the old value directly by savin
 
 
 
-<a name="6.0.0-beta.2"></a>
-# [6.0.0-beta.2](https://github.com/angular/angular/compare/6.0.0-beta.1...6.0.0-beta.2) (2018-01-31)
-
-
-### Features
-
-* **router:** add navigationSource and restoredState to NavigationStart event ([#21728](https://github.com/angular/angular/issues/21728)) ([c40ae7f](https://github.com/angular/angular/commit/c40ae7f))
-* **service-worker:** add helper script which will uninstall SW ([#21863](https://github.com/angular/angular/issues/21863)) ([b10540a](https://github.com/angular/angular/commit/b10540a))
-
-
-
 <a name="5.2.3"></a>
 ## [5.2.3](https://github.com/angular/angular/compare/5.2.2...5.2.3) (2018-01-31)
 
@@ -289,32 +49,6 @@ If that is the case, you should be able to track the old value directly by savin
 
 
 
-<a name="6.0.0-beta.1"></a>
-# [6.0.0-beta.1](https://github.com/angular/angular/compare/6.0.0-beta.0...6.0.0-beta.1) (2018-01-25)
-
-
-### Bug Fixes
-
-* **common:** A null value should remove the style on IE ([#21679](https://github.com/angular/angular/issues/21679)) ([7d49443](https://github.com/angular/angular/commit/7d49443)), closes [#21064](https://github.com/angular/angular/issues/21064)
-* avoid triggering a cli bug ([#21611](https://github.com/angular/angular/issues/21611)) ([0eabd07](https://github.com/angular/angular/commit/0eabd07))
-* **common:** don't remove special characters when extracting CLDR data ([#21626](https://github.com/angular/angular/issues/21626)) ([135a282](https://github.com/angular/angular/commit/135a282))
-* **common:** extract plural function from i18n locale data files for TS 2.6 ([#21626](https://github.com/angular/angular/issues/21626)) ([97b18b2](https://github.com/angular/angular/commit/97b18b2)), closes [#21608](https://github.com/angular/angular/issues/21608)
-* **common:** fallback to last defined value for named date and time formats ([#21299](https://github.com/angular/angular/issues/21299)) ([879756d](https://github.com/angular/angular/commit/879756d)), closes [#21282](https://github.com/angular/angular/issues/21282)
-* **compiler:** add support for marker tags in xliff serializers ([#21250](https://github.com/angular/angular/issues/21250)) ([f74130c](https://github.com/angular/angular/commit/f74130c)), closes [#21078](https://github.com/angular/angular/issues/21078)
-* **compiler:** Don't strip `/*# sourceURL ... */` ([#16088](https://github.com/angular/angular/issues/16088)) ([5f681f9](https://github.com/angular/angular/commit/5f681f9))
-* **compiler:** fix ICU select messages to use male/female/other ([#21713](https://github.com/angular/angular/issues/21713)) ([cb5090c](https://github.com/angular/angular/commit/cb5090c))
-* **compiler-cli:** do not fold errors past calls in the collector ([#21708](https://github.com/angular/angular/issues/21708)) ([dd86790](https://github.com/angular/angular/commit/dd86790))
-* **compiler-cli:** do not lower expressions in non-modules ([#21649](https://github.com/angular/angular/issues/21649)) ([7f93aad](https://github.com/angular/angular/commit/7f93aad))
-* **router:** don't use ParamsInheritanceStrategy in declarations ([#21574](https://github.com/angular/angular/issues/21574)) ([925e654](https://github.com/angular/angular/commit/925e654)), closes [#21456](https://github.com/angular/angular/issues/21456)
-
-
-### Features
-
-* **compiler:** implement "enableIvy" compiler option ([#21427](https://github.com/angular/angular/issues/21427)) ([64d16de](https://github.com/angular/angular/commit/64d16de))
-* **core:** optional generic type for ElementRef ([#20765](https://github.com/angular/angular/issues/20765)) ([d3d9aac](https://github.com/angular/angular/commit/d3d9aac)), closes [#13139](https://github.com/angular/angular/issues/13139)
-
-
-
 <a name="5.2.2"></a>
 ## [5.2.2](https://github.com/angular/angular/compare/5.2.1...5.2.2) (2018-01-25)
 
@@ -334,36 +68,6 @@ If that is the case, you should be able to track the old value directly by savin
 
 
 
-<a name="6.0.0-beta.0"></a>
-# [6.0.0-beta.0](https://github.com/angular/angular/compare/5.2.0...6.0.0-beta.0) (2018-01-17)
-
-
-### Bug Fixes
-
-* **animations:** fix increment/decrement aliases example ([#18323](https://github.com/angular/angular/issues/18323)) ([d2aa8ac](https://github.com/angular/angular/commit/d2aa8ac))
-* **benchpress:** should still support selenium_webdriver < 3.6.0 ([#21477](https://github.com/angular/angular/issues/21477)) ([9b84a32](https://github.com/angular/angular/commit/9b84a32))
-* **common:** set correct timezone for ISO8601 dates in Safari ([#21506](https://github.com/angular/angular/issues/21506)) ([05208b8](https://github.com/angular/angular/commit/05208b8)), closes [#21491](https://github.com/angular/angular/issues/21491)
-* **compiler:** cache external reference resolution ([#21359](https://github.com/angular/angular/issues/21359)) ([e3e2fc0](https://github.com/angular/angular/commit/e3e2fc0))
-* **compiler:** make `.ngsummary.json` files idempotent ([#21448](https://github.com/angular/angular/issues/21448)) ([e64b1e9](https://github.com/angular/angular/commit/e64b1e9))
-* **core:** fix chained http call ([#20924](https://github.com/angular/angular/issues/20924)) ([7e3f9a4](https://github.com/angular/angular/commit/7e3f9a4)), closes [#20921](https://github.com/angular/angular/issues/20921)
-* **ivy:** Add workaround for AJD in google3 ([#21488](https://github.com/angular/angular/issues/21488)) ([6af3672](https://github.com/angular/angular/commit/6af3672))
-* **language-service:** Clear caches when program changes ([#21337](https://github.com/angular/angular/issues/21337)) ([43e1520](https://github.com/angular/angular/commit/43e1520)), closes [#19405](https://github.com/angular/angular/issues/19405)
-* **service-worker:** properly handle invalid hashes in all scenarios ([#21288](https://github.com/angular/angular/issues/21288)) ([3951098](https://github.com/angular/angular/commit/3951098))
-
-
-### Features
-
-* **bazel:** allow ng_module rules to control whether type checking is enabled ([#21460](https://github.com/angular/angular/issues/21460)) ([cffa0fe](https://github.com/angular/angular/commit/cffa0fe))
-* **core:** add binding name to content changed error ([#20352](https://github.com/angular/angular/issues/20352)) ([d3bf54b](https://github.com/angular/angular/commit/d3bf54b))
-* **forms:** handle string with and without line boundary on pattern validator ([#19256](https://github.com/angular/angular/issues/19256)) ([54bf179](https://github.com/angular/angular/commit/54bf179))
-
-
-### Performance Improvements
-
-* **ivy:** add missing dom element in render3_function tree benchmark ([#21476](https://github.com/angular/angular/issues/21476)) ([9b5a485](https://github.com/angular/angular/commit/9b5a485))
-
-
-
 <a name="5.2.1"></a>
 ## [5.2.1](https://github.com/angular/angular/compare/5.2.0...5.2.1) (2018-01-17)
 

CODE_OF_CONDUCT.md

@@ -1,12 +0,0 @@
-# Contributor Code of Conduct
-## Version 0.3b-angular
-
-As contributors and maintainers of the Angular project, we pledge to respect everyone who contributes by posting issues, updating documentation, submitting pull requests, providing feedback in comments, and any other activities.
-
-Communication through any of Angular's channels (GitHub, Gitter, IRC, mailing lists, Google+, Twitter, etc.) must be constructive and never resort to personal attacks, trolling, public or private harassment, insults, or other unprofessional conduct.
-
-We promise to extend courtesy and respect to everyone involved in this project regardless of gender, gender identity, sexual orientation, disability, age, race, ethnicity, religion, or level of experience. We expect anyone contributing to the Angular project to do the same.
-
-If any member of the community violates this code of conduct, the maintainers of the Angular project may take action, removing issues, comments, and PRs or blocking accounts as deemed appropriate.
-
-If you are subject to or witness unacceptable behavior, or have any other concerns, please email us at [conduct@angular.io](mailto:conduct@angular.io).

CONTRIBUTING.md

@@ -51,7 +51,7 @@ and help you to craft the change so that it is successfully accepted into the pr
 
 Before you submit an issue, please search the issue tracker, maybe an issue for your problem already exists and the discussion might inform you of workarounds readily available.
 
-We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it. In order to reproduce bugs, we will systematically ask you to provide a minimal reproduction scenario using http://plnkr.co. Having a live, reproducible scenario gives us a wealth of important information without going back & forth to you with additional questions like:
+We want to fix all the issues as soon as possible, but before fixing a bug we need to reproduce and confirm it. In order to reproduce bugs we will systematically ask you to provide a minimal reproduction scenario using http://plnkr.co. Having a live, reproducible scenario gives us wealth of important information without going back & forth to you with additional questions like:
 
 - version of Angular used
 - 3rd-party libraries and their versions
@@ -61,7 +61,7 @@ A minimal reproduce scenario using http://plnkr.co/ allows us to quickly confirm
 
 We will be insisting on a minimal reproduce scenario in order to save maintainers time and ultimately be able to fix more bugs. Interestingly, from our experience users often find coding problems themselves while preparing a minimal plunk. We understand that sometimes it might be hard to extract essentials bits of code from a larger code-base but we really need to isolate the problem before we can fix it.
 
-Unfortunately, we are not able to investigate / fix bugs without a minimal reproduction, so if we don't hear back from you we are going to close an issue that doesn't have enough info to be reproduced.
+Unfortunately we are not able to investigate / fix bugs without a minimal reproduction, so if we don't hear back from you we are going to close an issue that don't have enough info to be reproduced.
 
 You can file new issues by filling out our [new issue form](https://github.com/angular/angular/issues/new).
 
@@ -173,12 +173,12 @@ The **header** is mandatory and the **scope** of the header is optional.
 Any line of the commit message cannot be longer 100 characters! This allows the message to be easier
 to read on GitHub as well as in various git tools.
 
-The footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any.
+Footer should contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages/) if any.
 
 Samples: (even more [samples](https://github.com/angular/angular/commits/master))
 
 ```
-docs(changelog): update changelog to beta.5
+docs(changelog): update change log to beta.5
 ```
 ```
 fix(release): need to depend on latest rxjs and zone.js
@@ -203,7 +203,7 @@ Must be one of the following:
 * **test**: Adding missing tests or correcting existing tests
 
 ### Scope
-The scope should be the name of the npm package affected (as perceived by the person reading the changelog generated from commit messages.
+The scope should be the name of the npm package affected (as perceived by person reading changelog generated from commit messages.
 
 The following is the list of supported scopes:
 
@@ -232,10 +232,10 @@ There are currently a few exceptions to the "use package name" rule:
 * none/empty string: useful for `style`, `test` and `refactor` changes that are done across all packages (e.g. `style: add missing semicolons`)
 
 ### Subject
-The subject contains a succinct description of the change:
+The subject contains succinct description of the change:
 
 * use the imperative, present tense: "change" not "changed" nor "changes"
-* don't capitalize the first letter
+* don't capitalize first letter
 * no dot (.) at the end
 
 ### Body
@@ -266,7 +266,7 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
   * https://help.github.com/articles/setting-your-commit-email-address-in-git/
   * https://stackoverflow.com/questions/37245303/what-does-usera-committed-with-userb-13-days-ago-on-github-mean
   * https://help.github.com/articles/about-commit-email-addresses/
-  * https://help.github.com/articles/blocking-command-line-pushes-that-expose-your-personal-email-address/
+  * https://help.github.com/articles/blocking-command-line-pushes-that-expose-your-personal-email-address/ 
 
   Note that if you have more than one Git identity, it is important to verify that you are logged in with the same ID with which you signed the CLA, before you commit changes. If not, your PR will fail the CLA check.  
 

WORKSPACE

@@ -1,25 +1,22 @@
 workspace(name = "angular")
 
-http_archive(
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
+
+git_repository(
     name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/f03c8b5df155da2a640b6775afdd4fe4aa6fec72.zip",
-    strip_prefix = "rules_nodejs-f03c8b5df155da2a640b6775afdd4fe4aa6fec72",
-    sha256 = "9d541f49af8cf60c73efb102186bfa5670ee190a088ce52638dcdf90cd9e2de6",
+    remote = "https://github.com/bazelbuild/rules_nodejs.git",
+    commit = "230d39a391226f51c03448f91eb61370e2e58c42",
 )
 
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
 
 check_bazel_version("0.9.0")
-node_repositories(package_json = [
-    "//:package.json",
-    "//tools/ts-api-guardian:package.json",
-])
+node_repositories(package_json = ["//:package.json"])
 
-http_archive(
+git_repository(
     name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.11.1.zip",
-    strip_prefix = "rules_typescript-0.11.1",
-    sha256 = "7406bea7954e1c906f075115dfa176551a881119f6820b126ea1eacb09f34a1a",
+    remote = "https://github.com/bazelbuild/rules_typescript.git",
+    commit = "d3ad16d1f105e2490859da9ad528ba4c45991d09"
 )
 
 load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
@@ -31,16 +28,13 @@ local_repository(
     path = "node_modules/rxjs/src",
 )
 
-# This commit matches the version of buildifier in angular/ngcontainer
-# If you change this, also check if it matches the version in the angular/ngcontainer
-# version in /.circleci/config.yml
-BAZEL_BUILDTOOLS_VERSION = "b3b620e8bcff18ed3378cd3f35ebeb7016d71f71"
-
-http_archive(
+git_repository(
     name = "com_github_bazelbuild_buildtools",
-    url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % BAZEL_BUILDTOOLS_VERSION,
-    strip_prefix = "buildtools-%s" % BAZEL_BUILDTOOLS_VERSION,
-    sha256 = "dad19224258ed67cbdbae9b7befb785c3b966e5a33b04b3ce58ddb7824b97d73",
+    remote = "https://github.com/bazelbuild/buildtools.git",
+    # Note, this commit matches the version of buildifier in angular/ngcontainer
+    # If you change this, also check if it matches the version in the angular/ngcontainer
+    # version in /.circleci/config.yml
+    commit = "b3b620e8bcff18ed3378cd3f35ebeb7016d71f71",
 )
 
 http_archive(
@@ -62,23 +56,3 @@ http_archive(
     strip_prefix = "bazel-9755c72b48866ed034bd28aa033e9abd27431b1e",
     sha256 = "5b8443fc3481b5fcd9e7f348e1dd93c1397f78b223623c39eb56494c55f41962",
 )
-
-# We have a source dependency on the Devkit repository, because it's built with
-# Bazel.
-# This allows us to edit sources and have the effect appear immediately without
-# re-packaging or "npm link"ing.
-# Even better, things like aspects will visit the entire graph including
-# ts_library rules in the devkit repository.
-http_archive(
-    name = "angular_devkit",
-    url = "https://github.com/angular/devkit/archive/v0.3.1.zip",
-    strip_prefix = "devkit-0.3.1",
-    sha256 = "31d4b597fe9336650acf13df053c1c84dcbe9c29c6a833bcac3819cd3fd8cad3",
-)
-
-http_archive(
-    name = "org_brotli",
-    url = "https://github.com/google/brotli/archive/v1.0.2.zip",
-    strip_prefix = "brotli-1.0.2",
-    sha256 = "b43d5d6bc40f2fa6c785b738d86c6bbe022732fe25196ebbe43b9653a025920d",
-)

aio/.angular-cli.json

@@ -39,7 +39,7 @@
   ],
   "e2e": {
     "protractor": {
-      "config": "tests/e2e/protractor.conf.js"
+      "config": "./protractor.conf.js"
     }
   },
   "lint": [
@@ -50,12 +50,12 @@
       "project": "src/tsconfig.spec.json"
     },
     {
-      "project": "tests/e2e/tsconfig.e2e.json"
+      "project": "e2e/tsconfig.e2e.json"
     }
   ],
   "test": {
     "karma": {
-      "config": "src/karma.conf.js"
+      "config": "./karma.conf.js"
     }
   },
   "defaults": {

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

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

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

@@ -1,5 +1,7 @@
 import { TestBed, async } from '@angular/core/testing';
+
 import { AppComponent } from './app.component';
+
 describe('AppComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -18,13 +20,13 @@ describe('AppComponent', () => {
   it(`should have as title 'app'`, async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.debugElement.componentInstance;
-    expect(app.title).toMatch(/app/i);
+    expect(app.title).toEqual('app');
   }));
 
   it('should render title in a h1 tag', async(() => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
     const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toMatch(/app/i);
+    expect(compiled.querySelector('h1').textContent).toContain('Welcome to app!!');
   }));
 });

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

@@ -11,6 +11,6 @@ import { Component } from '@angular/core';
 // #enddocregion metadata
 // #docregion title, class
 export class AppComponent {
-  title = 'My First Angular App!';
+  title = 'My First Angular App';
 }
 // #enddocregion title, class

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

@@ -2,7 +2,7 @@
 import { Component, Input, OnDestroy } from '@angular/core';
 
 import { MissionService } from './mission.service';
-import { Subscription }   from 'rxjs';
+import { Subscription }   from 'rxjs/Subscription';
 
 @Component({
   selector: 'app-astronaut',

aio/content/examples/component-interaction/src/app/mission.service.ts

@@ -1,6 +1,6 @@
 // #docregion
 import { Injectable } from '@angular/core';
-import { Subject }    from 'rxjs';
+import { Subject }    from 'rxjs/Subject';
 
 @Injectable()
 export class MissionService {

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

@@ -1,12 +1,12 @@
 // #docregion
-import { Component, Input, OnInit, ViewChild, ComponentFactoryResolver, OnDestroy } from '@angular/core';
+import { Component, Input, AfterViewInit, ViewChild, ComponentFactoryResolver, OnDestroy } from '@angular/core';
 
 import { AdDirective } from './ad.directive';
 import { AdItem }      from './ad-item';
 import { AdComponent } from './ad.component';
 
 @Component({
-  selector: 'app-ad-banner',
+  selector: 'app-add-banner',
   // #docregion ad-host
   template: `
               <div class="ad-banner">
@@ -17,15 +17,16 @@ import { AdComponent } from './ad.component';
   // #enddocregion ad-host
 })
 // #docregion class
-export class AdBannerComponent implements OnInit, OnDestroy {
+export class AdBannerComponent implements AfterViewInit, OnDestroy {
   @Input() ads: AdItem[];
-  currentAdIndex: number = -1;
+  currentAddIndex: number = -1;
   @ViewChild(AdDirective) adHost: AdDirective;
+  subscription: any;
   interval: any;
 
   constructor(private componentFactoryResolver: ComponentFactoryResolver) { }
 
-  ngOnInit() {
+  ngAfterViewInit() {
     this.loadComponent();
     this.getAds();
   }
@@ -35,8 +36,8 @@ export class AdBannerComponent implements OnInit, OnDestroy {
   }
 
   loadComponent() {
-    this.currentAdIndex = (this.currentAdIndex + 1) % this.ads.length;
-    let adItem = this.ads[this.currentAdIndex];
+    this.currentAddIndex = (this.currentAddIndex + 1) % this.ads.length;
+    let adItem = this.ads[this.currentAddIndex];
 
     let componentFactory = this.componentFactoryResolver.resolveComponentFactory(adItem.component);
 

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

@@ -8,7 +8,7 @@ import { AdItem }            from './ad-item';
   selector: 'app-root',
   template: `
     <div>
-      <app-ad-banner [ads]="ads"></app-ad-banner>
+      <app-add-banner [ads]="ads"></app-add-banner>
     </div>
   `
 })

aio/content/examples/hierarchical-dependency-injection/src/app/heroes-list.component.ts

@@ -1,6 +1,6 @@
 // #docregion
 import { Component }  from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 import { Hero, HeroTaxReturn } from './hero';
 import { HeroesService }       from './heroes.service';

aio/content/examples/hierarchical-dependency-injection/src/app/heroes.service.ts

@@ -1,6 +1,7 @@
 import { Injectable } from '@angular/core';
 
-import { Observable, Observer } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { Observer } from 'rxjs/Observer';
 
 import { Hero, HeroTaxReturn } from './hero';
 

aio/content/examples/hierarchical-dependency-injection/src/app/villains-list.component.ts

@@ -1,6 +1,6 @@
 // #docregion
 import { Component }  from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 import { Villain, VillainsService } from './villains.service';
 

aio/content/examples/hierarchical-dependency-injection/src/app/villains.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { of }         from 'rxjs';
+import { of }         from 'rxjs/observable/of';
 
 export interface Villain { id: number; name: string; }
 

aio/content/examples/http/e2e/app.e2e-spec.ts

@@ -28,10 +28,7 @@ let checkLogForMessage = (message: string) => {
   expect(page.logList.getText()).toContain(message);
 };
 
-// TODO(i): temorarily disable these tests because angular-in-memory-web-api is not compatible with rxjs v6 yet
-//          and we don't have the backwards compatibility package yet.
-//          Reenable after rxjs v6 compatibility package is out or angular-in-memory-web-api is compatible with rxjs v6
-xdescribe('Http Tests', function() {
+describe('Http Tests', function() {
   beforeEach(() => {
     browser.get('');
   });

aio/content/examples/http/src/app/config/config.component.ts

@@ -30,7 +30,7 @@ export class ConfigComponent {
     this.configService.getConfig()
   // #enddocregion v1, v2
       .subscribe(
-        (data: Config) => this.config = { ...data }, // success path
+        data => this.config = { ...data }, // success path
         error => this.error = error // error path
       );
   }
@@ -39,7 +39,7 @@ export class ConfigComponent {
   showConfig_v1() {
     this.configService.getConfig_1()
   // #docregion v1, v1_callback
-      .subscribe((data: Config) => this.config = {
+      .subscribe(data => this.config = {
           heroesUrl: data['heroesUrl'],
           textfile:  data['textfile']
       });
@@ -51,7 +51,7 @@ export class ConfigComponent {
     this.configService.getConfig()
   // #docregion v2, v2_callback
       // clone the data object, using its known Config shape
-      .subscribe((data: Config) => this.config = { ...data });
+      .subscribe(data => this.config = { ...data });
   // #enddocregion v2_callback
   }
   // #enddocregion v2

aio/content/examples/http/src/app/config/config.service.ts

@@ -6,7 +6,8 @@ import { HttpClient } from '@angular/common/http';
 import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 
 // #docregion rxjs-imports
-import { Observable, throwError } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { ErrorObservable } from 'rxjs/observable/ErrorObservable';
 import { catchError, retry } from 'rxjs/operators';
 // #enddocregion rxjs-imports
 
@@ -81,8 +82,8 @@ export class ConfigService {
         `Backend returned code ${error.status}, ` +
         `body was: ${error.error}`);
     }
-    // return an observable with a user-facing error message
-    return throwError(
+    // return an ErrorObservable with a user-facing error message
+    return new ErrorObservable(
       'Something bad happened; please try again later.');
   };
   // #enddocregion handleError

aio/content/examples/http/src/app/heroes/heroes.service.ts

@@ -6,7 +6,8 @@ import { HttpHeaders } from '@angular/common/http';
 
 // #enddocregion http-options
 
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs/observable/of';
 import { catchError } from 'rxjs/operators';
 
 import { Hero } from './hero';

aio/content/examples/http/src/app/http-error-handler.service.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
 import { HttpErrorResponse } from '@angular/common/http';
 
-import { Observable, of } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs/observable/of';
 
 import { MessageService } from './message.service';
 

aio/content/examples/http/src/app/http-interceptors/auth-interceptor.ts

@@ -4,6 +4,8 @@ import {
   HttpEvent, HttpInterceptor, HttpHandler, HttpRequest
 } from '@angular/common/http';
 
+import { Observable } from 'rxjs/Observable';
+
 // #docregion
 import { AuthService } from '../auth.service';
 

aio/content/examples/http/src/app/http-interceptors/caching-interceptor.ts

@@ -5,7 +5,8 @@ import {
   HttpInterceptor, HttpHandler
 } from '@angular/common/http';
 
-import { Observable, of } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs/observable/of';
 import { startWith, tap } from 'rxjs/operators';
 
 import { RequestCache } from '../request-cache.service';

aio/content/examples/http/src/app/http-interceptors/ensure-https-interceptor.ts

@@ -3,7 +3,7 @@ import {
   HttpEvent, HttpInterceptor, HttpHandler, HttpRequest
 } from '@angular/common/http';
 
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 @Injectable()
 export class EnsureHttpsInterceptor implements HttpInterceptor {

aio/content/examples/http/src/app/http-interceptors/logging-interceptor.ts

@@ -4,6 +4,7 @@ import {
   HttpRequest, HttpResponse
 } from '@angular/common/http';
 
+import { Observable } from 'rxjs/Observable';
 // #docregion excerpt
 import { finalize, tap } from 'rxjs/operators';
 import { MessageService } from '../message.service';

aio/content/examples/http/src/app/http-interceptors/noop-interceptor.ts

@@ -3,7 +3,7 @@ import {
   HttpEvent, HttpInterceptor, HttpHandler, HttpRequest
 } from '@angular/common/http';
 
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 /** Pass untouched request through to the next request handler. */
 @Injectable()

aio/content/examples/http/src/app/http-interceptors/trim-name-interceptor.ts

@@ -3,7 +3,7 @@ import {
   HttpEvent, HttpInterceptor, HttpHandler, HttpRequest
 } from '@angular/common/http';
 
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 @Injectable()
 export class TrimNameInterceptor implements HttpInterceptor {

aio/content/examples/http/src/app/http-interceptors/upload-interceptor.ts

@@ -5,7 +5,8 @@ import {
   HttpEventType, HttpProgressEvent
 } from '@angular/common/http';
 
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs/observable/of';
 
 /** Simulate server replying to file upload request */
 @Injectable()

aio/content/examples/http/src/app/package-search/package-search.component.ts

@@ -1,6 +1,7 @@
 import { Component, OnInit } from '@angular/core';
 
-import { Observable, Subject } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { Subject } from 'rxjs/Subject';
 import { debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators';
 
 import { NpmPackageInfo, PackageSearchService } from './package-search.service';

aio/content/examples/http/src/app/package-search/package-search.service.ts

@@ -1,7 +1,8 @@
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
 
-import { Observable, of } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { of } from 'rxjs/observable/of';
 import { catchError, map } from 'rxjs/operators';
 
 import { HttpErrorHandler, HandleError } from '../http-error-handler.service';

aio/content/examples/http/src/app/uploader/uploader.service.ts

@@ -4,7 +4,7 @@ import {
   HttpRequest, HttpResponse, HttpErrorResponse
 } from '@angular/common/http';
 
-import { of } from 'rxjs';
+import { of } from 'rxjs/observable/of';
 import { catchError, last, map, tap } from 'rxjs/operators';
 
 import { MessageService } from '../message.service';

aio/content/examples/ngmodule-faq/src/app/contact/contact.service.ts

@@ -2,7 +2,8 @@
 // #docregion
 import { Injectable, OnDestroy } from '@angular/core';
 
-import { Observable, of } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { of }         from 'rxjs/observable/of';
 import { delay }      from 'rxjs/operators';
 
 export class Contact {

aio/content/examples/ngmodule-faq/src/app/crisis/crisis-list.component.ts

@@ -1,5 +1,5 @@
 import { Component } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 import { Crisis,
          CrisisService } from './crisis.service';

aio/content/examples/ngmodule-faq/src/app/crisis/crisis.service.ts

@@ -1,6 +1,7 @@
 import { Injectable, OnDestroy } from '@angular/core';
 
-import { Observable, of } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { of }         from 'rxjs/observable/of';
 import { delay }      from 'rxjs/operators';
 
 export class Crisis {

aio/content/examples/ngmodule-faq/src/app/hero/hero-list.component.ts

@@ -1,5 +1,5 @@
 import { Component }  from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 import { Hero,
          HeroService } from './hero.service';

aio/content/examples/ngmodule-faq/src/app/hero/hero.service.ts

@@ -1,6 +1,7 @@
 import { Injectable, OnDestroy } from '@angular/core';
 
-import { Observable, of } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { of }         from 'rxjs/observable/of';
 import { delay }      from 'rxjs/operators';
 
 export class Hero {

aio/content/examples/ngmodules/src/app/contact/contact.service.ts

@@ -1,7 +1,8 @@
 import { Injectable, OnDestroy } from '@angular/core';
 
-import { Observable, of } from 'rxjs';
-import { delay }      from 'rxjs/operators';
+import { Observable } from 'rxjs/Observable';
+import { of }         from 'rxjs/observable/of';
+import { delay }      from 'rxjs/operator/delay';
 
 export class Contact {
   constructor(public id: number, public name: string) { }
@@ -23,12 +24,12 @@ export class ContactService implements OnDestroy {
   ngOnDestroy() { console.log('ContactService instance destroyed.'); }
 
   getContacts(): Observable<Contact[]>  {
-    return of(CONTACTS).pipe(delay(FETCH_LATENCY));
+    return delay.call(of(CONTACTS), FETCH_LATENCY);
   }
 
   getContact(id: number | string): Observable<Contact> {
     const contact$ = of(CONTACTS.find(contact => contact.id === +id));
-    return contact$.pipe(delay(FETCH_LATENCY));
+    return delay.call(contact$, FETCH_LATENCY);
   }
 }
 

aio/content/examples/ngmodules/src/app/customers/customers-list.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 import { Customer,
          CustomersService } from './customers.service';

aio/content/examples/ngmodules/src/app/customers/customers.service.ts

@@ -1,7 +1,8 @@
 import { Injectable, OnDestroy } from '@angular/core';
 
-import { Observable, of } from 'rxjs';
-import { delay }      from 'rxjs/operators';
+import { Observable } from 'rxjs/Observable';
+import { of }         from 'rxjs/observable/of';
+import { delay }      from 'rxjs/operator/delay';
 
 export class Customer {
   constructor(public id: number, public name: string) { }
@@ -26,11 +27,11 @@ export class CustomersService implements OnDestroy {
   ngOnDestroy() { console.log('CustomersService instance destroyed.'); }
 
   getCustomers(): Observable<Customer[]>  {
-    return of(CUSTOMERS).pipe(delay(FETCH_LATENCY));
+    return delay.call(of(CUSTOMERS), FETCH_LATENCY);
   }
 
   getCustomer(id: number | string): Observable<Customer> {
     const customer$ = of(CUSTOMERS.find(customer => customer.id === +id));
-    return customer$.pipe(delay(FETCH_LATENCY));
+    return delay.call(customer$, FETCH_LATENCY);
   }
 }

aio/content/examples/ngmodules/src/app/items/items-list.component.ts

@@ -1,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { Observable }from 'rxjs';
+import { Observable }from 'rxjs/Observable';
 
 import { Item,
          ItemService }     from './items.service';

aio/content/examples/ngmodules/src/app/items/items.module.ts

@@ -1,7 +1,6 @@
 import { NgModule }      from '@angular/core';
 import { CommonModule }  from '@angular/common';
 
-import { ItemsComponent } from './items.component';
 import { ItemsListComponent }    from './items-list.component';
 import { ItemsDetailComponent }  from './items-detail.component';
 import { ItemService }          from './items.service';
@@ -9,7 +8,7 @@ import { ItemsRoutingModule }    from './items-routing.module';
 
 @NgModule({
   imports:      [ CommonModule, ItemsRoutingModule ],
-  declarations: [ ItemsComponent, ItemsDetailComponent, ItemsListComponent ],
+  declarations: [ ItemsDetailComponent, ItemsListComponent ],
   providers:    [ ItemService ]
 })
 export class ItemsModule {}

aio/content/examples/ngmodules/src/app/items/items.service.ts

@@ -1,7 +1,8 @@
 import { Injectable, OnDestroy } from '@angular/core';
 
-import { Observable, of } from 'rxjs';
-import { delay }      from 'rxjs/operators';
+import { Observable } from 'rxjs/Observable';
+import { of }         from 'rxjs/observable/of';
+import { delay }      from 'rxjs/operator/delay';
 
 export class Item {
   constructor(public id: number, public name: string) { }
@@ -24,12 +25,12 @@ export class ItemService implements OnDestroy {
   ngOnDestroy() { console.log('ItemService instance destroyed.'); }
 
   getItems(): Observable<Item[]>  {
-    return of(ITEMS).pipe(delay(FETCH_LATENCY));
+    return delay.call(of(ITEMS), FETCH_LATENCY);
   }
 
   getItem(id: number | string): Observable<Item> {
     const item$ = of(ITEMS.find(item => item.id === +id));
-    return item$.pipe(delay(FETCH_LATENCY));
+    return delay.call(item$, FETCH_LATENCY);
   }
 }
 

aio/content/examples/observables-in-angular/src/main.ts

@@ -1,131 +0,0 @@
-
-import { Component, Output, OnInit, EventEmitter, NgModule } from '@angular/core';
-import { Observable } from 'rxjs';
-
-// #docregion eventemitter
-
-@Component({
-  selector: 'zippy',
-  template: `
-  <div class="zippy">
-    <div (click)="toggle()">Toggle</div>
-    <div [hidden]="!visible">
-      <ng-content></ng-content>
-    </div>
-  </div>`})
-
-export class ZippyComponent {
-  visible = true;
-  @Output() open = new EventEmitter<any>();
-  @Output() close = new EventEmitter<any>();
-
-  toggle() {
-    this.visible = !this.visible;
-    if (this.visible) {
-      this.open.emit(null);
-    } else {
-      this.close.emit(null);
-    }
-  }
-}
-
-// #enddocregion eventemitter
-
-// #docregion pipe
-
-@Component({
-  selector: 'async-observable-pipe',
-  template: `<div><code>observable|async</code>:
-       Time: {{ time | async }}</div>`
-})
-export class AsyncObservablePipeComponent {
-  time = new Observable(observer =>
-    setInterval(() => observer.next(new Date().toString()), 1000)
-  );
-}
-
-// #enddocregion pipe
-
-// #docregion router
-
-import { Router, NavigationStart } from '@angular/router';
-import { filter } from 'rxjs/operators';
-
-@Component({
-  selector: 'app-routable',
-  templateUrl: './routable.component.html',
-  styleUrls: ['./routable.component.css']
-})
-export class Routable1Component implements OnInit {
-
-  navStart: Observable<NavigationStart>;
-
-  constructor(private router: Router) {
-    // Create a new Observable the publishes only the NavigationStart event
-    this.navStart = router.events.pipe(
-      filter(evt => evt instanceof NavigationStart)
-    ) as Observable<NavigationStart>;
-  }
-
-  ngOnInit() {
-    this.navStart.subscribe(evt => console.log('Navigation Started!'));
-  }
-}
-
-// #enddocregion router
-
-
-// #docregion activated_route
-
-import { ActivatedRoute } from '@angular/router';
-
-@Component({
-  selector: 'app-routable',
-  templateUrl: './routable.component.html',
-  styleUrls: ['./routable.component.css']
-})
-export class Routable2Component implements OnInit {
-  constructor(private activatedRoute: ActivatedRoute) {}
-
-  ngOnInit() {
-    this.activatedRoute.url
-      .subscribe(url => console.log('The URL changed to: ' + url));
-  }
-}
-
-// #enddocregion activated_route
-
-
-// #docregion forms
-
-import { FormGroup } from '@angular/forms';
-
-@Component({
-  selector: 'my-component',
-  template: 'MyComponent Template'
-})
-export class MyComponent implements OnInit {
-  nameChangeLog: string[] = [];
-  heroForm: FormGroup;
-
-  ngOnInit() {
-    this.logNameChange();
-  }
-  logNameChange() {
-    const nameControl = this.heroForm.get('name');
-    nameControl.valueChanges.forEach(
-      (value: string) => this.nameChangeLog.push(value)
-    );
-  }
-}
-
-// #enddocregion forms
-
-
-
-@NgModule({
-  declarations:
-      [ZippyComponent, AsyncObservablePipeComponent, Routable1Component, Routable2Component, MyComponent]
-})
-export class AppModule {
-}

aio/content/examples/observables/src/creating.ts

@@ -1,66 +0,0 @@
-
-import { Observable } from 'rxjs';
-
-// #docregion subscriber
-
-// This function runs when subscribe() is called
-function sequenceSubscriber(observer) {
-  // synchronously deliver 1, 2, and 3, then complete
-  observer.next(1);
-  observer.next(2);
-  observer.next(3);
-  observer.complete();
-
-  // unsubscribe function doesn't need to do anything in this
-  // because values are delivered synchronously
-  return {unsubscribe() {}};
-}
-
-// Create a new Observable that will deliver the above sequence
-const sequence = new Observable(sequenceSubscriber);
-
-// execute the Observable and print the result of each notification
-sequence.subscribe({
-  next(num) { console.log(num); },
-  complete() { console.log('Finished sequence'); }
-});
-
-// Logs:
-// 1
-// 2
-// 3
-// Finished sequence
-
-// #enddocregion subscriber
-
-// #docregion fromevent
-
-function fromEvent(target, eventName) {
-  return new Observable((observer) => {
-    const handler = (e) => observer.next(e);
-
-    // Add the event handler to the target
-    target.addEventListener(eventName, handler);
-
-    return () => {
-      // Detach the event handler from the target
-      target.removeEventListener(eventName, handler);
-    };
-  });
-}
-
-// #enddocregion fromevent
-
-// #docregion fromevent_use
-
-const ESC_KEY = 27;
-const nameInput = document.getElementById('name') as HTMLInputElement;
-
-const subscription = fromEvent(nameInput, 'keydown')
-  .subscribe((e: KeyboardEvent) => {
-    if (e.keyCode === ESC_KEY) {
-      nameInput.value = '';
-    }
-  });
-
-// #enddocregion fromevent_use

aio/content/examples/observables/src/geolocation.ts

@@ -1,32 +0,0 @@
-import { Observable } from 'rxjs';
-
-// #docregion
-
-// Create an Observable that will start listening to geolocation updates
-// when a consumer subscribes.
-const locations = new Observable((observer) => {
-  // Get the next and error callbacks. These will be passed in when
-  // the consumer subscribes.
-  const {next, error} = observer;
-  let watchId;
-
-  // Simple geolocation API check provides values to publish
-  if ('geolocation' in navigator) {
-    watchId = navigator.geolocation.watchPosition(next, error);
-  } else {
-    error('Geolocation not available');
-  }
-
-  // When the consumer unsubscribes, clean up data ready for next subscription.
-  return {unsubscribe() { navigator.geolocation.clearWatch(watchId); }};
-});
-
-// Call subscribe() to start listening for updates.
-const locationsSubscription = locations.subscribe({
-  next(position) { console.log('Current Position: ', position); },
-  error(msg) { console.log('Error Getting Location: ', msg); }
-});
-
-// Stop listening for location after 10 seconds
-setTimeout(() => { locationsSubscription.unsubscribe(); }, 10000);
-// #enddocregion

aio/content/examples/observables/src/main.ts

@@ -1,5 +0,0 @@
-
-import './geolocation';
-import './subscribing';
-import './creating';
-import './multicasting';

aio/content/examples/observables/src/multicasting.ts

@@ -1,155 +0,0 @@
-
-import { Observable } from 'rxjs';
-
-// #docregion delay_sequence
-
-function sequenceSubscriber(observer) {
-  const seq = [1, 2, 3];
-  let timeoutId;
-
-  // Will run through an array of numbers, emitting one value
-  // per second until it gets to the end of the array.
-  function doSequence(arr, idx) {
-    timeoutId = setTimeout(() => {
-      observer.next(arr[idx]);
-      if (idx === arr.length - 1) {
-        observer.complete();
-      } else {
-        doSequence(arr, idx++);
-      }
-    }, 1000);
-  }
-
-  doSequence(seq, 0);
-
-  // Unsubscribe should clear the timeout to stop execution
-  return {unsubscribe() {
-    clearTimeout(timeoutId);
-  }};
-}
-
-// Create a new Observable that will deliver the above sequence
-const sequence = new Observable(sequenceSubscriber);
-
-sequence.subscribe({
-  next(num) { console.log(num); },
-  complete() { console.log('Finished sequence'); }
-});
-
-// Logs:
-// (at 1 second): 1
-// (at 2 seconds): 2
-// (at 3 seconds): 3
-// (at 3 seconds): Finished sequence
-
-// #enddocregion delay_sequence
-
-// #docregion subscribe_twice
-
-// Subscribe starts the clock, and will emit after 1 second
-sequence.subscribe({
-  next(num) { console.log('1st subscribe: ' + num); },
-  complete() { console.log('1st sequence finished.'); }
-});
-
-// After 1/2 second, subscribe again.
-setTimeout(() => {
-  sequence.subscribe({
-    next(num) { console.log('2nd subscribe: ' + num); },
-    complete() { console.log('2nd sequence finished.'); }
-  });
-}, 500);
-
-// Logs:
-// (at 1 second): 1st subscribe: 1
-// (at 1.5 seconds): 2nd subscribe: 1
-// (at 2 seconds): 1st subscribe: 2
-// (at 2.5 seconds): 2nd subscribe: 2
-// (at 3 seconds): 1st subscribe: 3
-// (at 3 seconds): 1st sequence finished
-// (at 3.5 seconds): 2nd subscribe: 3
-// (at 3.5 seconds): 2nd sequence finished
-
-// #enddocregion subscribe_twice
-
-// #docregion multicast_sequence
-
-function multicastSequenceSubscriber() {
-  const seq = [1, 2, 3];
-  // Keep track of each observer (one for every active subscription)
-  const observers = [];
-  // Still a single timeoutId because there will only ever be one
-  // set of values being generated, multicasted to each subscriber
-  let timeoutId;
-
-  // Return the subscriber function (runs when subscribe()
-  // function is invoked)
-  return (observer) => {
-    observers.push(observer);
-    // When this is the first subscription, start the sequence
-    if (observers.length === 1) {
-      timeoutId = doSequence({
-        next(val) {
-          // Iterate through observers and notify all subscriptions
-          observers.forEach(obs => obs.next(val));
-        },
-        complete() {
-          // Notify all complete callbacks
-          observers.forEach(obs => obs.complete());
-        }
-      }, seq, 0);
-    }
-
-    return {
-      unsubscribe() {
-        // Remove from the observers array so it's no longer notified
-        observers.splice(observers.indexOf(observer), 1);
-        // If there's no more listeners, do cleanup
-        if (observers.length === 0) {
-          clearTimeout(timeoutId);
-        }
-      }
-    };
-  };
-}
-
-// Run through an array of numbers, emitting one value
-// per second until it gets to the end of the array.
-function doSequence(observer, arr, idx) {
-  return setTimeout(() => {
-    observer.next(arr[idx]);
-    if (idx === arr.length - 1) {
-      observer.complete();
-    } else {
-      doSequence(observer, arr, idx++);
-    }
-  }, 1000);
-}
-
-// Create a new Observable that will deliver the above sequence
-const multicastSequence = new Observable(multicastSequenceSubscriber);
-
-// Subscribe starts the clock, and begins to emit after 1 second
-multicastSequence.subscribe({
-  next(num) { console.log('1st subscribe: ' + num); },
-  complete() { console.log('1st sequence finished.'); }
-});
-
-// After 1 1/2 seconds, subscribe again (should "miss" the first value).
-setTimeout(() => {
-  multicastSequence.subscribe({
-    next(num) { console.log('2nd subscribe: ' + num); },
-    complete() { console.log('2nd sequence finished.'); }
-  });
-}, 1500);
-
-// Logs:
-// (at 1 second): 1st subscribe: 1
-// (at 2 seconds): 1st subscribe: 2
-// (at 2 seconds): 2nd subscribe: 2
-// (at 3 seconds): 1st subscribe: 3
-// (at 3 seconds): 1st sequence finished
-// (at 3 seconds): 2nd subscribe: 3
-// (at 3 seconds): 2nd sequence finished
-
-// #enddocregion multicast_sequence

aio/content/examples/observables/src/subscribing.ts

@@ -1,32 +0,0 @@
-
-import { Observable, of } from 'rxjs';
-
-// #docregion observer
-
-// Create simple observable that emits three values
-const myObservable = Observable.of(1, 2, 3);
-
-// Create observer object
-const myObserver = {
-  next: x => console.log('Observer got a next value: ' + x),
-  error: err => console.error('Observer got an error: ' + err),
-  complete: () => console.log('Observer got a complete notification'),
-};
-
-// Execute with the observer object
-myObservable.subscribe(myObserver);
-// Logs:
-// Observer got a next value: 1
-// Observer got a next value: 2
-// Observer got a next value: 3
-// Observer got a complete notification
-
-// #enddocregion observer
-
-// #docregion sub_fn
-myObservable.subscribe(
-  x => console.log('Observer got a next value: ' + x),
-  err => console.error('Observer got an error: ' + err),
-  () => console.log('Observer got a complete notification')
-);
-// #enddocregion sub_fn

aio/content/examples/pipes/src/app/app.module.ts

@@ -2,7 +2,7 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
-import { HttpClientModule } from '@angular//common/http';
+import { HttpModule } from '@angular/http';
 
 import { AppComponent } from './app.component';
 import {
@@ -26,7 +26,7 @@ import { ExponentialStrengthPipe } from './exponential-strength.pipe';
   imports: [
     BrowserModule,
     FormsModule,
-    HttpClientModule
+    HttpModule
   ],
   declarations: [
     AppComponent,

aio/content/examples/pipes/src/app/fetch-json.pipe.ts

@@ -1,6 +1,9 @@
 // #docregion
 import { Pipe, PipeTransform } from '@angular/core';
-import { HttpClient }          from '@angular/common/http';
+import { Http }                from '@angular/http';
+
+import 'rxjs/add/operator/map';
+
 // #docregion pipe-metadata
 @Pipe({
   name: 'fetch',
@@ -11,13 +14,15 @@ export class FetchJsonPipe  implements PipeTransform {
   private cachedData: any = null;
   private cachedUrl = '';
 
-  constructor(private http: HttpClient) { }
+  constructor(private http: Http) { }
 
   transform(url: string): any {
     if (url !== this.cachedUrl) {
       this.cachedData = null;
       this.cachedUrl = url;
-      this.http.get(url).subscribe( result => this.cachedData = result );
+      this.http.get(url)
+        .map( result => result.json() )
+        .subscribe( result => this.cachedData = result );
     }
 
     return this.cachedData;

aio/content/examples/pipes/src/app/hero-async-message.component.ts

@@ -1,8 +1,10 @@
 // #docregion
 import { Component } from '@angular/core';
 
-import { Observable, interval } from 'rxjs';
-import { map, take } from 'rxjs/operators';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/interval';
+import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/take';
 
 @Component({
   selector: 'app-hero-message',
@@ -23,17 +25,14 @@ export class HeroAsyncMessageComponent {
   constructor() { this.resend(); }
 
   resend() {
-    this.message$ = interval(500).pipe(
-      map(i => this.messages[i]),
-      take(this.messages.length)
-    );
+    this.message$ = Observable.interval(500)
+      .map(i => this.messages[i])
+      .take(this.messages.length);
   }
 }
 // #enddocregion
 
 // Alternative message$ formula:
-// this.message$ = fromArray(this.messages).pipe(
-//   map(message => timer(500),
-//   map(() => message)),
-//   concatAll()
-// );
+// this.message$ = Observable.fromArray(this.messages)
+//   .map(message => Observable.timer(500).map(() => message))
+//   .concatAll();

aio/content/examples/practical-observable-usage/src/backoff.ts

@@ -1,24 +0,0 @@
-
-import { pipe, range, timer, zip } from 'rxjs';
-import { ajax } from 'rxjs/ajax';
-import { retryWhen, map, mergeMap } from 'rxjs/operators';
-
-function backoff(maxTries, ms) {
- return pipe(
-   retryWhen(attempts => range(1, maxTries)
-     .pipe(
-       zip(attempts, (i) => i),
-       map(i => i * i),
-       mergeMap(i =>  timer(i * ms))
-     )
-   )
- );
-}
-
-ajax('/api/endpoint')
-  .pipe(backoff(3, 250))
-  .subscribe(data => handleData(data));
-
-function handleData(data) {
-  // ...
-}

aio/content/examples/practical-observable-usage/src/typeahead.ts

@@ -1,18 +0,0 @@
-
-import { fromEvent } from 'rxjs';
-import { ajax } from 'rxjs/ajax';
-import { map, filter, debounceTime, distinctUntilChanged, switchMap } from 'rxjs/operators';
-
-const searchBox = document.getElementById('search-box');
-
-const typeahead = fromEvent(searchBox, 'input').pipe(
-  map((e: KeyboardEvent) => e.target.value),
-  filter(text => text.length > 2),
-  debounceTime(10),
-  distinctUntilChanged(),
-  switchMap(() => ajax('/api/endpoint'))
-);
-
-typeahead.subscribe(data => {
- // Handle the data from the API
-});

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

@@ -6,38 +6,32 @@ import { BrowserModule }       from '@angular/platform-browser';
 import { ReactiveFormsModule } from '@angular/forms';  // <-- #1 import module
 
 import { AppComponent }        from './app.component';
-import { HeroDetailComponent } from './hero-detail/hero-detail.component';
+import { HeroDetailComponent } from './hero-detail/hero-detail.component'; // <-- #1 import component
 // #enddocregion v1
-// #docregion hero-service-list
-// add JavaScript imports
 import { HeroListComponent }   from './hero-list/hero-list.component';
-import { HeroService }         from './hero.service';
+
+import { HeroService }         from './hero.service'; //  <-- #1 import service
 // #docregion v1
 
 @NgModule({
-  declarations: [
-    AppComponent,
-    HeroDetailComponent,
-// #enddocregion v1
-    HeroListComponent // <--declare HeroListComponent
-// #docregion v1
-  ],
- // #enddocregion hero-service-list
   imports: [
     BrowserModule,
     ReactiveFormsModule // <-- #2 add to @NgModule imports
   ],
-  // #enddocregion v1
-  // export for the DemoModule
-  // #docregion hero-service-list
-  // ...
-  exports: [
+  declarations: [
     AppComponent,
     HeroDetailComponent,
-    HeroListComponent // <-- export HeroListComponent
+// #enddocregion v1
+    HeroListComponent
+// #docregion v1
   ],
-  providers: [ HeroService ], // <-- provide HeroService
-// #enddocregion hero-service-list
+// #enddocregion v1
+  exports: [ // export for the DemoModule
+    AppComponent,
+    HeroDetailComponent,
+    HeroListComponent
+  ],
+  providers: [ HeroService ], // <-- #4 provide HeroService
 // #docregion v1
   bootstrap: [ AppComponent ]
 })

aio/content/examples/reactive-forms/src/app/demo.component.ts

@@ -1,7 +1,6 @@
 /* tslint:disable:member-ordering */
 import { Component }  from '@angular/core';
-import { Observable } from 'rxjs';
-import { finalize } from 'rxjs/operators';
+import { Observable } from 'rxjs/Observable';
 
 import { Hero }        from './data-model';
 import { HeroService } from './hero.service';
@@ -34,9 +33,8 @@ export class DemoComponent {
 
   getHeroes() {
     this.isLoading = true;
-    this.heroes = this.heroService.getHeroes().pipe(
-                      finalize(() => this.isLoading = false)
-    );
+    this.heroes = this.heroService.getHeroes()
+                      .finally(() => this.isLoading = false);
     this.selectedHero = undefined;
   }
 

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-2.component.html

@@ -1,7 +1,7 @@
 <!-- #docregion basic-form-->
 <h2>Hero Detail</h2>
 <h3><i>FormControl in a FormGroup</i></h3>
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
   <div class="form-group">
     <label class="center-block">Name:
       <input class="form-control" formControlName="name">

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-3.component.html

@@ -1,7 +1,7 @@
 <!-- #docregion basic-form-->
 <h2>Hero Detail</h2>
 <h3><i>A FormGroup with a single FormControl using FormBuilder</i></h3>
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
   <div class="form-group">
     <label class="center-block">Name:
       <input class="form-control" formControlName="name">
@@ -13,4 +13,4 @@
 <!-- #docregion form-value-json -->
 <p>Form value: {{ heroForm.value | json }}</p>
 <p>Form status: {{ heroForm.status | json }}</p>
-<!-- #enddocregion form-value-json -->
+<!-- #enddocregion form-value-json  -->

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-4.component.html

@@ -1,7 +1,7 @@
 <!-- #docregion -->
 <h2>Hero Detail</h2>
 <h3><i>A FormGroup with multiple FormControls</i></h3>
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
   <div class="form-group">
     <label class="center-block">Name:
       <input class="form-control" formControlName="name">

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-5.component.html

@@ -1,5 +1,5 @@
 
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
     <div class="form-group">
       <label class="center-block">Name:
         <input class="form-control" formControlName="name">

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.html

@@ -1,7 +1,7 @@
 <!-- #docregion -->
 <h2>Hero Detail</h2>
 <h3><i>PatchValue to initialize a value</i></h3>
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
   <div class="form-group">
     <label class="center-block">Name:
       <input class="form-control" formControlName="name">

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-6.component.ts

@@ -44,13 +44,7 @@ export class HeroDetailComponent6 implements OnChanges {
   }
 
   // #docregion patch-value-on-changes
-  ngOnChanges() { // <-- call rebuildForm in ngOnChanges
-    this.rebuildForm();
-  }
-  // #enddocregion patch-value-on-changes
-
-  // #docregion patch-value-rebuildform
-  rebuildForm() { // <-- wrap patchValue in rebuildForm
+  ngOnChanges() { // <-- wrap patchValue in ngOnChanges
     this.heroForm.reset();
     // #docregion patch-value
     this.heroForm.patchValue({
@@ -58,9 +52,7 @@ export class HeroDetailComponent6 implements OnChanges {
     });
     // #enddocregion patch-value
   }
-  // #enddocregion patch-value-rebuildform
+  // #enddocregion patch-value-on-changes
 }
 
-
-
 // #enddocregion v6

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.html

@@ -1,7 +1,7 @@
 <!-- #docregion -->
 <h2>Hero Detail</h2>
 <h3><i>A FormGroup with multiple FormControls</i></h3>
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
   <div class="form-group">
     <label class="center-block">Name:
       <input class="form-control" formControlName="name">

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-7.component.ts

@@ -38,31 +38,32 @@ export class HeroDetailComponent7 implements OnChanges {
 
   // #docregion ngOnChanges
   ngOnChanges() {
-    this.rebuildForm();
-  }
-   // #enddocregion ngOnChanges
-
-    // #docregion rebuildForm
-  rebuildForm() {
     this.heroForm.reset({
       name: this.hero.name,
+      address: this.hero.addresses[0] || new Address()
+    });
+  }
+  // #enddocregion ngOnChanges
+
+  /* First version of ngOnChanges
+  // #docregion ngOnChanges-1
+  ngOnChanges()
+  // #enddocregion ngOnChanges-1
+  */
+  ngOnChanges1() {
+    // #docregion reset
+    this.heroForm.reset();
+    // #enddocregion reset
+    // #docregion ngOnChanges-1
+    // #docregion set-value
+    this.heroForm.setValue({
+      name:    this.hero.name,
       // #docregion set-value-address
       address: this.hero.addresses[0] || new Address()
       // #enddocregion set-value-address
     });
-  }
-  // #enddocregion rebuildForm
-
-  /* First version of rebuildForm */
-  rebuildForm1() {
-    // #docregion reset
-    this.heroForm.reset();
-     // #enddocregion reset
-     // #docregion set-value
-     this.heroForm.setValue({
-      name:    this.hero.name,
-      address: this.hero.addresses[0] || new Address()
-   });
     // #enddocregion set-value
   }
+  // #enddocregion ngOnChanges-1
 }
+

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.html

@@ -1,7 +1,7 @@
 <!-- #docplaster-->
 <h3><i>Using FormArray to add groups</i></h3>
 
-<form [formGroup]="heroForm">
+<form [formGroup]="heroForm" novalidate>
     <p>Form Changed: {{ heroForm.dirty }}</p>
 
     <div class="form-group">
@@ -11,9 +11,7 @@
     </div>
     <!-- #docregion form-array-->
     <!-- #docregion form-array-skeleton -->
-    <!-- #docregion form-array-name -->
     <div formArrayName="secretLairs" class="well well-lg">
-    <!-- #enddocregion form-array-name -->
       <div *ngFor="let address of secretLairs.controls; let i=index" [formGroupName]="i" >
         <!-- The repeated address template -->
     <!-- #enddocregion form-array-skeleton -->

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail-8.component.ts

@@ -39,18 +39,12 @@ export class HeroDetailComponent8 implements OnChanges {
 
   // #docregion onchanges
   ngOnChanges() {
-    this.rebuildForm();
-  }
-  // #enddocregion onchanges
-
-  // #docregion rebuildform
-  rebuildForm() {
     this.heroForm.reset({
       name: this.hero.name
     });
     this.setAddresses(this.hero.addresses);
   }
-// #enddocregion rebuildform
+  // #enddocregion onchanges
 
   // #docregion get-secret-lairs
   get secretLairs(): FormArray {

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

@@ -1,11 +1,11 @@
 <!-- #docplaster -->
 <!-- #docregion -->
   <!-- #docregion buttons -->
-<form [formGroup]="heroForm" (ngSubmit)="onSubmit()">
+<form [formGroup]="heroForm" (ngSubmit)="onSubmit()" novalidate>
   <div style="margin-bottom: 1em">
     <button type="submit"
             [disabled]="heroForm.pristine" class="btn btn-success">Save</button> &nbsp;
-    <button type="button" (click)="revert()"
+    <button type="reset" (click)="revert()"
             [disabled]="heroForm.pristine" class="btn btn-danger">Revert</button>
   </div>
 

aio/content/examples/reactive-forms/src/app/hero-detail/hero-detail.component.ts

@@ -13,10 +13,7 @@ import { HeroService }           from '../hero.service';
   templateUrl: './hero-detail.component.html',
   styleUrls: ['./hero-detail.component.css']
 })
-
-// #docregion onchanges-implementation
 export class HeroDetailComponent implements OnChanges {
-// #enddocregion onchanges-implementation
   @Input() hero: Hero;
 
   heroForm: FormGroup;
@@ -45,10 +42,6 @@ export class HeroDetailComponent implements OnChanges {
   }
 
   ngOnChanges() {
-    this.rebuildForm();
-  }
-
-  rebuildForm() {
     this.heroForm.reset({
       name: this.hero.name
     });
@@ -73,7 +66,7 @@ export class HeroDetailComponent implements OnChanges {
   onSubmit() {
     this.hero = this.prepareSaveHero();
     this.heroService.updateHero(this.hero).subscribe(/* error handling */);
-    this.rebuildForm();
+    this.ngOnChanges();
   }
   // #enddocregion on-submit
 
@@ -99,7 +92,7 @@ export class HeroDetailComponent implements OnChanges {
   // #enddocregion prepare-save-hero
 
   // #docregion revert
-  revert() { this.rebuildForm(); }
+  revert() { this.ngOnChanges(); }
   // #enddocregion revert
 
   // #docregion log-name-change

aio/content/examples/reactive-forms/src/app/hero-list/hero-list.component.ts

@@ -1,7 +1,7 @@
 // #docregion
 import { Component, OnInit } from '@angular/core';
-import { Observable }        from 'rxjs';
-import { finalize } from 'rxjs/operators';
+import { Observable }        from 'rxjs/Observable';
+import 'rxjs/add/operator/finally';
 
 import { Hero }        from '../data-model';
 import { HeroService } from '../hero.service';
@@ -24,7 +24,7 @@ export class HeroListComponent implements OnInit {
     this.isLoading = true;
     this.heroes = this.heroService.getHeroes()
                       // Todo: error handling
-                      .pipe(finalize(() => this.isLoading = false));
+                      .finally(() => this.isLoading = false);
     this.selectedHero = undefined;
   }
 

aio/content/examples/reactive-forms/src/app/hero.service.ts

@@ -1,8 +1,9 @@
 // #docregion
 import { Injectable } from '@angular/core';
 
-import { Observable, of } from 'rxjs';
-import { delay } from 'rxjs/operators';
+import { Observable } from 'rxjs/Observable';
+import { of }         from 'rxjs/observable/of';
+import 'rxjs/add/operator/delay';
 
 import { Hero, heroes } from './data-model';
 
@@ -13,13 +14,13 @@ export class HeroService {
 
   // Fake server get; assume nothing can go wrong
   getHeroes(): Observable<Hero[]> {
-    return of(heroes).pipe(delay(this.delayMs)); // simulate latency with delay
+    return of(heroes).delay(this.delayMs); // simulate latency with delay
   }
 
   // Fake server update; assume nothing can go wrong
   updateHero(hero: Hero): Observable<Hero>  {
     const oldHero = heroes.find(h => h.id === hero.id);
     const newHero = Object.assign(oldHero, hero); // Demo: mutate cached hero
-    return of(newHero).pipe(delay(this.delayMs)); // simulate latency with delay
+    return of(newHero).delay(this.delayMs); // simulate latency with delay
   }
 }

aio/content/examples/router/src/app/admin/admin-dashboard.component.2.ts

@@ -1,8 +1,8 @@
 // #docregion
 import { Component, OnInit }  from '@angular/core';
 import { ActivatedRoute }     from '@angular/router';
-import { Observable }         from 'rxjs';
-import { map }                from 'rxjs/operators';
+import { Observable }         from 'rxjs/Observable';
+import 'rxjs/add/operator/map';
 
 @Component({
   template:  `
@@ -23,11 +23,11 @@ export class AdminDashboardComponent implements OnInit {
     // Capture the session ID if available
     this.sessionId = this.route
       .queryParamMap
-      .pipe(map(params => params.get('session_id') || 'None'));
+      .map(params => params.get('session_id') || 'None');
 
     // Capture the fragment if available
     this.token = this.route
       .fragment
-      .pipe(map(fragment => fragment || 'None'));
+      .map(fragment => fragment || 'None');
   }
 }

aio/content/examples/router/src/app/admin/admin-dashboard.component.ts

@@ -1,11 +1,11 @@
 // #docregion
 import { Component, OnInit }    from '@angular/core';
 import { ActivatedRoute }       from '@angular/router';
-import { Observable }           from 'rxjs';
-import { map }                  from 'rxjs/operators';
+import { Observable }           from 'rxjs/Observable';
 
 import { SelectivePreloadingStrategy } from '../selective-preloading-strategy';
 
+import 'rxjs/add/operator/map';
 
 @Component({
   template:  `
@@ -37,11 +37,11 @@ export class AdminDashboardComponent implements OnInit {
     // Capture the session ID if available
     this.sessionId = this.route
       .queryParamMap
-      .pipe(map(params => params.get('session_id') || 'None'));
+      .map(params => params.get('session_id') || 'None');
 
     // Capture the fragment if available
     this.token = this.route
       .fragment
-      .pipe(map(fragment => fragment || 'None'));
+      .map(fragment => fragment || 'None');
   }
 }

aio/content/examples/router/src/app/animations.ts

@@ -1,8 +1,8 @@
 // #docregion
-import { animate, state, style, transition, trigger } from '@angular/animations';
+import { animate, AnimationEntryMetadata, state, style, transition, trigger } from '@angular/core';
 
 // Component transition animations
-export const slideInDownAnimation =
+export const slideInDownAnimation: AnimationEntryMetadata =
   trigger('routeAnimation', [
     state('*',
       style({

aio/content/examples/router/src/app/auth.service.ts

@@ -1,8 +1,10 @@
 // #docregion
 import { Injectable } from '@angular/core';
 
-import { Observable, of } from 'rxjs';
-import { tap, delay } from 'rxjs/operators';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/of';
+import 'rxjs/add/operator/do';
+import 'rxjs/add/operator/delay';
 
 @Injectable()
 export class AuthService {
@@ -12,10 +14,7 @@ export class AuthService {
   redirectUrl: string;
 
   login(): Observable<boolean> {
-    return of(true).pipe(
-      delay(1000),
-      tap(val => this.isLoggedIn = true)
-    );
+    return Observable.of(true).delay(1000).do(val => this.isLoggedIn = true);
   }
 
   logout(): void {

aio/content/examples/router/src/app/can-deactivate-guard.service.1.ts

@@ -1,6 +1,6 @@
 // #docregion
 import { Injectable }           from '@angular/core';
-import { Observable }           from 'rxjs';
+import { Observable }           from 'rxjs/Observable';
 import { CanDeactivate,
          ActivatedRouteSnapshot,
          RouterStateSnapshot }  from '@angular/router';

aio/content/examples/router/src/app/can-deactivate-guard.service.ts

@@ -1,7 +1,7 @@
 // #docregion
 import { Injectable }    from '@angular/core';
 import { CanDeactivate } from '@angular/router';
-import { Observable }    from 'rxjs';
+import { Observable }    from 'rxjs/Observable';
 
 export interface CanComponentDeactivate {
  canDeactivate: () => Observable<boolean> | Promise<boolean> | boolean;

aio/content/examples/router/src/app/crisis-center/crisis-detail-resolver.service.ts

@@ -1,9 +1,10 @@
 // #docregion
+import 'rxjs/add/operator/map';
+import 'rxjs/add/operator/take';
 import { Injectable }             from '@angular/core';
+import { Observable }             from 'rxjs/Observable';
 import { Router, Resolve, RouterStateSnapshot,
          ActivatedRouteSnapshot } from '@angular/router';
-import { Observable }             from 'rxjs';
-import { map, take }              from 'rxjs/operators';
 
 import { Crisis, CrisisService }  from './crisis.service';
 
@@ -14,16 +15,13 @@ export class CrisisDetailResolver implements Resolve<Crisis> {
   resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Crisis> {
     let id = route.paramMap.get('id');
 
-    return this.cs.getCrisis(id).pipe(
-      take(1),
-      map(crisis => {
-        if (crisis) {
-          return crisis;
-        } else { // id not found
-          this.router.navigate(['/crisis-center']);
-          return null;
-        }
-      })
-    );
+    return this.cs.getCrisis(id).take(1).map(crisis => {
+      if (crisis) {
+        return crisis;
+      } else { // id not found
+        this.router.navigate(['/crisis-center']);
+        return null;
+      }
+    });
   }
 }

aio/content/examples/router/src/app/crisis-center/crisis-detail.component.1.ts

@@ -1,9 +1,9 @@
 // #docplaster
 // #docregion
+import 'rxjs/add/operator/switchMap';
 import { Component, OnInit, HostBinding }   from '@angular/core';
 import { ActivatedRoute, Router, ParamMap } from '@angular/router';
-import { Observable }                       from 'rxjs';
-import { switchMap }                        from 'rxjs/operators';
+import { Observable }                       from 'rxjs/Observable';
 
 import { slideInDownAnimation }   from '../animations';
 import { Crisis, CrisisService }  from './crisis.service';
@@ -46,9 +46,8 @@ export class CrisisDetailComponent implements OnInit {
   // #docregion ngOnInit
   ngOnInit() {
     this.route.paramMap
-      .pipe(
-        switchMap((params: ParamMap) =>
-          this.service.getCrisis(params.get('id'))))
+      .switchMap((params: ParamMap) =>
+        this.service.getCrisis(params.get('id')))
       .subscribe((crisis: Crisis) => {
         if (crisis) {
           this.editName = crisis.name;

aio/content/examples/router/src/app/crisis-center/crisis-detail.component.ts

@@ -2,7 +2,7 @@
 // #docregion
 import { Component, OnInit, HostBinding } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 import { slideInDownAnimation }   from '../animations';
 import { Crisis }         from './crisis.service';

aio/content/examples/router/src/app/crisis-center/crisis-list.component.1.ts

@@ -1,10 +1,10 @@
 
+import 'rxjs/add/operator/switchMap';
 import { Component, OnInit }        from '@angular/core';
 import { ActivatedRoute, ParamMap } from '@angular/router';
 
 import { Crisis, CrisisService } from './crisis.service';
-import { Observable }            from 'rxjs';
-import { switchMap }             from 'rxjs/operators';
+import { Observable }            from 'rxjs/Observable';
 
 @Component({
   // #docregion relative-navigation-router-link
@@ -34,11 +34,10 @@ export class CrisisListComponent implements OnInit {
 
 
   ngOnInit() {
-    this.crises$ = this.route.paramMap.pipe(
-      switchMap((params: ParamMap) => {
+    this.crises$ = this.route.paramMap
+      .switchMap((params: ParamMap) => {
         this.selectedId = +params.get('id');
         return this.service.getCrises();
-      })
-    );
+      });
   }
 }

aio/content/examples/router/src/app/crisis-center/crisis-list.component.ts

@@ -1,10 +1,10 @@
 // #docregion
+import 'rxjs/add/operator/switchMap';
 import { Component, OnInit }        from '@angular/core';
 import { ActivatedRoute, ParamMap } from '@angular/router';
 
 import { Crisis, CrisisService } from './crisis.service';
-import { Observable }            from 'rxjs';
-import { switchMap }             from 'rxjs/operators';
+import { Observable }            from 'rxjs/Observable';
 
 @Component({
   template: `
@@ -32,11 +32,10 @@ export class CrisisListComponent implements OnInit {
   // #enddocregion ctor
 
   ngOnInit() {
-    this.crises$ = this.route.paramMap.pipe(
-      switchMap((params: ParamMap) => {
+    this.crises$ = this.route.paramMap
+      .switchMap((params: ParamMap) => {
         this.selectedId = +params.get('id');
         return this.service.getCrises();
-      })
-    );
+      });
   }
 }

aio/content/examples/router/src/app/crisis-center/crisis.service.ts

@@ -1,7 +1,8 @@
 // #docplaster
 // #docregion , mock-crises
-import { BehaviorSubject } from 'rxjs';
-import { map } from 'rxjs/operators';
+import 'rxjs/add/observable/of';
+import 'rxjs/add/operator/map';
+import { BehaviorSubject } from 'rxjs/BehaviorSubject';
 
 export class Crisis {
   constructor(public id: number, public name: string) { }
@@ -25,9 +26,8 @@ export class CrisisService {
   getCrises() { return this.crises$; }
 
   getCrisis(id: number | string) {
-    return this.getCrises().pipe(
-      map(crises => crises.find(crisis => crisis.id === +id))
-    );
+    return this.getCrises()
+      .map(crises => crises.find(crisis => crisis.id === +id));
   }
 
   // #enddocregion

aio/content/examples/router/src/app/dialog.service.ts

@@ -1,6 +1,7 @@
 // #docregion
+import 'rxjs/add/observable/of';
 import { Injectable } from '@angular/core';
-import { Observable, of } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 /**
  * Async modal dialog service
@@ -16,6 +17,6 @@ export class DialogService {
   confirm(message?: string): Observable<boolean> {
     const confirmation = window.confirm(message || 'Is it OK?');
 
-    return of(confirmation);
+    return Observable.of(confirmation);
   };
 }

aio/content/examples/router/src/app/heroes/hero-detail.component.1.ts

@@ -1,10 +1,10 @@
 // #docplaster
 // #docregion
 // #docregion rxjs-operator-import
-import { switchMap } from 'rxjs/operators';
+import 'rxjs/add/operator/switchMap';
 // #enddocregion rxjs-operator-import
 import { Component, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 // #docregion imports
 import { Router, ActivatedRoute, ParamMap } from '@angular/router';
 // #enddocregion imports
@@ -41,10 +41,9 @@ export class HeroDetailComponent implements OnInit  {
 
   // #docregion ngOnInit
   ngOnInit() {
-    this.hero$ = this.route.paramMap.pipe(
-      switchMap((params: ParamMap) =>
-        this.service.getHero(params.get('id')))
-    );
+    this.hero$ = this.route.paramMap
+      .switchMap((params: ParamMap) =>
+        this.service.getHero(params.get('id')));
   }
   // #enddocregion ngOnInit
 

aio/content/examples/router/src/app/heroes/hero-detail.component.2.ts

@@ -2,7 +2,7 @@
 // #docregion
 import { Component, OnInit }      from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
-import { Observable }             from 'rxjs';
+import { Observable }             from 'rxjs/Observable';
 
 import { Hero, HeroService } from './hero.service';
 

aio/content/examples/router/src/app/heroes/hero-detail.component.ts

@@ -1,11 +1,11 @@
 // #docplaster
 // #docregion
 // #docregion rxjs-operator-import
-import { switchMap } from 'rxjs/operators';
+import 'rxjs/add/operator/switchMap';
 // #enddocregion rxjs-operator-import
 import { Component, OnInit, HostBinding } from '@angular/core';
+import { Observable } from 'rxjs/Observable';
 import { Router, ActivatedRoute, ParamMap } from '@angular/router';
-import { Observable } from 'rxjs';
 
 import { slideInDownAnimation } from '../animations';
 
@@ -48,10 +48,9 @@ export class HeroDetailComponent implements OnInit {
 
   // #docregion ngOnInit
   ngOnInit() {
-    this.hero$ = this.route.paramMap.pipe(
-      switchMap((params: ParamMap) =>
-        this.service.getHero(params.get('id')))
-    );
+    this.hero$ = this.route.paramMap
+      .switchMap((params: ParamMap) =>
+        this.service.getHero(params.get('id')));
   }
   // #enddocregion ngOnInit
 

aio/content/examples/router/src/app/heroes/hero-list.component.1.ts

@@ -3,7 +3,7 @@
 // TODO SOMEDAY: Feature Componetized like HeroCenter
 import { Component, OnInit }   from '@angular/core';
 import { Router }              from '@angular/router';
-import { Observable }          from 'rxjs';
+import { Observable }          from 'rxjs/Observable';
 
 import { Hero, HeroService }   from './hero.service';
 

aio/content/examples/router/src/app/heroes/hero-list.component.ts

@@ -2,8 +2,8 @@
 // #docregion
 // TODO SOMEDAY: Feature Componetized like CrisisCenter
 // #docregion rxjs-imports
-import { Observable } from 'rxjs';
-import { switchMap } from 'rxjs/operators';
+import 'rxjs/add/operator/switchMap';
+import { Observable } from 'rxjs/Observable';
 // #enddocregion rxjs-imports
 import { Component, OnInit } from '@angular/core';
 // #docregion import-router
@@ -41,13 +41,12 @@ export class HeroListComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.heroes$ = this.route.paramMap.pipe(
-      switchMap((params: ParamMap) => {
+    this.heroes$ = this.route.paramMap
+      .switchMap((params: ParamMap) => {
         // (+) before `params.get()` turns the string into a number
         this.selectedId = +params.get('id');
         return this.service.getHeroes();
-      })
-    );
+      });
   }
   // #enddocregion ctor
 // #docregion ctor

aio/content/examples/router/src/app/heroes/hero.service.ts

@@ -1,7 +1,8 @@
 // #docregion
+import 'rxjs/add/observable/of';
+import 'rxjs/add/operator/map';
 import { Injectable } from '@angular/core';
-import { of } from 'rxjs';
-import { map } from 'rxjs/operators';
+import { Observable } from 'rxjs/Observable';
 
 export class Hero {
   constructor(public id: number, public name: string) { }
@@ -18,12 +19,11 @@ const HEROES = [
 
 @Injectable()
 export class HeroService {
-  getHeroes() { return of(HEROES); }
+  getHeroes() { return Observable.of(HEROES); }
 
   getHero(id: number | string) {
-    return this.getHeroes().pipe(
+    return this.getHeroes()
       // (+) before `id` turns the string into a number
-      map(heroes => heroes.find(hero => hero.id === +id))
-    );
+      .map(heroes => heroes.find(hero => hero.id === +id));
   }
 }

aio/content/examples/router/src/app/selective-preloading-strategy.ts

@@ -1,7 +1,8 @@
 // #docregion
+import 'rxjs/add/observable/of';
 import { Injectable } from '@angular/core';
 import { PreloadingStrategy, Route } from '@angular/router';
-import { Observable, of } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
 
 @Injectable()
 export class SelectivePreloadingStrategy implements PreloadingStrategy {
@@ -17,7 +18,7 @@ export class SelectivePreloadingStrategy implements PreloadingStrategy {
 
       return load();
     } else {
-      return of(null);
+      return Observable.of(null);
     }
   }
 }