ci: sync CircleCI config from master to 5.0.x

The two configurations became out of sync due to a few commits
which were erroneously only applied to the master branch.

.bazelrc

@@ -0,0 +1,18 @@
+# Make compilation fast, by keeping a few copies of the compilers
+# running as daemons, and cache SourceFile AST's to reduce parse time.
+build --strategy=TypeScriptCompile=worker
+build --strategy=AngularTemplateCompile=worker
+
+# Don't create bazel-* symlinks in the WORKSPACE directory.
+# These require .gitignore and may scare users.
+# Also, it's a workaround for https://github.com/bazelbuild/rules_typescript/issues/12
+# which affects the common case of having `tsconfig.json` in the WORKSPACE directory.
+#
+# Instead, you should run `bazel info bazel-bin` to find out where the outputs went.
+build --symlink_prefix=/
+
+# Performance: avoid stat'ing input files
+build --watchfs
+
+# Don't print all the .d.ts output locations after builds
+build --show_result=0

.circleci/bazel.rc

@@ -1,25 +0,0 @@
-# These options are enabled when running on CI
-# We do this by copying this file to /etc/bazel.bazelrc at the start of the build.
-# See remote cache documentation in /docs/BAZEL.md
-
-# Don't be spammy in the logs
-build --noshow_progress
-
-# Don't run manual tests
-test --test_tag_filters=-manual
-
-# Enable experimental CircleCI bazel remote cache proxy
-# See remote cache documentation in /docs/BAZEL.md
-build --experimental_remote_spawn_cache --remote_rest_cache=http://localhost:7643
-
-# Prevent unstable environment variables from tainting cache keys
-build --experimental_strict_action_env
-
-# 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 "medium" class which is the default:
-# https://circleci.com/docs/2.0/configuration-reference/#resource_class
-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

@@ -12,15 +12,8 @@
 ## IMPORTANT
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.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
-  run:
-    name: Start up bazel remote cache proxy
-    command: ~/bazel-remote-proxy -backend circleci://
-    background: true
+var_1: &docker_image angular/ngcontainer:0.0.8
+var_2: &cache_key angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.0.8
 
 # Settings common to each job
 anchor_1: &job_defaults
@@ -41,15 +34,10 @@ 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
-
-      - 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)'
+      # 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)'
 
       - restore_cache:
           key: *cache_key
@@ -59,24 +47,18 @@ jobs:
 
   build:
     <<: *job_defaults
-    resource_class: large
     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
-
       - restore_cache:
           key: *cache_key
-
+      
       - 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
       # This avoids waiting for a build command to finish before running the first test
       # See https://github.com/bazelbuild/bazel/issues/4257
-      - run: bazel query --output=label '//modules/... union //packages/... union //tools/...' | xargs bazel test
+      - run: bazel query --output=label '//packages/... union @angular//...' | xargs bazel test --config=ci
 
       - save_cache:
           key: *cache_key

.circleci/setup_cache.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-# Install bazel remote cache proxy
-# This is temporary until the feature is no longer experimental on CircleCI.
-# See remote cache documentation in /docs/BAZEL.md
-
-set -u -e
-
-readonly DOWNLOAD_URL="https://5-116431813-gh.circle-artifacts.com/0/pkg/bazel-remote-proxy-$(uname -s)_$(uname -m)"
-
-curl --fail -o ~/bazel-remote-proxy "$DOWNLOAD_URL"
-chmod +x ~/bazel-remote-proxy

.github/angular-robot.yml

@@ -1,100 +0,0 @@
-# Configuration for angular-robot
-
-# options for the merge plugin
-merge:
-  # the status will be added to your pull requests
-  status:
-    # set to true to disable
-    disabled: false
-    # the name of the status
-    context: "ci/angular: merge status"
-    # text to show when all checks pass
-    successText: "All checks passed!"
-    # text to show when some checks are failing
-    failureText: "The following checks are failing:"
-
-  # the g3 status will be added to your pull requests if they include files that match the patterns
-  g3Status:
-    # set to true to disable
-    disabled: false
-    # the name of the status
-    context: "google3"
-    # text to show when the status is pending
-    pendingDesc: "Googler: test this change in google3 http://go/angular-g3sync"
-    # text to show when the status is success
-    successDesc: "Does not affect google3"
-    # 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
-    exclude:
-      - "packages/language-service/**"
-      - "**/.gitignore"
-      - "**/.gitkeep"
-
-  # 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.
-\nPlease help to unblock it by resolving these conflicts. Thanks!"
-
-  # label to monitor
-  mergeLabel: "PR action: merge"
-
-  # list of checks that will determine if the merge label can be added
-  checks:
-    # whether the PR shouldn't have a conflict with the base branch
-    noConflict: true
-    # list of labels that a PR needs to have, checked with a regexp (e.g. "PR target:" will work for the label "PR target: master")
-    requiredLabels:
-      - "PR target: *"
-      - "cla: yes"
-
-    # list of labels that a PR shouldn't have, checked after the required labels with a regexp
-    forbiddenLabels:
-      - "PR target: TBD"
-      - "PR action: cleanup"
-      - "PR action: review"
-      - "PR state: blocked"
-      - "cla: no"
-
-    # list of PR statuses that need to be successful
-    requiredStatuses:
-      - "continuous-integration/travis-ci/pr"
-      - "code-review/pullapprove"
-      - "ci/circleci: build"
-      - "ci/circleci: lint"
-
-    # the comment that will be added when the merge label is added despite failing checks, leave empty or set to false to disable
-    # {{MERGE_LABEL}} will be replaced by the value of the mergeLabel option
-    # {{PLACEHOLDER}} will be replaced by the list of failing checks
-  mergeRemovedComment: "I see that you just added the `{{MERGE_LABEL}}` label, but the following checks are still failing:
-\n{{PLACEHOLDER}}
-\n
-\n**If you want your PR to be merged, it has to pass all the CI checks.**
-\n
-\nIf you can't get the PR to a green state due to flakes or broken master, please try rebasing to master and/or restarting the CI job. If that fails and you believe that the issue is not due to your change, please contact the caretaker and ask for help."
-
-# options for the triage plugin
-triage:
-  # 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"
-      - "severity*"
-      - "freq*"
-      - "comp: *"
-    -
-      - "type: feature"
-      - "comp: *"
-    -
-      - "type: refactor"
-      - "comp: *"
-    -
-      - "type: RFC / Discussion / question"
-      - "comp: *"

.nvmrc

@@ -1 +1 @@
-8.9
+6.9.5

.pullapprove.yml

@@ -10,11 +10,12 @@
 # brocco - Mike Brocchi
 # chuckjaz - Chuck Jazdzewski
 # filipesilva - Filipe Silva
+# Foxandxss - Jesús Rodríguez
 # gkalpak - George Kalpakas
 # hansl - Hans Larsen
 # IgorMinar - Igor Minar
 # jasonaden - Jason Aden
-# kapunahelewong - Kapunahele Wong
+# juleskremer - Jules Kremer
 # kara - Kara Erickson
 # matsko - Matias Niemelä
 # mhevery - Misko Hevery
@@ -24,6 +25,7 @@
 # tinayuangao - Tina Gao
 # vicb - Victor Berchet
 # vikerman - Vikram Subramanian
+# wardbell - Ward Bell
 
 
 version: 2
@@ -34,34 +36,14 @@ group_defaults:
     enabled: true
   approve_by_comment:
     enabled: false
-  # see http://docs.pullapprove.com/groups/author_approval/
-  author_approval:
-    # If the author is a reviewer on the PR, they will automatically have an "approved" status.
-    auto: true
 
 groups:
-  # Require all PRs to have at least one approval from *someone*
-  all:
-    users: all
-    required: 1
-    rejection_value: -999
-    # In this group, your self-approval does not count
-    author_approval:
-      auto: false
-      ignored: true
-    files:
-      include:
-        - "*"
-
   root:
     conditions:
       files:
         include:
           - "*"
         exclude:
-          - "WORKSPACE"
-          - "BUILD.bazel"
-          - ".circleci/*"
           - "aio/*"
           - "integration/*"
           - "modules/*"
@@ -88,12 +70,9 @@ groups:
           - "*.bazel"
           - "*.bzl"
           - "packages/bazel/*"
-          - "tools/bazel.rc"
     users:
       - alexeagle #primary
       - chuckjaz
-      - IgorMinar #fallback
-      - mhevery
       - vikerman #fallback
 
   build-and-ci:
@@ -105,7 +84,6 @@ groups:
           - "*.lock"
           - "tools/*"
         exclude:
-          - "tools/bazel.rc"
           - "tools/public_api_guard/*"
           - "aio/*"
     users:
@@ -129,9 +107,8 @@ groups:
       files:
         - "packages/core/*"
     users:
-      - mhevery #primary
-      - chuckjaz
-      - kara
+      - chuckjaz #primary
+      - mhevery
       - vicb
       - IgorMinar #fallback
 
@@ -142,6 +119,7 @@ groups:
         - "packages/platform-browser/animations/*"
     users:
       - matsko #primary
+      - chuckjaz #fallback
       - mhevery #fallback
       - IgorMinar #fallback
 
@@ -173,7 +151,6 @@ groups:
       - hansl
       - filipesilva #fallback
       - brocco #fallback
-      - IgorMinar #fallback
 
   compiler-cli:
     conditions:
@@ -219,8 +196,9 @@ groups:
         - "packages/common/http/*"
         - "packages/http/*"
     users:
-      - alxhub #primary
-      - IgorMinar
+      - vikerman #primary
+      - alxhub
+      - IgorMinar #fallback
       - mhevery #fallback
 
   language-service:
@@ -239,7 +217,7 @@ groups:
       files:
         - "packages/router/*"
     users:
-      - jasonaden #primary
+      - jasonaden
       - vicb
       - IgorMinar #fallback
       - mhevery #fallback
@@ -270,7 +248,8 @@ groups:
         - "packages/platform-server/*"
     users:
       - vikerman #primary
-      - alxhub #secondary
+      # needs secondary
+      - alxhub
       - vicb
       - IgorMinar #fallback
       - mhevery #fallback
@@ -300,7 +279,7 @@ groups:
       files:
         - "packages/benchpress/*"
     users:
-      - alxhub # primary
+      - alxhub #primary
       # needs secondary
       - IgorMinar #fallback
       - mhevery #fallback
@@ -328,11 +307,13 @@ groups:
           - "aio/content/navigation.json"
           - "aio/content/license.md"
     users:
-      - kapunahelewong
+      - juleskremer #primary
+      - Foxandxss
       - stephenfluin
+      - wardbell
       - petebacondarwin
       - gkalpak
-      - IgorMinar
+      - IgorMinar #fallback
       - mhevery #fallback
 
   angular.io-marketing:
@@ -343,8 +324,9 @@ groups:
           - "aio/content/navigation.json"
           - "aio/content/license.md"
     users:
+      - juleskremer #primary
       - stephenfluin
       - petebacondarwin
       - gkalpak
-      - IgorMinar
+      - IgorMinar #fallback
       - mhevery #fallback

.travis.yml

@@ -54,14 +54,17 @@ env:
     - CI_MODE=browserstack_optional
     - CI_MODE=aio_tools_test
     - CI_MODE=aio
+    - CI_MODE=aio_optional
     - CI_MODE=aio_e2e AIO_SHARD=0
     - CI_MODE=aio_e2e AIO_SHARD=1
+    - CI_MODE=bazel
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: "CI_MODE=saucelabs_optional"
     - env: "CI_MODE=browserstack_optional"
+    - env: "CI_MODE=aio_optional"
 
 before_install:
   # source the env.sh script so that the exported variables are available to other scripts later on

BUILD.bazel

@@ -1,8 +1,5 @@
 package(default_visibility = ["//visibility:public"])
-
-exports_files([
-    "tsconfig.json",
-])
+exports_files(["tsconfig.json"])
 
 # This rule belongs in node_modules/BUILD
 # It's here as a workaround for
@@ -14,23 +11,17 @@ filegroup(
     # bazel query "deps(:node_modules)" | wc -l
     # This won't scale in the general case.
     # TODO(alexeagle): figure out what to do
-    srcs = glob(["/".join([
-        "node_modules",
-        pkg,
-        "**",
-        ext,
-    ]) for pkg in [
+    srcs = glob(["/".join(["node_modules", pkg, "**", ext]) for pkg in [
         "jasmine",
         "typescript",
         "zone.js",
-        "tsutils",
+        "rxjs",
         "@types",
         "tsickle",
         "hammerjs",
         "protobufjs",
         "bytebuffer",
         "reflect-metadata",
-        "source-map-support",
         "minimist",
     ] for ext in [
         "*.js",
@@ -38,26 +29,3 @@ filegroup(
         "*.d.ts",
     ]]),
 )
-
-filegroup(
-    name = "web_test_bootstrap_scripts",
-    # do not sort
-    srcs = [
-        "//:node_modules/reflect-metadata/Reflect.js",
-        "//:node_modules/zone.js/dist/zone.js",
-        "//: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/proxy.js",
-        "//:node_modules/zone.js/dist/jasmine-patch.js",
-    ],
-)
-
-filegroup(
-    name = "angularjs",
-    # do not sort
-    srcs = [
-        "//:node_modules/angular/angular.js",
-        "//:node_modules/angular-mocks/angular-mocks.js",
-    ],
-)

CHANGELOG.md

@@ -1,228 +1,3 @@
-<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
-
-(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 [/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="5.2.4"></a>
-## [5.2.4](https://github.com/angular/angular/compare/5.2.3...5.2.4) (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)) ([c4fb696](https://github.com/angular/angular/commit/c4fb696)), 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 ([#22007](https://github.com/angular/angular/issues/22007)) ([ce51ea9](https://github.com/angular/angular/commit/ce51ea9))
-* **core:** fix proper propagation of subscriptions in EventEmitter ([#22016](https://github.com/angular/angular/issues/22016)) ([c6645e7](https://github.com/angular/angular/commit/c6645e7)), closes [#21999](https://github.com/angular/angular/issues/21999)
-* **core:** should check Zone existance when scheduleMicroTask ([#20656](https://github.com/angular/angular/issues/20656)) ([aa9ba7f](https://github.com/angular/angular/commit/aa9ba7f))
-
-
-
-<a name="5.2.3"></a>
-## [5.2.3](https://github.com/angular/angular/compare/5.2.2...5.2.3) (2018-01-31)
-
-
-### Bug Fixes
-
-* **common:** allow HttpInterceptors to inject HttpClient ([#19809](https://github.com/angular/angular/issues/19809)) ([ed2b717](https://github.com/angular/angular/commit/ed2b717)), closes [#18224](https://github.com/angular/angular/issues/18224)
-* **common:** generate closure-locale data file with exported plural functions ([#21873](https://github.com/angular/angular/issues/21873)) ([c2f5ed5](https://github.com/angular/angular/commit/c2f5ed5)), closes [#21870](https://github.com/angular/angular/issues/21870)
-* **core:** fix retrieving the binding name when an expression changes ([#21814](https://github.com/angular/angular/issues/21814)) ([81d64d6](https://github.com/angular/angular/commit/81d64d6)), closes [#21735](https://github.com/angular/angular/issues/21735) [#21788](https://github.com/angular/angular/issues/21788)
-* **forms:** allow FormBuilder to create controls with any formState type ([#20917](https://github.com/angular/angular/issues/20917)) ([56f3e18](https://github.com/angular/angular/commit/56f3e18)), closes [#20368](https://github.com/angular/angular/issues/20368)
-* **forms:** inserting and removing controls should work in re-bound form arrays ([#21822](https://github.com/angular/angular/issues/21822)) ([fad99cc](https://github.com/angular/angular/commit/fad99cc)), closes [#21501](https://github.com/angular/angular/issues/21501)
-* **language-service:** ensure correct paths are passed to TypeScript ([#21812](https://github.com/angular/angular/issues/21812)) ([250c8da](https://github.com/angular/angular/commit/250c8da))
-* **language-service:** spell diagnostics correctly ([#21812](https://github.com/angular/angular/issues/21812)) ([778e6e7](https://github.com/angular/angular/commit/778e6e7))
-* **router:** remove [@internal](https://github.com/internal) tag on ParamInheritanceType ([#21773](https://github.com/angular/angular/issues/21773)) ([35a0721](https://github.com/angular/angular/commit/35a0721)), closes [#21456](https://github.com/angular/angular/issues/21456)
-
-
-
-<a name="5.2.2"></a>
-## [5.2.2](https://github.com/angular/angular/compare/5.2.1...5.2.2) (2018-01-25)
-
-
-### Bug Fixes
-
-* **common:** A null value should remove the style on IE ([#21679](https://github.com/angular/angular/issues/21679)) ([c12ea3a](https://github.com/angular/angular/commit/c12ea3a)), closes [#21064](https://github.com/angular/angular/issues/21064)
-* **common:** don't remove special characters when extracting CLDR data ([#21626](https://github.com/angular/angular/issues/21626)) ([a62c186](https://github.com/angular/angular/commit/a62c186))
-* **common:** extract plural function from i18n locale data files for TS 2.6 ([#21626](https://github.com/angular/angular/issues/21626)) ([71f9eaa](https://github.com/angular/angular/commit/71f9eaa)), 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)) ([982eb7b](https://github.com/angular/angular/commit/982eb7b)), 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)) ([02352bc](https://github.com/angular/angular/commit/02352bc)), closes [#21078](https://github.com/angular/angular/issues/21078)
-* **compiler:** Don't strip `/*# sourceURL ... */` ([#16088](https://github.com/angular/angular/issues/16088)) ([de6c644](https://github.com/angular/angular/commit/de6c644))
-* **compiler:** fix ICU select messages to use male/female/other ([#21713](https://github.com/angular/angular/issues/21713)) ([8e44577](https://github.com/angular/angular/commit/8e44577))
-* **compiler-cli:** do not fold errors past calls in the collector ([#21708](https://github.com/angular/angular/issues/21708)) ([52970c0](https://github.com/angular/angular/commit/52970c0))
-* **compiler-cli:** do not lower expressions in non-modules ([#21649](https://github.com/angular/angular/issues/21649)) ([ba4ea82](https://github.com/angular/angular/commit/ba4ea82))
-* **router:** don't use ParamsInheritanceStrategy in declarations ([#21574](https://github.com/angular/angular/issues/21574)) ([8b3fbb5](https://github.com/angular/angular/commit/8b3fbb5)), closes [#21456](https://github.com/angular/angular/issues/21456)
-
-
-
-<a name="5.2.1"></a>
-## [5.2.1](https://github.com/angular/angular/compare/5.2.0...5.2.1) (2018-01-17)
-
-
-### Bug Fixes
-
-* **animations:** fix increment/decrement aliases example ([#18323](https://github.com/angular/angular/issues/18323)) ([48c1898](https://github.com/angular/angular/commit/48c1898))
-* **benchpress:** should still support selenium_webdriver < 3.6.0 ([#21477](https://github.com/angular/angular/issues/21477)) ([3c6a506](https://github.com/angular/angular/commit/3c6a506))
-* **common:** set correct timezone for ISO8601 dates in Safari ([#21506](https://github.com/angular/angular/issues/21506)) ([8e9cd57](https://github.com/angular/angular/commit/8e9cd57)), closes [#21491](https://github.com/angular/angular/issues/21491)
-* **compiler:** cache external reference resolution ([#21359](https://github.com/angular/angular/issues/21359)) ([c32e833](https://github.com/angular/angular/commit/c32e833))
-* **compiler:** make `.ngsummary.json` files idempotent ([#21448](https://github.com/angular/angular/issues/21448)) ([a931a41](https://github.com/angular/angular/commit/a931a41))
-* **core:** fix chained http call ([#20924](https://github.com/angular/angular/issues/20924)) ([54e7576](https://github.com/angular/angular/commit/54e7576)), closes [#20921](https://github.com/angular/angular/issues/20921)
-* **language-service:** Clear caches when program changes ([#21337](https://github.com/angular/angular/issues/21337)) ([cc9419d](https://github.com/angular/angular/commit/cc9419d)), 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)) ([51eb3d4](https://github.com/angular/angular/commit/51eb3d4))
-
-
-### Features
-
-* **core:** add binding name to content changed error ([#20352](https://github.com/angular/angular/issues/20352)) ([4556532](https://github.com/angular/angular/commit/4556532))
-* **forms:** handle string with and without line boundary on pattern validator ([#19256](https://github.com/angular/angular/issues/19256)) ([75f8522](https://github.com/angular/angular/commit/75f8522))
-
-
-
-<a name="5.2.0"></a>
-# [5.2.0](https://github.com/angular/angular/compare/5.2.0-rc.0...5.2.0) (2018-01-10)
-
-
-### Bug Fixes
-
-* **bazel:** Give correct module names for ES6 output ([#21320](https://github.com/angular/angular/issues/21320)) ([9728dce](https://github.com/angular/angular/commit/9728dce)), closes [#21022](https://github.com/angular/angular/issues/21022)
-* **benchpress:** forward compat with selenium_webdriver 3.6.0 ([#21399](https://github.com/angular/angular/issues/21399)) ([6040ee3](https://github.com/angular/angular/commit/6040ee3))
-* **benchpress:** work around missing events from Chrome 63 ([#21396](https://github.com/angular/angular/issues/21396)) ([fa03ae1](https://github.com/angular/angular/commit/fa03ae1))
-* **common:** export currencies via `getCurrencySymbol` ([#20983](https://github.com/angular/angular/issues/20983)) ([fecf768](https://github.com/angular/angular/commit/fecf768))
-
-Note: Due to an animation fix back in 5.1.1 ([c2b3792](https://github.com/angular/angular/commit/c2b3792a3b5fa5215fe2ef7e0ac6511086ffe4c1)) which allows for nested :leave queries to work within animation sequences, all elements that are dynamically inserted (*ngIf, *ngFor, etc…) now contain the special CSS class: “ng-star-inserted”. This may cause failures within unit tests if there are any assertions that match against element.className directly. (An easy fix for this is to match using a regular expression instead of asserting the className string directly.)
-
-<a name="5.2.0-rc.0"></a>
-# [5.2.0-rc.0](https://github.com/angular/angular/compare/5.2.0-beta.1...5.2.0-rc.0) (2018-01-04)
-
-
-### Bug Fixes
-
-* **animations:** avoid infinite loop with multiple blocked sub triggers ([#21119](https://github.com/angular/angular/issues/21119)) ([86a36ea](https://github.com/angular/angular/commit/86a36ea))
-* **animations:** renaming issue with DOMAnimation. ([#21125](https://github.com/angular/angular/issues/21125)) ([871ece6](https://github.com/angular/angular/commit/871ece6))
-* **common:** handle JS floating point errors in percent pipe ([#20329](https://github.com/angular/angular/issues/20329)) ([07b81ae](https://github.com/angular/angular/commit/07b81ae)), closes [#20136](https://github.com/angular/angular/issues/20136)
-* **language-service:** ignore null metadatas ([#20557](https://github.com/angular/angular/issues/20557)) ([3e47ea2](https://github.com/angular/angular/commit/3e47ea2)), closes [#20260](https://github.com/angular/angular/issues/20260)
-* **router:** fix wildcard route with lazy loaded module (again) ([#18139](https://github.com/angular/angular/issues/18139)) ([5ba1cf1](https://github.com/angular/angular/commit/5ba1cf1)), closes [#13848](https://github.com/angular/angular/issues/13848)
-
-
-
-<a name="5.1.3"></a>
-## [5.1.3](https://github.com/angular/angular/compare/5.1.2...5.1.3) (2018-01-03)
-
-
-### Bug Fixes
-
-* **animations:** avoid infinite loop with multiple blocked sub triggers ([#21119](https://github.com/angular/angular/issues/21119)) ([3e34fa8](https://github.com/angular/angular/commit/3e34fa8))
-* **animations:** renaming issue with DOMAnimation. ([#21125](https://github.com/angular/angular/issues/21125)) ([d1f4500](https://github.com/angular/angular/commit/d1f4500))
-* **common:** handle JS floating point errors in percent pipe ([#20329](https://github.com/angular/angular/issues/20329)) ([fa0e8ef](https://github.com/angular/angular/commit/fa0e8ef)), closes [#20136](https://github.com/angular/angular/issues/20136)
-* **language-service:** ignore null metadatas ([#20557](https://github.com/angular/angular/issues/20557)) ([48a1f32](https://github.com/angular/angular/commit/48a1f32)), closes [#20260](https://github.com/angular/angular/issues/20260)
-* **router:** fix wildcard route with lazy loaded module (again) ([#18139](https://github.com/angular/angular/issues/18139)) ([8c99175](https://github.com/angular/angular/commit/8c99175)), closes [#13848](https://github.com/angular/angular/issues/13848)
-
-
-<a name="5.2.0-beta.1"></a>
-# [5.2.0-beta.1](https://github.com/angular/angular/compare/5.2.0-beta.0...5.2.0-beta.1) (2017-12-20)
-
-
-### Bug Fixes
-
-* **compiler:** generate the correct imports for summary type-check ([d91ff17](https://github.com/angular/angular/commit/d91ff17))
-* **forms:** avoid producing an error with hostBindingTypeCheck ([d213a20](https://github.com/angular/angular/commit/d213a20))
-
-
-### Features
-
-* **compiler:** allow ngIf to use the ngIf expression directly as a guard ([82bcd83](https://github.com/angular/angular/commit/82bcd83))
-* **router:** add "paramsInheritanceStrategy" router configuration option ([5efea2f](https://github.com/angular/angular/commit/5efea2f)), closes [#20572](https://github.com/angular/angular/issues/20572)
-
-
-
-<a name="5.1.2"></a>
-## [5.1.2](https://github.com/angular/angular/compare/5.1.1...5.1.2) (2017-12-20)
-
-
-### Bug Fixes
-
-* **common:** fix a Closure compilation issue. ([267ebf3](https://github.com/angular/angular/commit/267ebf3))
-* **compiler:** make tsx file aot compatible ([756dd34](https://github.com/angular/angular/commit/756dd34)), closes [#20555](https://github.com/angular/angular/issues/20555)
-* **compiler:** report an error for recursive module references ([ced575f](https://github.com/angular/angular/commit/ced575f))
-* **compiler-cli:** do not emit invalid .metadata.json files ([a1d4c2d](https://github.com/angular/angular/commit/a1d4c2d))
-* **compiler-cli:** do not force type checking on .js files ([3b63e16](https://github.com/angular/angular/commit/3b63e16))
-* **service-worker:** check for updates on navigation ([a33182c](https://github.com/angular/angular/commit/a33182c)), closes [#20877](https://github.com/angular/angular/issues/20877)
-* **upgrade:** replaces get/setAngularLib with get/setAngularJSGlobal ([66cc2fa](https://github.com/angular/angular/commit/66cc2fa))
-
-
-
-<a name="5.2.0-beta.0"></a>
-# [5.2.0-beta.0](https://github.com/angular/angular/compare/5.1.0...5.2.0-beta.0) (2017-12-13)
-
-
-### Features
-
-* **animations:** re-introduce support for transition matching functions ([#20723](https://github.com/angular/angular/issues/20723)) ([590d93b](https://github.com/angular/angular/commit/590d93b)), closes [#18959](https://github.com/angular/angular/issues/18959)
-* **compiler:** add a pseudo $any() function to disable type checking ([#20876](https://github.com/angular/angular/issues/20876)) ([70cd124](https://github.com/angular/angular/commit/70cd124))
-* **compiler:** narrow types of expressions used in *ngIf ([#20702](https://github.com/angular/angular/issues/20702)) ([e7d9cb3](https://github.com/angular/angular/commit/e7d9cb3))
-* **core:** add source to `StaticInjectorError` message ([#20817](https://github.com/angular/angular/issues/20817)) ([b7738e1](https://github.com/angular/angular/commit/b7738e1)), closes [#19302](https://github.com/angular/angular/issues/19302)
-* **forms:** allow nulls on setAsyncValidators ([#20327](https://github.com/angular/angular/issues/20327)) ([d41d2c4](https://github.com/angular/angular/commit/d41d2c4)), closes [#20296](https://github.com/angular/angular/issues/20296)
-
-
-
-<a name="5.1.1"></a>
-## [5.1.1](https://github.com/angular/angular/compare/5.1.0...5.1.1) (2017-12-13)
-
-
-### Bug Fixes
-
-* **animations:** ensure multi-level route leave animations are queryable ([#20787](https://github.com/angular/angular/issues/20787)) ([d09d497](https://github.com/angular/angular/commit/d09d497)), closes [#19807](https://github.com/angular/angular/issues/19807)
-* **animations:** ensure the web-animations driver properly handles empty keyframes ([#20648](https://github.com/angular/angular/issues/20648)) ([c3e8731](https://github.com/angular/angular/commit/c3e8731)), closes [#15858](https://github.com/angular/angular/issues/15858)
-* **animations:** properly recover and cleanup DOM when CD failures occur ([#20719](https://github.com/angular/angular/issues/20719)) ([e6a2805](https://github.com/angular/angular/commit/e6a2805)), closes [#19093](https://github.com/angular/angular/issues/19093)
-* **animations:** support webkit-based vendor prefixes for prop validations ([#19055](https://github.com/angular/angular/issues/19055)) ([501f01e](https://github.com/angular/angular/commit/501f01e)), closes [#18921](https://github.com/angular/angular/issues/18921)
-* **bazel:** don't equate moduleName with fileName ([#20895](https://github.com/angular/angular/issues/20895)) ([0c9f7b0](https://github.com/angular/angular/commit/0c9f7b0))
-* **compiler:** support referencing enums in namespaces ([#20947](https://github.com/angular/angular/issues/20947)) ([d6da798](https://github.com/angular/angular/commit/d6da798)), closes [#18170](https://github.com/angular/angular/issues/18170)
-* **compiler-cli:** disable checkTypes in emit. ([#20828](https://github.com/angular/angular/issues/20828)) ([160a154](https://github.com/angular/angular/commit/160a154))
-* **compiler-cli:** fix swallowed Error messages ([#20846](https://github.com/angular/angular/issues/20846)) ([6727336](https://github.com/angular/angular/commit/6727336))
-* **compiler-cli:** merge [@fileoverview](https://github.com/fileoverview) comments. ([#20870](https://github.com/angular/angular/issues/20870)) ([be9a737](https://github.com/angular/angular/commit/be9a737))
-* **router:** NavigationError and NavigationCancel should be emitted after resetting the URL ([#20803](https://github.com/angular/angular/issues/20803)) ([baeec4d](https://github.com/angular/angular/commit/baeec4d))
-
-
-
-<a name="5.1.0"></a>
-# [5.1.0](https://github.com/angular/angular/compare/5.1.0-rc.1...5.1.0) (2017-12-06)
-
-
-### Bug Fixes
-
-* **animations:** ensure DOM is cleaned up after multiple [@trigger](https://github.com/trigger) leave animations finish ([#20740](https://github.com/angular/angular/issues/20740)) ([b78ada1](https://github.com/angular/angular/commit/b78ada1)), closes [#20541](https://github.com/angular/angular/issues/20541)
-* **service-worker:** initialize in browser only ([#20782](https://github.com/angular/angular/issues/20782)) ([7cabaa0](https://github.com/angular/angular/commit/7cabaa0)), closes [#20360](https://github.com/angular/angular/issues/20360)
-* **service-worker:** esm2015 points to wrong path ([#20800](https://github.com/angular/angular/issues/20800)) ([da3563c](https://github.com/angular/angular/commit/da3563c))
-
-
-
-<a name="5.1.0-rc.1"></a>
-# [5.1.0-rc.1](https://github.com/angular/angular/compare/5.1.0-rc.0...5.1.0-rc.1) (2017-12-01)
-
-
-### Bug Fixes
-
-* **compiler-cli:** propagate ts.SourceFile moduleName into metadata ([f841fbe](https://github.com/angular/angular/commit/f841fbe))
-* **service-worker:** allow disabling SW while still using services ([65f4fad](https://github.com/angular/angular/commit/65f4fad))
-* **service-worker:** don't crash if SW not supported ([b9a91a5](https://github.com/angular/angular/commit/b9a91a5))
-* **service-worker:** send initialization signal from the application ([3fbcde9](https://github.com/angular/angular/commit/3fbcde9))
-* **service-worker:** use relative path for ngsw.json ([f582620](https://github.com/angular/angular/commit/f582620))
-
-
-
 <a name="5.0.5"></a>
 ## [5.0.5](https://github.com/angular/angular/compare/5.0.4...5.0.5) (2017-12-01)
 
@@ -237,36 +12,6 @@ Note: Due to an animation fix back in 5.1.1 ([c2b3792](https://github.com/angula
 
 
 
-<a name="5.1.0-rc.0"></a>
-# [5.1.0-rc.0](https://github.com/angular/angular/compare/5.1.0-beta.2...5.1.0-rc.0) (2017-12-01)
-
-
-### Bug Fixes
-
-* **animations:** ensure multi-level enter animations work ([#19455](https://github.com/angular/angular/issues/19455)) ([dd6237e](https://github.com/angular/angular/commit/dd6237e))
-* **animations:** ensure multi-level enter animations work ([#19455](https://github.com/angular/angular/issues/19455)) ([b2a586c](https://github.com/angular/angular/commit/b2a586c))
-* **animations:** ensure multi-level leave animations work ([#19455](https://github.com/angular/angular/issues/19455)) ([1366762](https://github.com/angular/angular/commit/1366762))
-* **animations:** ensure multi-level leave animations work ([#19455](https://github.com/angular/angular/issues/19455)) ([c2b3792](https://github.com/angular/angular/commit/c2b3792))
-* **bazel:** produce named AMD modules for codegen ([#20547](https://github.com/angular/angular/issues/20547)) ([6e83204](https://github.com/angular/angular/commit/6e83204)), closes [#19422](https://github.com/angular/angular/issues/19422)
-* **common:** accept falsy values as HTTP bodies ([#19958](https://github.com/angular/angular/issues/19958)) ([15a54df](https://github.com/angular/angular/commit/15a54df)), closes [#19825](https://github.com/angular/angular/issues/19825) [#19195](https://github.com/angular/angular/issues/19195)
-* **common:** don't strip XSSI prefix for if error isn't JSON ([#19958](https://github.com/angular/angular/issues/19958)) ([aafa75d](https://github.com/angular/angular/commit/aafa75d))
-* **common:** remove useless guard in HttpClient ([#19958](https://github.com/angular/angular/issues/19958)) ([eb01ad5](https://github.com/angular/angular/commit/eb01ad5)), closes [#19223](https://github.com/angular/angular/issues/19223)
-* **common:** treat an empty body as null when parsing JSON in HttpClient ([#19958](https://github.com/angular/angular/issues/19958)) ([503be69](https://github.com/angular/angular/commit/503be69)), closes [#18680](https://github.com/angular/angular/issues/18680) [#19413](https://github.com/angular/angular/issues/19413) [#19502](https://github.com/angular/angular/issues/19502) [#19555](https://github.com/angular/angular/issues/19555)
-* **compiler:** correctly detect when to serialze summary metadata ([#20668](https://github.com/angular/angular/issues/20668)) ([8bb42df](https://github.com/angular/angular/commit/8bb42df))
-* **compiler-cli:** fix memory leak in program creation ([#20692](https://github.com/angular/angular/issues/20692)) ([71e5de6](https://github.com/angular/angular/commit/71e5de6)), closes [#20691](https://github.com/angular/angular/issues/20691)
-* **compiler-cli:** normalize sourcepaths for i18n extracted files ([#20417](https://github.com/angular/angular/issues/20417)) ([de78307](https://github.com/angular/angular/commit/de78307)), closes [#20416](https://github.com/angular/angular/issues/20416)
-* **core:** should use native addEventListener in ngZone ([#20672](https://github.com/angular/angular/issues/20672)) ([65a2cb8](https://github.com/angular/angular/commit/65a2cb8))
-* **language-service:** Allow empty templates ([#20651](https://github.com/angular/angular/issues/20651)) ([3203069](https://github.com/angular/angular/commit/3203069)), closes [#19406](https://github.com/angular/angular/issues/19406)
-* **language-service:** Fix crash when no script files are found ([#20550](https://github.com/angular/angular/issues/20550)) ([54bfe14](https://github.com/angular/angular/commit/54bfe14)), closes [#19325](https://github.com/angular/angular/issues/19325)
-
-
-### Features
-
-* **common:** add locale id parameter to `registerLocaleData` ([#20623](https://github.com/angular/angular/issues/20623)) ([24bf3e2](https://github.com/angular/angular/commit/24bf3e2))
-* **compiler-cli:** improve error messages produced during structural errors ([#20459](https://github.com/angular/angular/issues/20459)) ([8ecda94](https://github.com/angular/angular/commit/8ecda94))
-
-
-
 <a name="5.0.4"></a>
 ## [5.0.4](https://github.com/angular/angular/compare/5.0.3...5.0.4) (2017-12-01)
 
@@ -284,30 +29,6 @@ Note: Due to an animation fix back in 5.1.1 ([c2b3792](https://github.com/angula
 
 
 
-<a name="5.1.0-beta.2"></a>
-# [5.1.0-beta.2](https://github.com/angular/angular/compare/5.1.0-beta.1...5.1.0-beta.2) (2017-11-22)
-
-
-### Bug Fixes
-
-* **animations:** always fire inner trigger callbacks even if blocked by parent animations ([#19753](https://github.com/angular/angular/issues/19753)) ([0e012c9](https://github.com/angular/angular/commit/0e012c9)), closes [#19100](https://github.com/angular/angular/issues/19100)
-* **animations:** always fire start and done callbacks in order for noop animations ([#20570](https://github.com/angular/angular/issues/20570)) ([ffb6dbe](https://github.com/angular/angular/commit/ffb6dbe))
-* **animations:** validate against trigger() names that use @ symbols ([#20326](https://github.com/angular/angular/issues/20326)) ([1861e41](https://github.com/angular/angular/commit/1861e41))
-* **benchpress:** Allow ignoring navigationStart events in perflog metric. ([#20312](https://github.com/angular/angular/issues/20312)) ([717ac5a](https://github.com/angular/angular/commit/717ac5a))
-* **common:** return ISubscription from Location.subscribe() ([#20429](https://github.com/angular/angular/issues/20429)) ([437a044](https://github.com/angular/angular/commit/437a044)), closes [#20406](https://github.com/angular/angular/issues/20406)
-* **compiler:** emit correct type-check-blocks with TemplateRef's ([#20463](https://github.com/angular/angular/issues/20463)) ([68b53c0](https://github.com/angular/angular/commit/68b53c0))
-* **compiler:** support event bindings in `fullTemplateTypeCheck` ([#20490](https://github.com/angular/angular/issues/20490)) ([4ed0439](https://github.com/angular/angular/commit/4ed0439))
-* **core:** fix [#20532](https://github.com/angular/angular/issues/20532), should be able to cancel listener from mixed zone ([#20538](https://github.com/angular/angular/issues/20538)) ([a740e4f](https://github.com/angular/angular/commit/a740e4f))
-* **core:** should support event.stopImmediatePropagation ([#20469](https://github.com/angular/angular/issues/20469)) ([997336b](https://github.com/angular/angular/commit/997336b))
-* **forms:** updateOn should check if change occurred ([#20358](https://github.com/angular/angular/issues/20358)) ([69c53c3](https://github.com/angular/angular/commit/69c53c3)), closes [#20259](https://github.com/angular/angular/issues/20259)
-
-
-### Features
-
-* **platform-browser-dynamic:** export `JitCompilerFactory` ([#20478](https://github.com/angular/angular/issues/20478)) ([d7a727c](https://github.com/angular/angular/commit/d7a727c)), closes [#20125](https://github.com/angular/angular/issues/20125)
-
-
-
 <a name="5.0.3"></a>
 ## [5.0.3](https://github.com/angular/angular/compare/5.0.2...5.0.3) (2017-11-22)
 
@@ -325,28 +46,6 @@ Note: Due to an animation fix back in 5.1.1 ([c2b3792](https://github.com/angula
 * **forms:** updateOn should check if change occurred ([#20358](https://github.com/angular/angular/issues/20358)) ([f9f2c20](https://github.com/angular/angular/commit/f9f2c20)), closes [#20259](https://github.com/angular/angular/issues/20259)
 
 
-<a name="5.1.0-beta.1"></a>
-# [5.1.0-beta.1](https://github.com/angular/angular/compare/5.1.0-beta.0...5.1.0-beta.1) (2017-11-16)
-
-
-### Bug Fixes
-
-* **animations:** always fire inner trigger callbacks even if blocked by parent animations ([#19753](https://github.com/angular/angular/issues/19753)) ([d47b2a6](https://github.com/angular/angular/commit/d47b2a6)), closes [#19100](https://github.com/angular/angular/issues/19100)
-* **animations:** ensure final state() styles are applied within @.disabled animations ([#20267](https://github.com/angular/angular/issues/20267)) ([20aafff](https://github.com/angular/angular/commit/20aafff)), closes [#20266](https://github.com/angular/angular/issues/20266)
-* **bazel:** adjust mock of tsconfig for ng_module rule unit test ([#20175](https://github.com/angular/angular/issues/20175)) ([c2a24b4](https://github.com/angular/angular/commit/c2a24b4))
-* **compiler:** fix corner cases in shadow CSS ([c32f5fd](https://github.com/angular/angular/commit/c32f5fd))
-* **compiler:** recognize @NgModule with a redundant @Injectable ([#20320](https://github.com/angular/angular/issues/20320)) ([c33a576](https://github.com/angular/angular/commit/c33a576))
-* **compiler:** show explanatory text in template errors ([#20313](https://github.com/angular/angular/issues/20313)) ([3257fcd](https://github.com/angular/angular/commit/3257fcd))
-* **core:** ensure init lifecycle events are called ([#20258](https://github.com/angular/angular/issues/20258)) ([24cf8b3](https://github.com/angular/angular/commit/24cf8b3))
-* **language-service:** pass compilerOptions.paths to ReflectorHost ([#20222](https://github.com/angular/angular/issues/20222)) ([eb8013e](https://github.com/angular/angular/commit/eb8013e))
-* **router:** 'merge' queryParamHandling strategy should be able to remove query params ([#19733](https://github.com/angular/angular/issues/19733)) ([a622e19](https://github.com/angular/angular/commit/a622e19)), closes [#18463](https://github.com/angular/angular/issues/18463) [#17202](https://github.com/angular/angular/issues/17202)
-* Update test code to type-check under TS 2.5 ([#20175](https://github.com/angular/angular/issues/20175)) ([5ec1717](https://github.com/angular/angular/commit/5ec1717))
-
-### Features
-
-* **typescript:** support TypeScript 2.5 ([a9f3e2b](https://github.com/angular/angular/commit/a9f3e2b)), closes [#20175](https://github.com/angular/angular/issues/20175)
-
-> Note, if you do `Injector.get(Token)` where `Token` has static members, you'll run into https://github.com/Microsoft/TypeScript/issues/20102 where the returned type is `{}` rather than `Token`. Use `Injector.get<Token>(Token)` to work around.
 
 <a name="5.0.2"></a>
 ## [5.0.2](https://github.com/angular/angular/compare/5.0.1...5.0.2) (2017-11-16)
@@ -361,22 +60,6 @@ Note: Due to an animation fix back in 5.1.1 ([c2b3792](https://github.com/angula
 * **router:** 'merge' queryParamHandling strategy should be able to remove query params ([#19733](https://github.com/angular/angular/issues/19733)) ([b732fb9](https://github.com/angular/angular/commit/b732fb9)), closes [#18463](https://github.com/angular/angular/issues/18463) [#17202](https://github.com/angular/angular/issues/17202)
 
 
-<a name="5.1.0-beta.0"></a>
-# [5.1.0-beta.0](https://github.com/angular/angular/compare/5.0.0-rc.4...5.1.0-beta.0) (2017-11-08)
-
-### Bug Fixes
-
-* **compiler:** don't overwrite missingTranslation's value in JIT ([#19952](https://github.com/angular/angular/issues/19952)) ([799cbb9](https://github.com/angular/angular/commit/799cbb9))
-* **compiler:** report a reasonable error with invalid metadata ([#20062](https://github.com/angular/angular/issues/20062)) ([da22c48](https://github.com/angular/angular/commit/da22c48))
-* **compiler-cli:** don't report emit diagnostics when `--noEmitOnError` is off ([#20063](https://github.com/angular/angular/issues/20063)) ([8639995](https://github.com/angular/angular/commit/8639995))
-* **core:** `__symbol__` should return `__zone_symbol__` without zone.js loaded ([#19541](https://github.com/angular/angular/issues/19541)) ([678d1cf](https://github.com/angular/angular/commit/678d1cf))
-* **core:** should support event.stopImmediatePropagation ([#19222](https://github.com/angular/angular/issues/19222)) ([7083791](https://github.com/angular/angular/commit/7083791))
-* **platform-browser:** support Symbols in custom `jasmineToString()` method ([#19794](https://github.com/angular/angular/issues/19794)) ([5a6efa7](https://github.com/angular/angular/commit/5a6efa7))
-
-### Features
-
-* **compiler:** introduce `TestBed.overrideTemplateUsingTestingModule` ([a460066](https://github.com/angular/angular/commit/a460066)), closes [#19815](https://github.com/angular/angular/issues/19815)
-
 
 <a name="5.0.1"></a>
 ## [5.0.1](https://github.com/angular/angular/compare/5.0.0...5.0.1) (2017-11-08)

CONTRIBUTING.md

@@ -69,37 +69,36 @@ You can file new issues by filling out our [new issue form](https://github.com/a
 ### <a name="submit-pr"></a> Submitting a Pull Request (PR)
 Before you submit your Pull Request (PR) consider the following guidelines:
 
-1. Search [GitHub](https://github.com/angular/angular/pulls) for an open or closed PR
+* Search [GitHub](https://github.com/angular/angular/pulls) for an open or closed PR
   that relates to your submission. You don't want to duplicate effort.
-1. Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
-  We cannot accept code without this. Make sure you sign with the primary email address of the Git identity that has been granted access to the Angular repository.
-1. Fork the angular/angular repo.
-1. Make your changes in a new git branch:
+* Please sign our [Contributor License Agreement (CLA)](#cla) before sending PRs.
+  We cannot accept code without this.
+* Make your changes in a new git branch:
 
      ```shell
      git checkout -b my-fix-branch master
      ```
 
-1. Create your patch, **including appropriate test cases**.
-1. Follow our [Coding Rules](#rules).
-1. Run the full Angular test suite, as described in the [developer documentation][dev-doc],
+* Create your patch, **including appropriate test cases**.
+* Follow our [Coding Rules](#rules).
+* Run the full Angular test suite, as described in the [developer documentation][dev-doc],
   and ensure that all tests pass.
-1. Commit your changes using a descriptive commit message that follows our
+* Commit your changes using a descriptive commit message that follows our
   [commit message conventions](#commit). Adherence to these conventions
   is necessary because release notes are automatically generated from these messages.
 
      ```shell
      git commit -a
      ```
-    Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
+  Note: the optional commit `-a` command line option will automatically "add" and "rm" edited files.
 
-1. Push your branch to GitHub:
+* Push your branch to GitHub:
 
     ```shell
     git push origin my-fix-branch
     ```
 
-1. In GitHub, send a pull request to `angular:master`.
+* In GitHub, send a pull request to `angular:master`.
 * If we suggest changes then:
   * Make the required updates.
   * Re-run the Angular test suites to ensure tests are still passing.
@@ -259,19 +258,6 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
 * For corporations we'll need you to
   [print, sign and one of scan+email, fax or mail the form][corporate-cla].
 
-<hr>
-
-  If you have more than one Git identity, you must make sure that you sign the CLA using the primary email address associated with the ID that has been granted access to the Angular repository. Git identities can be associated with more than one email address, and only one is primary. Here are some links to help you sort out multiple Git identities and email addresses:
-
-  * 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/ 
-
-  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.  
-
-<hr>
-
 
 [angular-group]: https://groups.google.com/forum/#!forum/angular
 [coc]: https://github.com/angular/code-of-conduct/blob/master/CODE_OF_CONDUCT.md

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2014-2018 Google, Inc. http://angular.io
+Copyright (c) 2014-2017 Google, Inc. http://angular.io
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -2,6 +2,8 @@
 [![CircleCI](https://circleci.com/gh/angular/angular/tree/master.svg?style=shield)](https://circleci.com/gh/angular/angular/tree/master)
 [![BrowserStack Status](https://www.browserstack.com/automate/badge.svg?badge_key=LzF3RzBVVGt6VWE2S0hHaC9uYllOZz09LS1BVjNTclBKV0x4eVRlcjA4QVY1M0N3PT0=--eb4ce8c8dc2c1c5b2b5352d473ee12a73ac20e06)](https://www.browserstack.com/automate/public-build/LzF3RzBVVGt6VWE2S0hHaC9uYllOZz09LS1BVjNTclBKV0x4eVRlcjA4QVY1M0N3PT0=--eb4ce8c8dc2c1c5b2b5352d473ee12a73ac20e06)
 [![Join the chat at https://gitter.im/angular/angular](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/angular/angular?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![Issue Stats](http://issuestats.com/github/angular/angular/badge/pr?style=flat)](http://issuestats.com/github/angular/angular)
+[![Issue Stats](http://issuestats.com/github/angular/angular/badge/issue?style=flat)](http://issuestats.com/github/angular/angular)
 [![npm version](https://badge.fury.io/js/%40angular%2Fcore.svg)](https://www.npmjs.com/@angular/core)
 
 

WORKSPACE

@@ -1,58 +1,24 @@
-workspace(name = "angular")
+workspace(name = "angular_src")
 
 load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "build_bazel_rules_nodejs",
     remote = "https://github.com/bazelbuild/rules_nodejs.git",
-    commit = "230d39a391226f51c03448f91eb61370e2e58c42",
+    # TODO(alexeagle): use the correct tag here.
+    commit = "2c6243df53fd33fdab283ebdd01582e4eb815db8",
 )
 
-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
+load("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
 
-check_bazel_version("0.9.0")
 node_repositories(package_json = ["//:package.json"])
 
-git_repository(
+local_repository(
     name = "build_bazel_rules_typescript",
-    remote = "https://github.com/bazelbuild/rules_typescript.git",
-    commit = "d3ad16d1f105e2490859da9ad528ba4c45991d09"
+    path = "node_modules/@bazel/typescript",
 )
 
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
 local_repository(
-    name = "rxjs",
-    path = "node_modules/rxjs/src",
-)
-
-git_repository(
-    name = "com_github_bazelbuild_buildtools",
-    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(
-    name = "io_bazel_rules_go",
-    url = "https://github.com/bazelbuild/rules_go/releases/download/0.7.1/rules_go-0.7.1.tar.gz",
-    sha256 = "341d5eacef704415386974bc82a1783a8b7ffbff2ab6ba02375e1ca20d9b031c",
-)
-
-load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
-
-go_rules_dependencies()
-
-go_register_toolchains()
-
-# Fetching the Bazel source code allows us to compile the Skylark linter
-http_archive(
-    name = "io_bazel",
-    url = "https://github.com/bazelbuild/bazel/archive/9755c72b48866ed034bd28aa033e9abd27431b1e.zip",
-    strip_prefix = "bazel-9755c72b48866ed034bd28aa033e9abd27431b1e",
-    sha256 = "5b8443fc3481b5fcd9e7f348e1dd93c1397f78b223623c39eb56494c55f41962",
+    name = "angular",
+    path = "packages/bazel",
 )

aio/.angular-cli.json

@@ -62,9 +62,6 @@
     "styleExt": "scss",
     "component": {
       "inlineStyle": true
-    },
-    "build": {
-      "namedChunks": true
     }
   }
 }

aio/README.md

@@ -4,7 +4,7 @@ Everything in this folder is part of the documentation project. This includes
 
 * the web site for displaying the documentation
 * the dgeni configuration for converting source files to rendered files that can be viewed in the web site.
-* the tooling for setting up examples for development; and generating live-example and zip files from the examples.
+* the tooling for setting up examples for development; and generating plunkers and zip files from the examples.
 
 ## Developer tasks
 
@@ -13,7 +13,7 @@ You should run all these tasks from the `angular/aio` folder.
 Here are the most important tasks you might need to use:
 
 * `yarn` - install all the dependencies.
-* `yarn setup` - install all the dependencies, boilerplate, stackblitz, zips and run dgeni on the docs.
+* `yarn setup` - install all the dependencies, boilerplate, plunkers, zips and run dgeni on the docs.
 * `yarn setup-local` - same as `setup`, but use the locally built Angular packages for aio and docs examples boilerplate.
 
 * `yarn build` - create a production build of the application (after installing dependencies, boilerplate, etc).
@@ -32,7 +32,7 @@ Here are the most important tasks you might need to use:
 
 * `yarn boilerplate:add` - generate all the boilerplate code for the examples, so that they can be run locally. Add the option `--local` to use your local version of Angular contained in the "dist" folder.
 * `yarn boilerplate:remove` - remove all the boilerplate code that was added via `yarn boilerplate:add`.
-* `yarn generate-stackblitz` - generate the stackblitz files that are used by the `live-example` tags in the docs.
+* `yarn generate-plunkers` - generate the plunker files that are used by the `live-example` tags in the docs.
 * `yarn generate-zips` - generate the zip files from the examples. Zip available via the `live-example` tags in the docs.
 
 * `yarn example-e2e` - run all e2e tests for examples
@@ -68,11 +68,6 @@ The content is written in markdown.
 All other content is written using markdown in text files, located in the `angular/aio/content` folder.
 More specifically, there are sub-folders that contain particular types of content: guides, tutorial and marketing.
 
-* **Code examples**: code examples need to be testable to ensure their accuracy.
-Also, our examples have a specific look and feel and allow the user to copy the source code. For larger
-examples they are rendered in a tabbed interface (e.g. template, HTML, and TypeScript on separate
-tabs). Additionally, some are live examples, which provide links where the code can be edited, executed, and/or downloaded. For details on working with code examples, please read the [Code snippets](https://angular.io/guide/docs-style-guide#code-snippets), [Source code markup](https://angular.io/guide/docs-style-guide#source-code-markup), and [Live examples](https://angular.io/guide/docs-style-guide#live-examples) pages of the [Authors Style Guide](https://angular.io/guide/docs-style-guide).
-
 We use the [dgeni](https://github.com/angular/dgeni) tool to convert these files into docs that can be viewed in the doc-viewer.
 
 The [Authors Style Guide](https://angular.io/guide/docs-style-guide) prescribes guidelines for
@@ -105,7 +100,8 @@ The general setup is as follows:
 * Open a terminal, ensure the dependencies are installed; run an initial doc generation; then start the doc-viewer:
 
 ```bash
-yarn setup
+yarn
+yarn docs
 yarn start
 ```
 

aio/content/examples/.gitignore

@@ -76,8 +76,8 @@ aot-compiler/**/*.factory.d.ts
 # universal
 !universal/webpack.server.config.js
 
-# stackblitz
-*stackblitz.no-link.html
+# plunkers
+*plnkr.no-link.html
 
 # ngUpgrade testing
 !upgrade-phonecat-*/**/karma.conf.js

aio/content/examples/ajs-quick-reference/plnkr.json

@@ -1,5 +1,6 @@
 {
   "description": "AngularJS to Angular Quick Reference",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js",

aio/content/examples/animations/plnkr.json

@@ -1,5 +1,6 @@
 {
   "description": "Angular Animations",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js"

aio/content/examples/architecture/plnkr.json

@@ -1,9 +1,9 @@
 {
   "description": "Intro to Angular",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js",
-    "!**/*.[1].*"
-  ],
-  "file": "src/app/app.module.ts"
+    "!app/hero-list.component.1.*"
+  ]
 }

aio/content/examples/attribute-directives/plnkr.json

@@ -1,9 +1,10 @@
 {
   "description": "Attribute Directive",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js",
-    "!**/*.[1,2,3].*"
+    "!app/*.[0,1,2,3].*"
   ],
   "tags": ["attribute", "directive"]
 }

aio/content/examples/attribute-directives/src/app/dummy.module.1.ts

@@ -1,4 +1,4 @@
-// Not used. Keep away from stackblitz
+// Not used. Keep away from plunker
 // Keeps ATLS from complaining about undeclared directives.
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';

aio/content/examples/bootstrapping/bs-config.1.json

@@ -1,8 +0,0 @@
-{
-  "server": {
-    "baseDir": "src",
-    "routes": {
-      "/node_modules": "node_modules"
-    }
-  }
-}

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

@@ -1,14 +0,0 @@
-import { AppPage } from './app.po';
-
-describe('feature-modules App', () => {
-  let page: AppPage;
-
-  beforeEach(() => {
-    page = new AppPage();
-  });
-
-  it('should display message saying app works', () => {
-    page.navigateTo();
-    expect(page.getParagraphText()).toEqual('app works!');
-  });
-});

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

@@ -1,3 +0,0 @@
-<h1>
-  {{title}}
-</h1>

aio/content/examples/bootstrapping/src/app/app.component.spec.ts

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

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

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

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

@@ -1,34 +0,0 @@
-// #docplaster
-// #docregion whole-ngmodule
-
-// imports
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
-
-import { AppComponent } from './app.component';
-// #docregion directive-import
-import { ItemDirective } from './item.directive';
-// #enddocregion directive-import
-
-
-// @NgModule decorator with its metadata
-@NgModule({
-// #docregion declarations
-  declarations: [
-    AppComponent,
-    ItemDirective
-  ],
-  // #enddocregion declarations
-  imports: [
-    BrowserModule,
-    FormsModule,
-    HttpModule
-  ],
-  providers: [],
-  bootstrap: [AppComponent]
-})
-export class AppModule { }
-
-// #enddocregion whole-ngmodule

aio/content/examples/bootstrapping/src/app/item.directive.spec.ts

@@ -1,8 +0,0 @@
-import { ItemDirective } from './item.directive';
-
-describe('ItemDirective', () => {
-  it('should create an instance', () => {
-    const directive = new ItemDirective();
-    expect(directive).toBeTruthy();
-  });
-});

aio/content/examples/bootstrapping/src/app/item.directive.ts

@@ -1,15 +0,0 @@
-// #docplaster
-// #docregion directive
-
-
-import { Directive } from '@angular/core';
-
-@Directive({
-  selector: '[appItem]'
-})
-export class ItemDirective {
-// code goes here
-  constructor() { }
-
-}
-// #enddocregion directive

aio/content/examples/bootstrapping/src/index.html

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

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

@@ -1,11 +0,0 @@
-import { enableProdMode } from '@angular/core';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
-
-if (environment.production) {
-  enableProdMode();
-}
-
-platformBrowserDynamic().bootstrapModule(AppModule);

aio/content/examples/bootstrapping/stackblitz.json

@@ -1,10 +0,0 @@
-{
-  "description": "Bootstrapping",
-  "files": [
-    "!**/*.d.ts",
-    "!**/*.js",
-    "!**/*.[1,2].*"
-  ],
-  "file": "src/app/app.component.ts",
-  "tags": ["ngmodules"]
-}

aio/content/examples/component-interaction/plnkr.json

@@ -1,5 +1,6 @@
 {
   "description": "Component Communication Cookbook samples",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js"

aio/content/examples/component-styles/plnkr.json

@@ -1,5 +1,6 @@
 {
   "description": "Component Styles",
+  "basePath": "src/",
   "files": [
     "!**/*.d.ts",
     "!**/*.js",

aio/content/examples/component-styles/src/app/hero-details.component.css

@@ -1,6 +1,5 @@
 /* #docregion import */
-/* The AOT compiler needs the `./` to show that this is local */
-@import './hero-details-box.css';
+@import 'hero-details-box.css';
 /* #enddocregion import */
 
 /* #docregion host */

aio/content/examples/component-styles/src/app/hero-team.component.ts

@@ -5,8 +5,7 @@ import { Hero } from './hero';
 @Component({
   selector: 'app-hero-team',
   template: `
-    <!-- We must use a relative URL so that the AOT compiler can find the stylesheet -->
-    <link rel="stylesheet" href="../assets/hero-team.component.css">
+    <link rel="stylesheet" href="assets/hero-team.component.css">
     <h3>Team</h3>
     <ul>
       <li *ngFor="let member of hero.team">

aio/content/examples/dependency-injection-in-action/plnkr.json

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

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

@@ -1,10 +1,11 @@
 {
   "description": "Dependency Injection",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js",
     "!**/*.[0,1,2].*",
-    "!**/dummy.module.ts"
+    "**/dummy.module.ts"
   ],
   "tags": ["dependency", "di"]
 }

aio/content/examples/displaying-data/plnkr.json

@@ -1,5 +1,6 @@
 {
   "description": "Displaying Data",
+  "basePath": "src/",
   "files": [
     "!**/*.d.ts",
     "!**/*.js",

aio/content/examples/docs-style-guide/plnkr.json

@@ -1,5 +1,6 @@
 {
   "description": "Authors style guide",
+  "basePath": "src/",
   "files": [
     "!**/*.d.ts",
     "!**/*.js",

aio/content/examples/docs-style-guide/second.plnkr.json

@@ -0,0 +1,9 @@
+{
+  "description": "Second authors style guide plunker (non-executing)",
+  "basePath": "src/",
+  "files": [
+    "index.2.html"
+  ],
+  "main": "index.2.html",
+  "tags": ["author", "style guide"]
+}

aio/content/examples/docs-style-guide/second.stackblitz.json

@@ -1,8 +0,0 @@
-{
-  "description": "Second authors style guide stackblitz (non-executing)",
-  "files": [
-    "src/index.2.html"
-  ],
-  "main": "src/index.2.html",
-  "tags": ["author", "style guide"]
-}

aio/content/examples/dynamic-component-loader/plnkr.json

@@ -1,5 +1,6 @@
 {
   "description": "Dynamic Component Loader",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js"

aio/content/examples/dynamic-form/plnkr.json

@@ -1,5 +1,6 @@
 {
   "description": "Dynamic Form",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js",

aio/content/examples/feature-modules/e2e/app.e2e-spec.ts

@@ -1,17 +0,0 @@
-import { AppPage } from './app.po';
-
-describe('feature-modules App', () => {
-  let page: AppPage;
-
-  beforeEach(() => {
-    page = new AppPage();
-  });
-
-  it('should display message saying app works', () => {
-    page.navigateTo();
-    expect(page.getParagraphText()).toEqual('app works!');
-  });
-});
-
-
-

aio/content/examples/feature-modules/example-config.json

@@ -1,4 +0,0 @@
-{
-  "build": "build:cli",
-  "run": "serve:cli"
-}

aio/content/examples/feature-modules/src/app/app.component.html

@@ -1,9 +0,0 @@
-<!-- #docplaster -->
-<!-- #docregion app-component-template -->
-<h1>
-  {{title}}
-</h1>
-
-<!-- add the selector from the CustomerDashboardComponent -->
-<app-customer-dashboard></app-customer-dashboard>
-<!-- #enddocregion app-component-template -->

aio/content/examples/feature-modules/src/app/app.component.spec.ts

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

aio/content/examples/feature-modules/src/app/app.component.ts

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

aio/content/examples/feature-modules/src/app/app.module.ts

@@ -1,27 +0,0 @@
-// #docplaster
-// #docregion app-module
-import { BrowserModule } from '@angular/platform-browser';
-import { NgModule } from '@angular/core';
-import { FormsModule } from '@angular/forms';
-import { HttpModule } from '@angular/http';
-
-import { AppComponent } from './app.component';
-// import the feature module here so you can add it to the imports array below
-import { CustomerDashboardModule } from './customer-dashboard/customer-dashboard.module';
-
-
-@NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule,
-    FormsModule,
-    HttpModule,
-    CustomerDashboardModule // add the feature module here
-  ],
-  providers: [],
-  bootstrap: [AppComponent]
-})
-export class AppModule { }
-// #enddocregion app-module

aio/content/examples/feature-modules/src/app/customer-dashboard/customer-dashboard.module.ts

@@ -1,34 +0,0 @@
-// #docplaster
-// #docregion customer-dashboard
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-// #enddocregion customer-dashboard
-// #docregion customer-dashboard-component
-// import the new component
-import { CustomerDashboardComponent } from './customer-dashboard/customer-dashboard.component';
-// #enddocregion customer-dashboard-component
-
-
-// #docregion customer-dashboard-component
-@NgModule({
-  imports: [
-    CommonModule
-  ],
-  declarations: [
-    CustomerDashboardComponent
-  ],
-  // #enddocregion customer-dashboard-component
-  // #docregion component-exports
-  exports: [
-    CustomerDashboardComponent
-  ]
-  // #enddocregion component-exports
-  // #docregion customer-dashboard-component
-})
-
-// #enddocregion customer-dashboard-component
-
-// #docregion customer-dashboard
-export class CustomerDashboardModule { }
-
-// #enddocregion customer-dashboard

aio/content/examples/feature-modules/src/app/customer-dashboard/customer-dashboard/customer-dashboard.component.html

@@ -1,7 +0,0 @@
-
-<!-- #docplaster -->
-<!-- #docregion feature-template -->
-<p>
-  customer-dashboard works!
-</p>
-<!-- #enddocregion feature-template -->

aio/content/examples/feature-modules/src/app/customer-dashboard/customer-dashboard/customer-dashboard.component.spec.ts

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

aio/content/examples/feature-modules/src/app/customer-dashboard/customer-dashboard/customer-dashboard.component.ts

@@ -1,15 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-@Component({
-  selector: 'app-customer-dashboard',
-  templateUrl: './customer-dashboard.component.html',
-  styleUrls: ['./customer-dashboard.component.css']
-})
-export class CustomerDashboardComponent implements OnInit {
-
-  constructor() { }
-
-  ngOnInit() {
-  }
-
-}

aio/content/examples/feature-modules/src/index.html

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

aio/content/examples/feature-modules/src/main.ts

@@ -1,11 +0,0 @@
-import { enableProdMode } from '@angular/core';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
-
-import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
-
-if (environment.production) {
-  enableProdMode();
-}
-
-platformBrowserDynamic().bootstrapModule(AppModule);

aio/content/examples/feature-modules/stackblitz.json

@@ -1,10 +0,0 @@
-{
-  "description": "Feature Modules",
-  "files": [
-    "!**/*.d.ts",
-    "!**/*.js",
-    "!**/*.[1,2].*"
-  ],
-  "file": "src/app/app.component.ts",
-  "tags": ["feature modules"]
-}

aio/content/examples/form-validation/e2e/app.e2e-spec.ts

@@ -15,7 +15,6 @@ describe('Form Validation Tests', function () {
     });
 
     tests('Template-Driven Form');
-    bobTests();
   });
 
   describe('Reactive form', () => {

aio/content/examples/form-validation/plnkr.json

@@ -1,5 +1,6 @@
 {
   "description": "Validation",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js"

aio/content/examples/form-validation/src/app/shared/forbidden-name.directive.ts

@@ -20,7 +20,7 @@ export function forbiddenNameValidator(nameRe: RegExp): ValidatorFn {
   // #enddocregion directive-providers
 })
 export class ForbiddenValidatorDirective implements Validator {
-  @Input('appForbiddenName') forbiddenName: string;
+  @Input() forbiddenName: string;
 
   validate(control: AbstractControl): {[key: string]: any} {
     return this.forbiddenName ? forbiddenNameValidator(new RegExp(this.forbiddenName, 'i'))(control)

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

@@ -12,7 +12,7 @@
         <!-- #docregion name-with-error-msg -->
         <!-- #docregion name-input -->
         <input id="name" name="name" class="form-control"
-               required minlength="4" appForbiddenName="bob"
+               required minlength="4" forbiddenName="bob"
                [(ngModel)]="hero.name" #name="ngModel" >
         <!-- #enddocregion name-input -->
 

aio/content/examples/forms/plnkr.json

@@ -1,5 +1,6 @@
 {
   "description": "Forms",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js"

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

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

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

@@ -0,0 +1,138 @@
+'use strict'; // necessary for es6 output in node
+
+import { browser, element, by } from 'protractor';
+
+describe('Server Communication', function () {
+
+  beforeAll(function () {
+    browser.get('');
+  });
+
+  describe('Tour of Heroes (Observable)', function () {
+
+    let initialHeroCount = 4;
+    let newHeroName = 'Mr. IQ';
+    let heroCountAfterAdd = 5;
+
+    let heroListComp = element(by.tagName('hero-list'));
+    let addButton = heroListComp.element(by.tagName('button'));
+    let heroTags = heroListComp.all(by.tagName('li'));
+    let heroNameInput = heroListComp.element(by.tagName('input'));
+
+    it('should exist', function() {
+      expect(heroListComp).toBeDefined('<hero-list> must exist');
+    });
+
+    it('should display ' + initialHeroCount + ' heroes after init', function () {
+      expect(heroTags.count()).toBe(initialHeroCount);
+    });
+
+    it('should not add hero with empty name', function () {
+      expect(addButton).toBeDefined('"Add Hero" button must be defined');
+      addButton.click().then(function() {
+        expect(heroTags.count()).toBe(initialHeroCount, 'No new hero should be added');
+      });
+    });
+
+    it('should add a new hero to the list', function () {
+      expect(heroNameInput).toBeDefined('<input> for hero name must exist');
+      expect(addButton).toBeDefined('"Add Hero" button must be defined');
+      heroNameInput.sendKeys(newHeroName);
+      addButton.click().then(function() {
+        expect(heroTags.count()).toBe(heroCountAfterAdd, 'A new hero should be added');
+        let newHeroInList = heroTags.get(heroCountAfterAdd - 1).getText();
+        expect(newHeroInList).toBe(newHeroName, 'The hero should be added to the end of the list');
+      });
+    });
+  });
+
+  describe('Wikipedia Demo', function () {
+
+    it('should initialize the demo with empty result list', function () {
+      let myWikiComp = element(by.tagName('my-wiki'));
+      expect(myWikiComp).toBeDefined('<my-wiki> must exist');
+      let resultList = myWikiComp.all(by.tagName('li'));
+      expect(resultList.count()).toBe(0, 'result list must be empty');
+    });
+
+    describe('Fetches after each keystroke', function () {
+      it('should fetch results after "B"', function(done: any) {
+        testForRefreshedResult('B', done);
+      });
+
+      it('should fetch results after "Ba"', function(done: any) {
+        testForRefreshedResult('a', done);
+      });
+
+      it('should fetch results after "Bas"', function(done: any) {
+        testForRefreshedResult('s', done);
+      });
+
+      it('should fetch results after "Basic"', function(done: any) {
+        testForRefreshedResult('ic', done);
+      });
+    });
+
+    function testForRefreshedResult(keyPressed: string, done: () => void) {
+      testForResult('my-wiki', keyPressed, false, done);
+    }
+  });
+
+  describe('Smarter Wikipedia Demo', function () {
+
+    it('should initialize the demo with empty result list', function () {
+      let myWikiSmartComp = element(by.tagName('my-wiki-smart'));
+      expect(myWikiSmartComp).toBeDefined('<my-wiki-smart> must exist');
+      let resultList = myWikiSmartComp.all(by.tagName('li'));
+      expect(resultList.count()).toBe(0, 'result list must be empty');
+    });
+
+    it('should fetch results after "Java"', function(done: any) {
+      testForNewResult('Java', done);
+    });
+
+    it('should fetch results after "JavaS"', function(done: any) {
+      testForStaleResult('S', done);
+    });
+
+    it('should fetch results after "JavaSc"', function(done: any) {
+      testForStaleResult('c', done);
+    });
+
+    it('should fetch results after "JavaScript"', function(done: any) {
+      testForStaleResult('ript', done);
+    });
+
+
+    function testForNewResult(keyPressed: string, done: () => void) {
+      testForResult('my-wiki-smart', keyPressed, false, done);
+    }
+
+    function testForStaleResult(keyPressed: string, done: () => void) {
+      testForResult('my-wiki-smart', keyPressed, true, done);
+    }
+
+  });
+
+  function testForResult(componentTagName: string, keyPressed: string, hasListBeforeSearch: boolean, done: () => void) {
+    let searchWait = 1000; // Wait for wikipedia but not so long that tests timeout
+    let wikiComponent = element(by.tagName(componentTagName));
+    expect(wikiComponent).toBeDefined('<' + componentTagName + '> must exist');
+    let searchBox = wikiComponent.element(by.tagName('input'));
+    expect(searchBox).toBeDefined('<input> for search must exist');
+
+    searchBox.sendKeys(keyPressed).then(function () {
+      let resultList = wikiComponent.all(by.tagName('li'));
+
+      if (hasListBeforeSearch) {
+        expect(resultList.count()).toBeGreaterThan(0, 'result list should not be empty before search');
+      }
+
+      setTimeout(function() {
+        expect(resultList.count()).toBeGreaterThan(0, 'result list should not be empty after search');
+        done();
+      }, searchWait);
+    });
+  }
+
+});

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

@@ -1,139 +0,0 @@
-import { browser, element, by, ElementFinder } from 'protractor';
-import { resolve } from 'path';
-
-const page = {
-  configClearButton: element.all(by.css('app-config > div button')).get(2),
-  configErrorButton: element.all(by.css('app-config > div button')).get(3),
-  configErrorMessage: element(by.css('app-config p')),
-  configGetButton: element.all(by.css('app-config > div button')).get(0),
-  configGetResponseButton: element.all(by.css('app-config > div button')).get(1),
-  configSpan: element(by.css('app-config span')),
-  downloadButton: element.all(by.css('app-downloader button')).get(0),
-  downloadClearButton: element.all(by.css('app-downloader button')).get(1),
-  downloadMessage: element(by.css('app-downloader p')),
-  heroesListAddButton: element.all(by.css('app-heroes > div button')).get(0),
-  heroesListInput: element(by.css('app-heroes > div input')),
-  heroesListSearchButton: element.all(by.css('app-heroes > div button')).get(1),
-  heroesListItems: element.all(by.css('app-heroes ul li')),
-  logClearButton: element(by.css('app-messages button')),
-  logList: element(by.css('app-messages ol')),
-  logListItems: element.all(by.css('app-messages ol li')),
-  searchInput: element(by.css('app-package-search input#name')),
-  searchListItems: element.all(by.css('app-package-search li')),
-  uploadInput: element(by.css('app-uploader input')),
-  uploadMessage: element(by.css('app-uploader p'))
-};
-
-let checkLogForMessage = (message: string) => {
-  expect(page.logList.getText()).toContain(message);
-};
-
-describe('Http Tests', function() {
-  beforeEach(() => {
-    browser.get('');
-  });
-
-  describe('Heroes', () => {
-    it('retrieves the list of heroes at startup', () => {
-      expect(page.heroesListItems.count()).toBe(4);
-      expect(page.heroesListItems.get(0).getText()).toContain('Mr. Nice');
-      checkLogForMessage('GET "api/heroes"');
-    });
-
-    it('makes a POST to add a new hero', () => {
-      page.heroesListInput.sendKeys('Magneta');
-      page.heroesListAddButton.click();
-      expect(page.heroesListItems.count()).toBe(5);
-      checkLogForMessage('POST "api/heroes"');
-    });
-
-    it('makes a GET to search for a hero', () => {
-      page.heroesListInput.sendKeys('Celeritas');
-      page.heroesListSearchButton.click();
-      checkLogForMessage('GET "api/heroes?name=Celeritas"');
-    });
-  });
-
-  describe('Messages', () => {
-    it('can clear the logs', () => {
-      expect(page.logListItems.count()).toBe(1);
-      page.logClearButton.click();
-      expect(page.logListItems.count()).toBe(0);
-    });
-  });
-
-  describe('Configuration', () => {
-    it('can fetch the configuration JSON file', () => {
-      page.configGetButton.click();
-      checkLogForMessage('GET "assets/config.json"');
-      expect(page.configSpan.getText()).toContain('Heroes API URL is "api/heroes"');
-      expect(page.configSpan.getText()).toContain('Textfile URL is "assets/textfile.txt"');
-    });
-
-    it('can fetch the configuration JSON file with headers', () => {
-      page.configGetResponseButton.click();
-      checkLogForMessage('GET "assets/config.json"');
-      expect(page.configSpan.getText()).toContain('Response headers:');
-      expect(page.configSpan.getText()).toContain('content-type: application/json; charset=UTF-8');
-    });
-
-    it('can clear the configuration log', () => {
-      page.configGetResponseButton.click();
-      expect(page.configSpan.getText()).toContain('Response headers:');
-      page.configClearButton.click();
-      expect(page.configSpan.isPresent()).toBeFalsy();
-    });
-
-    it('throws an error for a non valid url', () => {
-      page.configErrorButton.click();
-      checkLogForMessage('GET "not/a/real/url"');
-      expect(page.configErrorMessage.getText()).toContain('"Something bad happened; please try again later."');
-    });
-  });
-
-  describe('Download', () => {
-    it('can download a txt file and show it', () => {
-      page.downloadButton.click();
-      checkLogForMessage('DownloaderService downloaded "assets/textfile.txt"');
-      checkLogForMessage('GET "assets/textfile.txt"');
-      expect(page.downloadMessage.getText()).toContain('Contents: "This is the downloaded text file "');
-    });
-
-    it('can clear the log of the download', () => {
-      page.downloadButton.click();
-      expect(page.downloadMessage.getText()).toContain('Contents: "This is the downloaded text file "');
-      page.downloadClearButton.click();
-      expect(page.downloadMessage.isPresent()).toBeFalsy();
-    });
-  });
-
-  describe('Upload', () => {
-    it('can upload a file', () => {
-      const filename = 'app.po.ts';
-      const url = resolve(__dirname, filename);
-      page.uploadInput.sendKeys(url);
-      checkLogForMessage('POST "/upload/file" succeeded in');
-      expect(page.uploadMessage.getText()).toContain(
-        `File "${filename}" was completely uploaded!`);
-    });
-  });
-
-  describe('PackageSearch', () => {
-    it('can search for npm package and find in cache', () => {
-      const packageName = 'angular';
-      page.searchInput.sendKeys(packageName);
-      checkLogForMessage(
-        'Caching response from "https://npmsearch.com/query?q=angular"');
-      expect(page.searchListItems.count()).toBeGreaterThan(1, 'angular items');
-
-      page.searchInput.clear();
-      page.searchInput.sendKeys(' ');
-      expect(page.searchListItems.count()).toBe(0, 'search empty');
-
-      page.searchInput.clear();
-      page.searchInput.sendKeys(packageName);
-      checkLogForMessage(
-        'Found cached response for "https://npmsearch.com/query?q=angular"');
-    });
-  });
-});

aio/content/examples/http/example-config.json

@@ -1,3 +0,0 @@
-{
-  "projectType": "testing"
-}

aio/content/examples/http/plnkr.json

@@ -1,11 +1,10 @@
 {
   "description": "Http",
+  "basePath": "src/",
   "files":[
     "!**/*.d.ts",
     "!**/*.js",
-
-    "!src/testing/*.*",
-    "!src/index-specs.html"
+    "!**/*.[1].*"
   ],
-  "tags": ["http"]
+  "tags": ["http", "jsonp"]
 }

aio/content/examples/http/specs.stackblitz.json

@@ -1,18 +0,0 @@
-{
-  "description": "Http Guide Testing",
-  "files":[
-    "src/app/heroes/heroes.service.ts",
-    "src/app/heroes/heroes.service.spec.ts",
-
-    "src/app/http-error-handler.service.ts",
-    "src/app/message.service.ts",
-    "src/testing/*.ts",
-
-    "src/styles.css",
-    "src/test.css",
-    "src/main-specs.ts",
-    "src/index-specs.html"
-  ],
-  "main": "src/index-specs.html",
-  "tags": ["http", "testing"]
-}

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

@@ -1,24 +0,0 @@
-<h1>HTTP Sample</h1>
-<div>
-  <input type="checkbox" id="heroes" [checked]="toggleHeroes" (click)="toggleHeroes()">
-  <label for="heroes">Heroes</label>
-
-  <input type="checkbox" id="config" [checked]="showConfig" (click)="toggleConfig()">
-  <label for="config">Config</label>
-
-  <input type="checkbox" id="downloader" [checked]="showDownloader" (click)="toggleDownloader()">
-  <label for="downloader">Downloader</label>
-
-  <input type="checkbox" id="uploader" [checked]="showUploader" (click)="toggleUploader()">
-  <label for="uploader">Uploader</label>
-
-  <input type="checkbox" id="search" [checked]="showSearch" (click)="toggleSearch()">
-  <label for="search">Search</label>
-</div>
-
-<app-heroes *ngIf="showHeroes"></app-heroes>
-<app-messages></app-messages>
-<app-config *ngIf="showConfig"></app-config>
-<app-downloader *ngIf="showDownloader"></app-downloader>
-<app-uploader *ngIf="showUploader"></app-uploader>
-<app-package-search *ngIf="showSearch"></app-package-search>

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

@@ -1,19 +1,13 @@
-import { Component } from '@angular/core';
+// #docregion
+import { Component }         from '@angular/core';
 
 @Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html'
+  selector: 'my-app',
+  template: `
+    <hero-list></hero-list>
+    <hero-list-promise></hero-list-promise>
+    <my-wiki></my-wiki>
+    <my-wiki-smart></my-wiki-smart>
+  `
 })
-export class AppComponent {
-  showHeroes = true;
-  showConfig = true;
-  showDownloader = true;
-  showUploader = true;
-  showSearch = true;
-
-  toggleHeroes() { this.showHeroes = !this.showHeroes; }
-  toggleConfig() { this.showConfig = !this.showConfig; }
-  toggleDownloader() { this.showDownloader = !this.showDownloader; }
-  toggleUploader() { this.showUploader = !this.showUploader; }
-  toggleSearch() { this.showSearch = !this.showSearch; }
- }
+export class AppComponent { }

aio/content/examples/http/src/app/app.module.1.ts

@@ -0,0 +1,23 @@
+// #docregion
+import { NgModule }      from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { FormsModule }   from '@angular/forms';
+import { HttpModule, JsonpModule } from '@angular/http';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  imports: [
+    BrowserModule,
+    FormsModule,
+    HttpModule,
+    JsonpModule
+  ],
+  declarations: [ AppComponent ],
+  bootstrap:    [ AppComponent ]
+})
+export class AppModule {
+}
+
+
+

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

@@ -1,89 +1,46 @@
 // #docplaster
-// #docregion sketch
-import { NgModule }         from '@angular/core';
-import { BrowserModule }    from '@angular/platform-browser';
-// #enddocregion sketch
-import { FormsModule }      from '@angular/forms';
-// #docregion sketch
-import { HttpClientModule } from '@angular/common/http';
-// #enddocregion sketch
-import { HttpClientXsrfModule } from '@angular/common/http';
+// #docregion
+import { NgModule }      from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
+import { FormsModule }   from '@angular/forms';
+import { HttpModule, JsonpModule } from '@angular/http';
 
-import { HttpClientInMemoryWebApiModule } from 'angular-in-memory-web-api';
-import { InMemoryDataService }  from './in-memory-data.service';
 
-import { RequestCache, RequestCacheWithMap } from './request-cache.service';
+import { InMemoryWebApiModule }     from 'angular-in-memory-web-api';
+import { HeroData }                 from './hero-data';
+import { requestOptionsProvider }   from './default-request-options.service';
 
-import { AppComponent }         from './app.component';
-import { AuthService }          from './auth.service';
-import { ConfigComponent }      from './config/config.component';
-import { DownloaderComponent }  from './downloader/downloader.component';
-import { HeroesComponent }      from './heroes/heroes.component';
-import { HttpErrorHandler }     from './http-error-handler.service';
-import { MessageService }       from './message.service';
-import { MessagesComponent }    from './messages/messages.component';
-import { PackageSearchComponent } from './package-search/package-search.component';
-import { UploaderComponent }    from './uploader/uploader.component';
+import { AppComponent }             from './app.component';
 
-import { httpInterceptorProviders } from './http-interceptors/index';
-// #docregion sketch
+import { HeroListComponent }        from './toh/hero-list.component';
+import { HeroListPromiseComponent } from './toh/hero-list.component.promise';
+
+import { WikiComponent }      from './wiki/wiki.component';
+import { WikiSmartComponent } from './wiki/wiki-smart.component';
 
 @NgModule({
-// #docregion xsrf
   imports: [
-// #enddocregion xsrf
     BrowserModule,
-// #enddocregion sketch
     FormsModule,
-// #docregion sketch
-    // import HttpClientModule after BrowserModule.
-// #docregion xsrf
-    HttpClientModule,
-// #enddocregion sketch
-    HttpClientXsrfModule.withOptions({
-      cookieName: 'My-Xsrf-Cookie',
-      headerName: 'My-Xsrf-Header',
-    }),
-// #enddocregion xsrf
-
-    // The HttpClientInMemoryWebApiModule module intercepts HTTP requests
-    // and returns simulated server responses.
-    // Remove it when a real server is ready to receive requests.
-    HttpClientInMemoryWebApiModule.forRoot(
-      InMemoryDataService, {
-        dataEncapsulation: false,
-        passThruUnknownUrl: true,
-        put204: false // return entity after PUT/update
-      }
-    )
-// #docregion sketch, xsrf
+    HttpModule,
+    JsonpModule,
+    // #docregion in-mem-web-api
+    InMemoryWebApiModule.forRoot(HeroData)
+    // #enddocregion in-mem-web-api
   ],
-// #enddocregion xsrf
   declarations: [
     AppComponent,
-// #enddocregion sketch
-    ConfigComponent,
-    DownloaderComponent,
-    HeroesComponent,
-    MessagesComponent,
-    UploaderComponent,
-    PackageSearchComponent,
-// #docregion sketch
+    HeroListComponent,
+    HeroListPromiseComponent,
+    WikiComponent,
+    WikiSmartComponent
   ],
-// #enddocregion sketch
-// #docregion interceptor-providers
-  providers: [
-    // #enddocregion interceptor-providers
-    AuthService,
-    HttpErrorHandler,
-    MessageService,
-    { provide: RequestCache, useClass: RequestCacheWithMap },
-    // #docregion interceptor-providers
-    httpInterceptorProviders
-  ],
-// #enddocregion interceptor-providers
-// #docregion sketch
+// #docregion provide-default-request-options
+  providers: [ requestOptionsProvider ],
+// #enddocregion provide-default-request-options
   bootstrap: [ AppComponent ]
 })
 export class AppModule {}
-// #enddocregion sketch
+
+
+

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

@@ -1,9 +0,0 @@
-import { Injectable } from '@angular/core';
-
-/** Mock client-side authentication/authorization service */
-@Injectable()
-export class AuthService {
-  getAuthorizationToken() {
-    return 'some-auth-token';
-  }
-}

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

@@ -1,18 +0,0 @@
-<h3>Get configuration from JSON file</h3>
-<div>
-  <button (click)="clear(); showConfig()">get</button>
-  <button (click)="clear(); showConfigResponse()">getResponse</button>
-  <button (click)="clear()">clear</button>
-  <button (click)="clear(); makeError()">error</button>
-  <span *ngIf="config">
-    <p>Heroes API URL is "{{config.heroesUrl}}"</p>
-    <p>Textfile URL is "{{config.textfile}}"</p>
-    <div *ngIf="headers">
-      Response headers:
-      <ul>
-        <li *ngFor="let header of headers">{{header}}</li>
-      </ul>
-    </div>
-  </span>
-</div>
-<p *ngIf="error" class="error">{{error | json}}</p>

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

@@ -1,78 +0,0 @@
-// #docplaster
-// #docregion
-import { Component } from '@angular/core';
-import { Config, ConfigService } from './config.service';
-import { MessageService } from '../message.service';
-
-@Component({
-  selector: 'app-config',
-  templateUrl: './config.component.html',
-  providers: [ ConfigService ],
-  styles: ['.error {color: red;}']
-})
-export class ConfigComponent {
-  error: any;
-  headers: string[];
-  // #docregion v2
-  config: Config;
-
-  // #enddocregion v2
-  constructor(private configService: ConfigService) {}
-
-  clear() {
-    this.config = undefined;
-    this.error = undefined;
-    this.headers = undefined;
-  }
-
-  // #docregion v1, v2, v3
-  showConfig() {
-    this.configService.getConfig()
-  // #enddocregion v1, v2
-      .subscribe(
-        data => this.config = { ...data }, // success path
-        error => this.error = error // error path
-      );
-  }
-  // #enddocregion v3
-
-  showConfig_v1() {
-    this.configService.getConfig_1()
-  // #docregion v1, v1_callback
-      .subscribe(data => this.config = {
-          heroesUrl: data['heroesUrl'],
-          textfile:  data['textfile']
-      });
-  // #enddocregion v1_callback
-  }
-  // #enddocregion v1
-
-  showConfig_v2() {
-    this.configService.getConfig()
-  // #docregion v2, v2_callback
-      // clone the data object, using its known Config shape
-      .subscribe(data => this.config = { ...data });
-  // #enddocregion v2_callback
-  }
-  // #enddocregion v2
-
-// #docregion showConfigResponse
-  showConfigResponse() {
-    this.configService.getConfigResponse()
-      // resp is of type `HttpResponse<Config>`
-      .subscribe(resp => {
-        // display its headers
-        const keys = resp.headers.keys();
-        this.headers = keys.map(key =>
-          `${key}: ${resp.headers.get(key)}`);
-
-        // access the body directly, which is typed as `Config`.
-        this.config = { ... resp.body };
-      });
-  }
-// #enddocregion showConfigResponse
-  makeError() {
-    this.configService.makeIntentionalError().subscribe(null, error => this.error = error );
-  }
-}
-// #enddocregion

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

@@ -1,100 +0,0 @@
-// #docplaster
-// #docregion , proto
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-// #enddocregion proto
-import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
-
-// #docregion rxjs-imports
-import { Observable } from 'rxjs/Observable';
-import { ErrorObservable } from 'rxjs/observable/ErrorObservable';
-import { catchError, retry } from 'rxjs/operators';
-// #enddocregion rxjs-imports
-
-// #docregion config-interface
-export interface Config {
-  heroesUrl: string;
-  textfile: string;
-}
-// #enddocregion config-interface
-// #docregion proto
-
-@Injectable()
-export class ConfigService {
-  // #enddocregion proto
-  // #docregion getConfig_1
-  configUrl = 'assets/config.json';
-
-  // #enddocregion getConfig_1
-  // #docregion proto
-  constructor(private http: HttpClient) { }
-  // #enddocregion proto
-
-  // #docregion getConfig, getConfig_1, getConfig_2, getConfig_3
-  getConfig() {
-  // #enddocregion getConfig_1, getConfig_2, getConfig_3
-    return this.http.get<Config>(this.configUrl)
-      .pipe(
-        retry(3), // retry a failed request up to 3 times
-        catchError(this.handleError) // then handle the error
-      );
-  }
-  // #enddocregion getConfig
-
-  getConfig_1() {
-  // #docregion getConfig_1
-    return this.http.get(this.configUrl);
-  }
-  // #enddocregion getConfig_1
-
-  getConfig_2() {
-    // #docregion getConfig_2
-    // now returns an Observable of Config
-    return this.http.get<Config>(this.configUrl);
-  }
-  // #enddocregion getConfig_2
-
-  getConfig_3() {
-    // #docregion getConfig_3
-    return this.http.get<Config>(this.configUrl)
-      .pipe(
-        catchError(this.handleError)
-      );
-  }
-  // #enddocregion getConfig_3
-
-  // #docregion getConfigResponse
-  getConfigResponse(): Observable<HttpResponse<Config>> {
-    return this.http.get<Config>(
-      this.configUrl, { observe: 'response' });
-  }
-  // #enddocregion getConfigResponse
-
-  // #docregion handleError
-  private handleError(error: HttpErrorResponse) {
-    if (error.error instanceof ErrorEvent) {
-      // A client-side or network error occurred. Handle it accordingly.
-      console.error('An error occurred:', error.error.message);
-    } else {
-      // The backend returned an unsuccessful response code.
-      // The response body may contain clues as to what went wrong,
-      console.error(
-        `Backend returned code ${error.status}, ` +
-        `body was: ${error.error}`);
-    }
-    // return an ErrorObservable with a user-facing error message
-    return new ErrorObservable(
-      'Something bad happened; please try again later.');
-  };
-  // #enddocregion handleError
-
-  makeIntentionalError() {
-    return this.http.get('not/a/real/url')
-      .pipe(
-        catchError(this.handleError)
-      );
-  }
-
-// #docregion proto
-}
-// #enddocregion proto

aio/content/examples/http/src/app/default-request-options.service.ts

@@ -0,0 +1,16 @@
+// #docregion
+import { Injectable } from '@angular/core';
+import { BaseRequestOptions, RequestOptions } from '@angular/http';
+
+@Injectable()
+export class DefaultRequestOptions extends BaseRequestOptions {
+
+  constructor() {
+    super();
+
+    // Set the default 'Content-Type' header
+    this.headers.set('Content-Type', 'application/json');
+  }
+}
+
+export const requestOptionsProvider = { provide: RequestOptions, useClass: DefaultRequestOptions };

aio/content/examples/http/src/app/downloader/downloader.component.html

@@ -1,4 +0,0 @@
-<h3>Download the textfile</h3>
-<button (click)="download()">Download</button>
-<button (click)="clear()">clear</button>
-<p *ngIf="contents">Contents: "{{contents}}"</p>

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

@@ -1,23 +0,0 @@
-import { Component } from '@angular/core';
-import { DownloaderService } from './downloader.service';
-
-@Component({
-  selector: 'app-downloader',
-  templateUrl: './downloader.component.html',
-  providers: [ DownloaderService ]
-})
-export class DownloaderComponent {
-  contents: string;
-  constructor(private downloaderService: DownloaderService) {}
-
-  clear() {
-    this.contents = undefined;
-  }
-
-  // #docregion download
-  download() {
-    this.downloaderService.getTextFile('assets/textfile.txt')
-      .subscribe(results => this.contents = results);
-  }
-  // #enddocregion download
-}

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

@@ -1,39 +0,0 @@
-import { Injectable } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-
-import { tap } from 'rxjs/operators';
-
-import { MessageService } from '../message.service';
-
-@Injectable()
-export class DownloaderService {
-  constructor(
-    private http: HttpClient,
-    private messageService: MessageService) { }
-
-  // #docregion getTextFile
-  getTextFile(filename: string) {
-    // The Observable returned by get() is of type Observable<string>
-    // because a text response was specified.
-    // There's no need to pass a <string> type parameter to get().
-    return this.http.get(filename, {responseType: 'text'})
-      .pipe(
-        tap( // Log the result or error
-          data => this.log(filename, data),
-          error => this.logError(filename, error)
-        )
-      );
-  }
-  // #enddocregion getTextFile
-
-  private log(filename: string, data: string) {
-    const message = `DownloaderService downloaded "${filename}" and got "${data}".`;
-    this.messageService.add(message);
-  }
-
-  private logError(filename: string, error: any) {
-    const message = `DownloaderService failed to download "${filename}"; got error "${error.message}".`;
-    console.error(message);
-    this.messageService.add(message);
-  }
-}

aio/content/examples/http/src/app/hero-data.ts

@@ -0,0 +1,13 @@
+// #docregion
+import { InMemoryDbService } from 'angular-in-memory-web-api';
+export class HeroData implements InMemoryDbService {
+  createDb() {
+    let heroes = [
+      { id: 1, name: 'Windstorm' },
+      { id: 2, name: 'Bombasto' },
+      { id: 3, name: 'Magneta' },
+      { id: 4, name: 'Tornado' }
+    ];
+    return {heroes};
+  }
+}

aio/content/examples/http/src/app/heroes.json

@@ -0,0 +1,8 @@
+{
+  "data": [
+    { "id": 1, "name": "Windstorm" },
+    { "id": 2, "name": "Bombasto" },
+    { "id": 3, "name": "Magneta" },
+    { "id": 4, "name": "Tornado" }
+  ]
+}

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

@@ -1,4 +0,0 @@
-export interface Hero {
-  id: number;
-  name: string;
-}

aio/content/examples/http/src/app/heroes/heroes.component.css

@@ -1,89 +0,0 @@
-/* HeroesComponent's private CSS styles */
-.heroes {
-  margin: 0 0 2em 0;
-  list-style-type: none;
-  padding: 0;
-  width: 15em;
-}
-.heroes li {
-  position: relative;
-  cursor: pointer;
-  background-color: #EEE;
-  margin: .5em;
-  padding: .3em 0;
-  height: 1.6em;
-  border-radius: 4px;
-  width: 19em;
-}
-
-.heroes li:hover {
-  color: #607D8B;
-  background-color: #DDD;
-  left: .1em;
-}
-
-.heroes a {
-  color: #888;
-  text-decoration: none;
-  position: relative;
-  display: block;
-  width: 250px;
-}
-
-.heroes a:hover {
-  color:#607D8B;
-}
-
-.heroes .badge {
-  display: inline-block;
-  font-size: small;
-  color: white;
-  padding: 0.8em 0.7em 0 0.7em;
-  background-color: #607D8B;
-  line-height: 1em;
-  position: relative;
-  left: -1px;
-  top: -4px;
-  height: 1.8em;
-  min-width: 16px;
-  text-align: right;
-  margin-right: .8em;
-  border-radius: 4px 0 0 4px;
-}
-
-.button {
-  background-color: #eee;
-  border: none;
-  padding: 5px 10px;
-  border-radius: 4px;
-  cursor: pointer;
-  cursor: hand;
-  font-family: Arial;
-}
-
-button:hover {
-  background-color: #cfd8dc;
-}
-
-button.delete {
-  position: relative;
-  left: 24em;
-  top: -32px;
-  background-color: gray !important;
-  color: white;
-  display: inherit;
-  padding: 5px 8px;
-  width: 2em;
-}
-
-input {
-  font-size: 100%;
-  margin-bottom: 2px;
-  width: 11em;
-}
-
-.heroes input {
-  position: relative;
-  top: -3px;
-  width: 12em;
-}

aio/content/examples/http/src/app/heroes/heroes.component.html

@@ -1,32 +0,0 @@
-<h3>Heroes</h3>
-<!-- #docregion add -->
-<div>
-  <label>Hero name:
-    <input #heroName />
-  </label>
-  <!-- (click) passes input value to add() and then clears the input -->
-  <button (click)="add(heroName.value); heroName.value=''">
-    add
-  </button>
-  <button (click)="search(heroName.value)">
-    search
-  </button>
-</div>
-<!-- #enddocregion add -->
-
-<!-- #docregion list -->
-<ul class="heroes">
-  <li *ngFor="let hero of heroes">
-    <a (click)="edit(hero)">
-      <span class="badge">{{ hero.id || -1 }}</span>
-      <span *ngIf="hero!==editHero">{{hero.name}}</span>
-      <input *ngIf="hero===editHero" [(ngModel)]="hero.name"
-        (blur)="update()" (keyup.enter)="update()">
-    </a>
-    <!-- #docregion delete -->
-    <button class="delete" title="delete hero"
-    (click)="delete(hero)">x</button>
-    <!-- #enddocregion delete -->
-  </li>
-</ul>
-<!-- #enddocregion list -->

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

@@ -1,76 +0,0 @@
-import { Component, OnInit } from '@angular/core';
-
-import { Hero } from './hero';
-import { HeroesService } from './heroes.service';
-
-@Component({
-  selector: 'app-heroes',
-  templateUrl: './heroes.component.html',
-  providers: [ HeroesService ],
-  styleUrls: ['./heroes.component.css']
-})
-export class HeroesComponent implements OnInit {
-  heroes: Hero[];
-  editHero: Hero; // the hero currently being edited
-
-  constructor(private heroesService: HeroesService) { }
-
-  ngOnInit() {
-    this.getHeroes();
-  }
-
-  getHeroes(): void {
-    this.heroesService.getHeroes()
-      .subscribe(heroes => this.heroes = heroes);
-  }
-
-  add(name: string): void {
-    this.editHero = undefined;
-    name = name.trim();
-    if (!name) { return; }
-
-    // The server will generate the id for this new hero
-    const newHero: Hero = { name } as Hero;
-    // #docregion add-hero-subscribe
-    this.heroesService.addHero(newHero)
-      .subscribe(hero => this.heroes.push(hero));
-    // #enddocregion add-hero-subscribe
-  }
-
-  delete(hero: Hero): void {
-    this.heroes = this.heroes.filter(h => h !== hero);
-    // #docregion delete-hero-subscribe
-    this.heroesService.deleteHero(hero.id).subscribe();
-    // #enddocregion delete-hero-subscribe
-    /*
-    // #docregion delete-hero-no-subscribe
-    // oops ... subscribe() is missing so nothing happens
-    this.heroesService.deleteHero(hero.id);
-    // #enddocregion delete-hero-no-subscribe
-    */
-  }
-
-  edit(hero) {
-    this.editHero = hero;
-  }
-
-  search(searchTerm: string) {
-    this.editHero = undefined;
-    if (searchTerm) {
-      this.heroesService.searchHeroes(searchTerm)
-        .subscribe(heroes => this.heroes = heroes);
-    }
-  }
-
-  update() {
-    if (this.editHero) {
-      this.heroesService.updateHero(this.editHero)
-        .subscribe(hero => {
-          // replace the hero in the heroes list with update from server
-          const ix = hero ? this.heroes.findIndex(h => h.id === hero.id) : -1;
-          if (ix > -1) { this.heroes[ix] = hero; }
-        });
-      this.editHero = undefined;
-    }
-  }
-}

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

@@ -1,156 +0,0 @@
-import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
-
-// Other imports
-import { TestBed } from '@angular/core/testing';
-import { HttpClient, HttpResponse } from '@angular/common/http';
-
-import { Hero } from './hero';
-import { HeroesService } from './heroes.service';
-import { HttpErrorHandler } from '../http-error-handler.service';
-import { MessageService } from '../message.service';
-
-describe('HeroesService', () => {
-  let httpClient: HttpClient;
-  let httpTestingController: HttpTestingController;
-  let heroService: HeroesService;
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      // Import the HttpClient mocking services
-      imports: [ HttpClientTestingModule ],
-      // Provide the service-under-test and its dependencies
-      providers: [
-        HeroesService,
-        HttpErrorHandler,
-        MessageService
-      ]
-    });
-
-    // Inject the http, test controller, and service-under-test
-    // as they will be referenced by each test.
-    httpClient = TestBed.get(HttpClient);
-    httpTestingController = TestBed.get(HttpTestingController);
-    heroService = TestBed.get(HeroesService);
-  });
-
-  afterEach(() => {
-    // After every test, assert that there are no more pending requests.
-    httpTestingController.verify();
-  });
-
-  /// HeroService method tests begin ///
-
-  describe('#getHeroes', () => {
-    let expectedHeroes: Hero[];
-
-    beforeEach(() => {
-      heroService = TestBed.get(HeroesService);
-      expectedHeroes = [
-        { id: 1, name: 'A' },
-        { id: 2, name: 'B' },
-       ] as Hero[];
-    });
-
-    it('should return expected heroes (called once)', () => {
-
-      heroService.getHeroes().subscribe(
-        heroes => expect(heroes).toEqual(expectedHeroes, 'should return expected heroes'),
-        fail
-      );
-
-      // HeroService should have made one request to GET heroes from expected URL
-      const req = httpTestingController.expectOne(heroService.heroesUrl);
-      expect(req.request.method).toEqual('GET');
-
-      // Respond with the mock heroes
-      req.flush(expectedHeroes);
-    });
-
-    it('should be OK returning no heroes', () => {
-
-      heroService.getHeroes().subscribe(
-        heroes => expect(heroes.length).toEqual(0, 'should have empty heroes array'),
-        fail
-      );
-
-      const req = httpTestingController.expectOne(heroService.heroesUrl);
-      req.flush([]); // Respond with no heroes
-    });
-
-    // This service reports the error but finds a way to let the app keep going.
-    it('should turn 404 into an empty heroes result', () => {
-
-      heroService.getHeroes().subscribe(
-        heroes => expect(heroes.length).toEqual(0, 'should return empty heroes array'),
-        fail
-      );
-
-      const req = httpTestingController.expectOne(heroService.heroesUrl);
-
-      // respond with a 404 and the error message in the body
-      const msg = 'deliberate 404 error';
-      req.flush(msg, {status: 404, statusText: 'Not Found'});
-    });
-
-    it('should return expected heroes (called multiple times)', () => {
-
-      heroService.getHeroes().subscribe();
-      heroService.getHeroes().subscribe();
-      heroService.getHeroes().subscribe(
-        heroes => expect(heroes).toEqual(expectedHeroes, 'should return expected heroes'),
-        fail
-      );
-
-      const requests = httpTestingController.match(heroService.heroesUrl);
-      expect(requests.length).toEqual(3, 'calls to getHeroes()');
-
-      // Respond to each request with different mock hero results
-      requests[0].flush([]);
-      requests[1].flush([{id: 1, name: 'bob'}]);
-      requests[2].flush(expectedHeroes);
-    });
-  });
-
-  describe('#updateHero', () => {
-    // Expecting the query form of URL so should not 404 when id not found
-    const makeUrl = (id: number) => `${heroService.heroesUrl}/?id=${id}`;
-
-    it('should update a hero and return it', () => {
-
-      const updateHero: Hero = { id: 1, name: 'A' };
-
-      heroService.updateHero(updateHero).subscribe(
-        data => expect(data).toEqual(updateHero, 'should return the hero'),
-        fail
-      );
-
-      // HeroService should have made one request to PUT hero
-      const req = httpTestingController.expectOne(heroService.heroesUrl);
-      expect(req.request.method).toEqual('PUT');
-      expect(req.request.body).toEqual(updateHero);
-
-      // Expect server to return the hero after PUT
-      const expectedResponse = new HttpResponse(
-        { status: 200, statusText: 'OK', body: updateHero });
-      req.event(expectedResponse);
-    });
-
-    // This service reports the error but finds a way to let the app keep going.
-    it('should turn 404 error into return of the update hero', () => {
-      const updateHero: Hero = { id: 1, name: 'A' };
-
-      heroService.updateHero(updateHero).subscribe(
-        data => expect(data).toEqual(updateHero, 'should return the update hero'),
-        fail
-      );
-
-      const req = httpTestingController.expectOne(heroService.heroesUrl);
-
-      // respond with a 404 and the error message in the body
-      const msg = 'deliberate 404 error';
-      req.flush(msg, {status: 404, statusText: 'Not Found'});
-    });
-  });
-
-  // TODO: test other HeroService methods
-});

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

@@ -1,99 +0,0 @@
-// #docplaster
-import { Injectable } from '@angular/core';
-import { HttpClient, HttpParams } from '@angular/common/http';
-// #docregion http-options
-import { HttpHeaders } from '@angular/common/http';
-
-// #enddocregion http-options
-
-import { Observable } from 'rxjs/Observable';
-import { of } from 'rxjs/observable/of';
-import { catchError } from 'rxjs/operators';
-
-import { Hero } from './hero';
-import { HttpErrorHandler, HandleError } from '../http-error-handler.service';
-
-// #docregion http-options
-const httpOptions = {
-  headers: new HttpHeaders({
-    'Content-Type':  'application/json',
-    'Authorization': 'my-auth-token'
-  })
-};
-// #enddocregion http-options
-
-@Injectable()
-export class HeroesService {
-  heroesUrl = 'api/heroes';  // URL to web api
-  private handleError: HandleError;
-
-  constructor(
-    private http: HttpClient,
-    httpErrorHandler: HttpErrorHandler) {
-    this.handleError = httpErrorHandler.createHandleError('HeroesService');
-  }
-
-  /** GET heroes from the server */
-  getHeroes (): Observable<Hero[]> {
-    return this.http.get<Hero[]>(this.heroesUrl)
-      .pipe(
-        catchError(this.handleError('getHeroes', []))
-      );
-  }
-
-    // #docregion searchHeroes
-  /* GET heroes whose name contains search term */
-  searchHeroes(term: string): Observable<Hero[]> {
-    term = term.trim();
-
-    // Add safe, URL encoded search parameter if there is a search term
-    const options = term ?
-     { params: new HttpParams().set('name', term) } : {};
-
-    return this.http.get<Hero[]>(this.heroesUrl, options)
-      .pipe(
-        catchError(this.handleError<Hero[]>('searchHeroes', []))
-      );
-  }
-  // #enddocregion searchHeroes
-
-  //////// Save methods //////////
-
-  // #docregion addHero
-  /** POST: add a new hero to the database */
-  addHero (hero: Hero): Observable<Hero> {
-    return this.http.post<Hero>(this.heroesUrl, hero, httpOptions)
-      .pipe(
-        catchError(this.handleError('addHero', hero))
-      );
-  }
-  // #enddocregion addHero
-
-  // #docregion deleteHero
-  /** DELETE: delete the hero from the server */
-  deleteHero (id: number): Observable<{}> {
-    const url = `${this.heroesUrl}/${id}`; // DELETE api/heroes/42
-    return this.http.delete(url, httpOptions)
-      .pipe(
-        catchError(this.handleError('deleteHero'))
-      );
-  }
-  // #enddocregion deleteHero
-
-  // #docregion updateHero
-  /** PUT: update the hero on the server. Returns the updated hero upon success. */
-  updateHero (hero: Hero): Observable<Hero> {
-    // #enddocregion updateHero
-    // #docregion update-headers
-    httpOptions.headers =
-      httpOptions.headers.set('Authorization', 'my-new-auth-token');
-    // #enddocregion update-headers
-
-    // #docregion updateHero
-    return this.http.put<Hero>(this.heroesUrl, hero, httpOptions)
-      .pipe(
-        catchError(this.handleError('updateHero', hero))
-      );
-  }
-  // #enddocregion updateHero
-}

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

@@ -1,47 +0,0 @@
-import { Injectable } from '@angular/core';
-import { HttpErrorResponse } from '@angular/common/http';
-
-import { Observable } from 'rxjs/Observable';
-import { of } from 'rxjs/observable/of';
-
-import { MessageService } from './message.service';
-
-/** Type of the handleError function returned by HttpErrorHandler.createHandleError */
-export type HandleError =
-  <T> (operation?: string, result?: T) => (error: HttpErrorResponse) => Observable<T>;
-
-/** Handles HttpClient errors */
-@Injectable()
-export class HttpErrorHandler {
-  constructor(private messageService: MessageService) { }
-
-  /** Create curried handleError function that already knows the service name */
-  createHandleError = (serviceName = '') => <T>
-    (operation = 'operation', result = {} as T) => this.handleError(serviceName, operation, result);
-
-  /**
-   * Returns a function that handles Http operation failures.
-   * This error handler lets the app continue to run as if no error occurred.
-   * @param serviceName = name of the data service that attempted the operation
-   * @param operation - name of the operation that failed
-   * @param result - optional value to return as the observable result
-   */
-  handleError<T> (serviceName = '', operation = 'operation', result = {} as T) {
-
-    return (error: HttpErrorResponse): Observable<T> => {
-      // TODO: send the error to remote logging infrastructure
-      console.error(error); // log to console instead
-
-      const message = (error.error instanceof ErrorEvent) ?
-        error.error.message :
-       `server returned code ${error.status} with body "${error.error}"`;
-
-      // TODO: better job of transforming error for user consumption
-      this.messageService.add(`${serviceName}: ${operation} failed: ${message}`);
-
-      // Let the app keep running by returning a safe result.
-      return of( result );
-    };
-
-  }
-}

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

@@ -1,42 +0,0 @@
-// #docplaster
-import { Injectable } from '@angular/core';
-import {
-  HttpEvent, HttpInterceptor, HttpHandler, HttpRequest
-} from '@angular/common/http';
-
-import { Observable } from 'rxjs/Observable';
-
-// #docregion
-import { AuthService } from '../auth.service';
-
-@Injectable()
-export class AuthInterceptor implements HttpInterceptor {
-
-  constructor(private auth: AuthService) {}
-
-  intercept(req: HttpRequest<any>, next: HttpHandler) {
-    // Get the auth token from the service.
-    const authToken = this.auth.getAuthorizationToken();
-
-    // #enddocregion
-    /*
-    * The verbose way:
-    // #docregion
-    // Clone the request and replace the original headers with
-    // cloned headers, updated with the authorization.
-    const authReq = req.clone({
-      headers: req.headers.set('Authorization', authToken)
-    });
-    // #enddocregion
-    */
-    // #docregion set-header-shortcut
-    // Clone the request and set the new header in one step.
-    const authReq = req.clone({ setHeaders: { Authorization: authToken } });
-    // #enddocregion set-header-shortcut
-    // #docregion
-
-    // send cloned request with header to the next handler.
-    return next.handle(authReq);
-  }
-}
-// #enddocregion

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

@@ -1,86 +0,0 @@
-// #docplaster
-import { Injectable } from '@angular/core';
-import {
-  HttpEvent, HttpHeaders, HttpRequest, HttpResponse,
-  HttpInterceptor, HttpHandler
-} from '@angular/common/http';
-
-import { Observable } from 'rxjs/Observable';
-import { of } from 'rxjs/observable/of';
-import { startWith, tap } from 'rxjs/operators';
-
-import { RequestCache } from '../request-cache.service';
-import { searchUrl } from '../package-search/package-search.service';
-
-
-/**
- * If request is cachable (e.g., package search) and
- * response is in cache return the cached response as observable.
- * If has 'x-refresh' header that is true,
- * then also re-run the package search, using response from next(),
- * returning an observable that emits the cached response first.
- *
- * If not in cache or not cachable,
- * pass request through to next()
- */
-// #docregion v1
-@Injectable()
-export class CachingInterceptor implements HttpInterceptor {
-  constructor(private cache: RequestCache) {}
-
-  intercept(req: HttpRequest<any>, next: HttpHandler) {
-    // continue if not cachable.
-    if (!isCachable(req)) { return next.handle(req); }
-
-    const cachedResponse = this.cache.get(req);
-    // #enddocregion v1
-    // #docregion intercept-refresh
-    // cache-then-refresh
-    if (req.headers.get('x-refresh')) {
-      const results$ = sendRequest(req, next, this.cache);
-      return cachedResponse ?
-        results$.pipe( startWith(cachedResponse) ) :
-        results$;
-    }
-    // cache-or-fetch
-    // #docregion v1
-    return cachedResponse ?
-      of(cachedResponse) : sendRequest(req, next, this.cache);
-    // #enddocregion intercept-refresh
-  }
-}
-// #enddocregion v1
-
-
-/** Is this request cachable? */
-function isCachable(req: HttpRequest<any>) {
-  // Only GET requests are cachable
-  return req.method === 'GET' &&
-    // Only npm package search is cachable in this app
-    -1 < req.url.indexOf(searchUrl);
-}
-
-// #docregion send-request
-/**
- * Get server response observable by sending request to `next()`.
- * Will add the response to the cache on the way out.
- */
-function sendRequest(
-  req: HttpRequest<any>,
-  next: HttpHandler,
-  cache: RequestCache): Observable<HttpEvent<any>> {
-
-  // No headers allowed in npm search request
-  const noHeaderReq = req.clone({ headers: new HttpHeaders() });
-
-  return next.handle(noHeaderReq).pipe(
-    tap(event => {
-      // There may be other events besides the response.
-      if (event instanceof HttpResponse) {
-        cache.put(req, event); // Update the cache.
-      }
-    })
-  );
-}
-// #enddocregion send-request
-

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

@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import {
-  HttpEvent, HttpInterceptor, HttpHandler, HttpRequest
-} from '@angular/common/http';
-
-import { Observable } from 'rxjs/Observable';
-
-@Injectable()
-export class EnsureHttpsInterceptor implements HttpInterceptor {
-  intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>> {
-    // #docregion excerpt
-    // clone request and replace 'http://' with 'https://' at the same time
-    const secureReq = req.clone({
-      url: req.url.replace('http://', 'https://')
-    });
-    // send the cloned, "secure" request to the next handler.
-    return next.handle(secureReq);
-    // #enddocregion excerpt
-  }
-}

aio/content/examples/http/src/app/http-interceptors/index.ts

@@ -1,34 +0,0 @@
-// #docplaster
-// #docregion interceptor-providers
-/* "Barrel" of Http Interceptors */
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
-
-// #enddocregion interceptor-providers
-import { AuthInterceptor } from './auth-interceptor';
-import { CachingInterceptor } from './caching-interceptor';
-import { EnsureHttpsInterceptor } from './ensure-https-interceptor';
-import { LoggingInterceptor } from './logging-interceptor';
-// #docregion interceptor-providers
-import { NoopInterceptor } from './noop-interceptor';
-// #enddocregion interceptor-providers
-import { TrimNameInterceptor } from './trim-name-interceptor';
-import { UploadInterceptor } from './upload-interceptor';
-
-// #docregion interceptor-providers
-
-/** Http interceptor providers in outside-in order */
-export const httpInterceptorProviders = [
-  // #docregion noop-provider
-  { provide: HTTP_INTERCEPTORS, useClass: NoopInterceptor, multi: true },
-  // #enddocregion noop-provider, interceptor-providers
-
-  { provide: HTTP_INTERCEPTORS, useClass: EnsureHttpsInterceptor, multi: true },
-  { provide: HTTP_INTERCEPTORS, useClass: TrimNameInterceptor, multi: true },
-  { provide: HTTP_INTERCEPTORS, useClass: AuthInterceptor, multi: true },
-  { provide: HTTP_INTERCEPTORS, useClass: LoggingInterceptor, multi: true },
-  { provide: HTTP_INTERCEPTORS, useClass: UploadInterceptor, multi: true },
-  { provide: HTTP_INTERCEPTORS, useClass: CachingInterceptor, multi: true },
-
-  // #docregion interceptor-providers
-];
-// #enddocregion interceptor-providers

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

@@ -1,39 +0,0 @@
-import { Injectable } from '@angular/core';
-import {
-  HttpEvent, HttpInterceptor, HttpHandler,
-  HttpRequest, HttpResponse
-} from '@angular/common/http';
-
-import { Observable } from 'rxjs/Observable';
-// #docregion excerpt
-import { finalize, tap } from 'rxjs/operators';
-import { MessageService } from '../message.service';
-
-@Injectable()
-export class LoggingInterceptor implements HttpInterceptor {
-  constructor(private messenger: MessageService) {}
-
-  intercept(req: HttpRequest<any>, next: HttpHandler) {
-    const started = Date.now();
-    let ok: string;
-
-    // extend server response observable with logging
-    return next.handle(req)
-      .pipe(
-        tap(
-          // Succeeds when there is a response; ignore other events
-          event => ok = event instanceof HttpResponse ? 'succeeded' : '',
-          // Operation failed; error is an HttpErrorResponse
-          error => ok = 'failed'
-        ),
-        // Log when response observable either completes or errors
-        finalize(() => {
-          const elapsed = Date.now() - started;
-          const msg = `${req.method} "${req.urlWithParams}"
-             ${ok} in ${elapsed} ms.`;
-          this.messenger.add(msg);
-        })
-      );
-  }
-}
-// #enddocregion excerpt