docs: add changelog for 5.0.1

release: cut the 5.0.1 version
docs(common): fix mis-ordered lines (#20221 )
2017-11-08 10:29:46 -08:00 · 2017-11-08 10:28:13 -08:00 · 2017-11-06 11:29:12 -08:00 · 2017-11-06 10:05:23 -08:00 · 2017-11-06 10:05:23 -08:00 · 2017-11-06 10:05:23 -08:00
2333 changed files with 19989 additions and 100036 deletions
--- a/.bazelrc
+++ b/.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
--- a/.circleci/bazel.rc
+++ b/.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
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -7,32 +7,17 @@
 # To validate changes, use an online parser, eg.
 # http://yaml-online-parser.appspot.com/

-# Variables
-
-## IMPORTANT
-# If you change the `docker_image` version, also change the `cache_key` suffix and the version of
-# `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.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
-
 # Settings common to each job
 anchor_1: &job_defaults
  working_directory: ~/ng
  docker:
-    - image: *docker_image
+    - image: angular/ngcontainer:0.0.2

 # After checkout, rebase on top of master.
 # Similar to travis behavior, but not quite the same.
 # See https://discuss.circleci.com/t/1662
 anchor_2: &post_checkout
-  post: git pull --ff-only origin "refs/pull/${CIRCLE_PULL_REQUEST//*pull\//}/merge"
+  post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"

 version: 2
 jobs:
@ -41,54 +26,25 @@ 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)'
-
      - restore_cache:
-          key: *cache_key
+          key: angular-{{ .Branch }}-{{ checksum "yarn.lock" }}

      - run: yarn install --frozen-lockfile --non-interactive
      - run: ./node_modules/.bin/gulp lint

  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
+          key: angular-{{ .Branch }}-{{ checksum "yarn.lock" }}

-      - 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
-
-      # CircleCI will allow us to go back and view/download these artifacts from past builds.
-      # Also we can use a service like https://buildsize.org/ to automatically track binary size of these artifacts.
-      - store_artifacts:
-          path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js
-          destination: packages/core/test/bundling/hello_world/bundle.min.js
-      - store_artifacts:
-          path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js.brotli
-          destination: packages/core/test/bundling/hello_world/bundle.min.js.brotli
-
+      - run: bazel build packages/...
+      - run: bazel test @angular//...
      - save_cache:
-          key: *cache_key
+          key: angular-{{ .Branch }}-{{ checksum "yarn.lock" }}
          paths:
            - "node_modules"

--- a/.circleci/setup_cache.sh
+++ b/.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
--- a/.github/angular-robot.yml
+++ b/.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: *"
--- a/.nvmrc
+++ b/.nvmrc
@ -1 +1 @@
-8.9
+6.9.5
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@ -10,20 +10,23 @@
 # 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
 # petebacondarwin - Pete Bacon Darwin
 # pkozlowski-opensource - Pawel Kozlowski
 # robwormald - Rob Wormald
+# tbosch - Tobias Bosch
 # tinayuangao - Tina Gao
 # vicb - Victor Berchet
 # vikerman - Vikram Subramanian
+# wardbell - Ward Bell


 version: 2
@ -34,34 +37,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 +71,9 @@ groups:
          - "*.bazel"
          - "*.bzl"
          - "packages/bazel/*"
-          - "tools/bazel.rc"
    users:
      - alexeagle #primary
      - chuckjaz
-      - IgorMinar #fallback
-      - mhevery
      - vikerman #fallback

  build-and-ci:
@ -105,7 +85,6 @@ groups:
          - "*.lock"
          - "tools/*"
        exclude:
-          - "tools/bazel.rc"
          - "tools/public_api_guard/*"
          - "aio/*"
    users:
@ -121,6 +100,7 @@ groups:
    users:
      - alexeagle
      - mhevery
+      - tbosch
      - vicb
      - IgorMinar #fallback

@ -129,9 +109,9 @@ groups:
      files:
        - "packages/core/*"
    users:
-      - mhevery #primary
+      - tbosch #primary
      - chuckjaz
-      - kara
+      - mhevery
      - vicb
      - IgorMinar #fallback

@ -142,6 +122,7 @@ groups:
        - "packages/platform-browser/animations/*"
    users:
      - matsko #primary
+      - chuckjaz #fallback
      - mhevery #fallback
      - IgorMinar #fallback

@ -151,7 +132,7 @@ groups:
        - "packages/compiler/src/i18n/*"
    users:
      - vicb #primary
-      - chuckjaz
+      - tbosch
      - IgorMinar #fallback
      - mhevery #fallback

@ -160,8 +141,9 @@ groups:
      files:
        - "packages/compiler/*"
    users:
-      - chuckjaz #primary
+      - tbosch #primary
      - vicb
+      - chuckjaz
      - mhevery
      - IgorMinar #fallback

@ -173,7 +155,6 @@ groups:
      - hansl
      - filipesilva #fallback
      - brocco #fallback
-      - IgorMinar #fallback

  compiler-cli:
    conditions:
@ -182,11 +163,12 @@ groups:
          - "packages/compiler-cli/*"
          - "packages/bazel/*"
        exclude:
-          - "packages/compiler-cli/src/ngtools*"
+          - "packages/compiler-cli/src/ngtools*"   
    users:
      - alexeagle
      - chuckjaz
      - vicb
+      - tbosch
      - IgorMinar #fallback
      - mhevery #fallback

@ -207,12 +189,6 @@ groups:
    conditions:
      files:
        - "packages/forms/*"
-        - "aio/content/guide/forms.md"
-        - "aio/content/guide/form-validation.md"
-        - "aio/content/guide/reactive-forms.md"
-        - "aio/content/examples/forms/*"
-        - "aio/content/examples/form-validation/*"
-        - "aio/content/examples/reactive-forms/*"
    users:
      - kara #primary
      - tinayuangao #secondary
@ -225,8 +201,9 @@ groups:
        - "packages/common/http/*"
        - "packages/http/*"
    users:
-      - alxhub #primary
-      - IgorMinar
+      - vikerman #primary
+      - alxhub
+      - IgorMinar #fallback
      - mhevery #fallback

  language-service:
@ -235,7 +212,7 @@ groups:
        - "packages/language-service/*"
    users:
      - chuckjaz #primary
-      # needs secondary
+      - tbosch #secondary
      - vicb
      - IgorMinar #fallback
      - mhevery #fallback
@ -245,7 +222,7 @@ groups:
      files:
        - "packages/router/*"
    users:
-      - jasonaden #primary
+      - jasonaden
      - vicb
      - IgorMinar #fallback
      - mhevery #fallback
@ -265,8 +242,8 @@ groups:
      files:
        - "packages/platform-browser/*"
    users:
-      - vicb #primary
-      # needs secondary
+      - tbosch #primary
+      - vicb #secondary
      - IgorMinar #fallback
      - mhevery #fallback

@ -276,8 +253,9 @@ groups:
        - "packages/platform-server/*"
    users:
      - vikerman #primary
-      - alxhub #secondary
+      - alxhub
      - vicb
+      - tbosch
      - IgorMinar #fallback
      - mhevery #fallback

@ -287,7 +265,7 @@ groups:
        - "packages/platform-webworker/*"
    users:
      - vicb #primary
-      # needs secondary
+      - tbosch #secondary
      - IgorMinar #fallback
      - mhevery #fallback

@ -306,7 +284,7 @@ groups:
      files:
        - "packages/benchpress/*"
    users:
-      - alxhub # primary
+      - tbosch #primary
      # needs secondary
      - IgorMinar #fallback
      - mhevery #fallback
@ -334,11 +312,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:
@ -349,8 +329,9 @@ groups:
          - "aio/content/navigation.json"
          - "aio/content/license.md"
    users:
+      - juleskremer #primary
      - stephenfluin
      - petebacondarwin
      - gkalpak
-      - IgorMinar
+      - IgorMinar #fallback
      - mhevery #fallback
--- a/.travis.yml
+++ b/.travis.yml
@ -2,7 +2,7 @@ language: node_js
 sudo: false
 dist: trusty
 node_js:
-  - '8.9.1'
+  - '6.9.5'

 addons:
 #  firefox: "38.0"
@ -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
--- a/BUILD.bazel
+++ b/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,51 +11,21 @@ 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",
-        "tslib",
    ] for ext in [
        "*.js",
        "*.json",
        "*.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",
-    ],
-)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,513 +1,3 @@
-<a name="6.0.0-beta.4"></a>
-# [6.0.0-beta.4](https://github.com/angular/angular/compare/6.0.0-beta.3...6.0.0-beta.4) (2018-02-14)
-
-
-### Bug Fixes
-
-* **bazel:** allow TS to read ambient typings ([#21876](https://github.com/angular/angular/issues/21876)) ([b081dfe](https://github.com/angular/angular/commit/b081dfe)), closes [#21872](https://github.com/angular/angular/issues/21872)
-* **bazel:** improve error message for missing assets ([#22096](https://github.com/angular/angular/issues/22096)) ([dcf64a0](https://github.com/angular/angular/commit/dcf64a0)), closes [#22095](https://github.com/angular/angular/issues/22095)
-* **common:** add locale currency values ([#21783](https://github.com/angular/angular/issues/21783)) ([420cc7a](https://github.com/angular/angular/commit/420cc7a)), closes [#20385](https://github.com/angular/angular/issues/20385)
-* **common:** regenerate i18n locale data files ([#21783](https://github.com/angular/angular/issues/21783)) ([0b2f7d1](https://github.com/angular/angular/commit/0b2f7d1))
-* **common:** round currencies based on decimal digits in `CurrencyPipe` ([#21783](https://github.com/angular/angular/issues/21783)) ([44154e7](https://github.com/angular/angular/commit/44154e7)), closes [#10189](https://github.com/angular/angular/issues/10189)
-* **common:** weaken AsyncPipe transform signature ([#22169](https://github.com/angular/angular/issues/22169)) ([be59c3a](https://github.com/angular/angular/commit/be59c3a))
-* **compiler:** make unary plus operator consistent to JavaScript ([#22154](https://github.com/angular/angular/issues/22154)) ([72f8abd](https://github.com/angular/angular/commit/72f8abd)), closes [#22089](https://github.com/angular/angular/issues/22089)
-* **core:** add stacktrace in log when error during cleanup component in TestBed ([#22162](https://github.com/angular/angular/issues/22162)) ([16d1700](https://github.com/angular/angular/commit/16d1700))
-* **core:** ensure initial value of QueryList length ([#21980](https://github.com/angular/angular/issues/21980)) ([#21982](https://github.com/angular/angular/issues/21982)) ([e56de10](https://github.com/angular/angular/commit/e56de10)), closes [/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)) ([a751649](https://github.com/angular/angular/commit/a751649))
-* **forms:** make Validators.email support optional controls ([#20869](https://github.com/angular/angular/issues/20869)) ([140e7c0](https://github.com/angular/angular/commit/140e7c0))
-* **forms:** prevent event emission on enable/disable when emitEvent is false ([#12366](https://github.com/angular/angular/issues/12366)) ([#21018](https://github.com/angular/angular/issues/21018)) ([0bcfae7](https://github.com/angular/angular/commit/0bcfae7))
-* **forms:** set state before emitting a value from ngModelChange ([#21514](https://github.com/angular/angular/issues/21514)) ([9744a1c](https://github.com/angular/angular/commit/9744a1c)), closes [#21513](https://github.com/angular/angular/issues/21513)
-* **language-service:** correct instructions to install the language service ([#22000](https://github.com/angular/angular/issues/22000)) ([b37cee3](https://github.com/angular/angular/commit/b37cee3))
-* **platform-browser:** add @Injectable where it was missing ([#22005](https://github.com/angular/angular/issues/22005)) ([0a1a397](https://github.com/angular/angular/commit/0a1a397))
-* **platform-browser:** support 0/false/null values in transfer_state ([#22179](https://github.com/angular/angular/issues/22179)) ([6435ecd](https://github.com/angular/angular/commit/6435ecd))
-
-
-### Features
-
-* **bazel:** allow explicit specification of factories ([#22003](https://github.com/angular/angular/issues/22003)) ([e442881](https://github.com/angular/angular/commit/e442881))
-* **compiler:** mark @NgModules in provider lists for identification at runtime ([#22005](https://github.com/angular/angular/issues/22005)) ([2d5e7d1](https://github.com/angular/angular/commit/2d5e7d1))
-* **forms:** multiple validators for array method ([#20766](https://github.com/angular/angular/issues/20766)) ([941e88f](https://github.com/angular/angular/commit/941e88f)), closes [#20665](https://github.com/angular/angular/issues/20665)
-* change @Injectable() to support tree-shakeable tokens ([#22005](https://github.com/angular/angular/issues/22005)) ([235a235](https://github.com/angular/angular/commit/235a235))
-
-
-
-<a name="5.2.5"></a>
-## [5.2.5](https://github.com/angular/angular/compare/5.2.4...5.2.5) (2018-02-14)
-
-
-### Bug Fixes
-
-(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="6.0.0-beta.3"></a>
-# [6.0.0-beta.3](https://github.com/angular/angular/compare/6.0.0-beta.2...6.0.0-beta.3) (2018-02-07)
-
-
-### Bug Fixes
-
-* **common:** don't convert null to a string when flushing a mock request ([#21417](https://github.com/angular/angular/issues/21417)) ([8b14488](https://github.com/angular/angular/commit/8b14488)), closes [#20744](https://github.com/angular/angular/issues/20744)
-* **core:** fix [#20582](https://github.com/angular/angular/issues/20582), don't need to wrap zone in location change listener ([#20640](https://github.com/angular/angular/issues/20640)) ([f791e9f](https://github.com/angular/angular/commit/f791e9f))
-* **core:** fix proper propagation of subscriptions in EventEmitter ([#22016](https://github.com/angular/angular/issues/22016)) ([e81606c](https://github.com/angular/angular/commit/e81606c)), closes [#21999](https://github.com/angular/angular/issues/21999)
-* **core:** should check Zone existance when scheduleMicroTask ([#20656](https://github.com/angular/angular/issues/20656)) ([3a86940](https://github.com/angular/angular/commit/3a86940))
-* **forms:** publish missing types ([#19941](https://github.com/angular/angular/issues/19941)) ([2707012](https://github.com/angular/angular/commit/2707012))
-* **ivy:** generate correct interpolations ([#21946](https://github.com/angular/angular/issues/21946)) ([3cc1d76](https://github.com/angular/angular/commit/3cc1d76))
-* **ivy:** generate lifecycle pattern ([#21865](https://github.com/angular/angular/issues/21865)) ([f816666](https://github.com/angular/angular/commit/f816666))
-* **ivy:** improve `bindV` perf and memory usage ([#21881](https://github.com/angular/angular/issues/21881)) ([0846784](https://github.com/angular/angular/commit/0846784))
-* **ivy:** remove unnecessary parameter of NgOnChangesFeature ([#21879](https://github.com/angular/angular/issues/21879)) ([65cf1ad](https://github.com/angular/angular/commit/65cf1ad))
-
-
-### Features
-
-* **compiler-cli:** reflect static methods added to classes in metadata ([#21926](https://github.com/angular/angular/issues/21926)) ([eb8ddd2](https://github.com/angular/angular/commit/eb8ddd2))
-* **ivy:** add canonical example of a pipe. ([#21834](https://github.com/angular/angular/issues/21834)) ([743d8bc](https://github.com/angular/angular/commit/743d8bc))
-* **ivy:** add support for attributes on ng-content nodes ([#21935](https://github.com/angular/angular/issues/21935)) ([1aa2947](https://github.com/angular/angular/commit/1aa2947))
-* **ivy:** memoize array literals in render3 ([#21973](https://github.com/angular/angular/issues/21973)) ([4d62be6](https://github.com/angular/angular/commit/4d62be6))
-
-
-### Performance Improvements
-
-* **ivy:** improve Uglify configuration in hello world integration test ([#21985](https://github.com/angular/angular/issues/21985)) ([7e51e52](https://github.com/angular/angular/commit/7e51e52))
-
-
-
-<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="6.0.0-beta.2"></a>
-# [6.0.0-beta.2](https://github.com/angular/angular/compare/6.0.0-beta.1...6.0.0-beta.2) (2018-01-31)
-
-
-### Features
-
-* **router:** add navigationSource and restoredState to NavigationStart event ([#21728](https://github.com/angular/angular/issues/21728)) ([c40ae7f](https://github.com/angular/angular/commit/c40ae7f))
-* **service-worker:** add helper script which will uninstall SW ([#21863](https://github.com/angular/angular/issues/21863)) ([b10540a](https://github.com/angular/angular/commit/b10540a))
-
-
-
-<a name="5.2.3"></a>
-## [5.2.3](https://github.com/angular/angular/compare/5.2.2...5.2.3) (2018-01-31)
-
-
-### 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="6.0.0-beta.1"></a>
-# [6.0.0-beta.1](https://github.com/angular/angular/compare/6.0.0-beta.0...6.0.0-beta.1) (2018-01-25)
-
-
-### Bug Fixes
-
-* **common:** A null value should remove the style on IE ([#21679](https://github.com/angular/angular/issues/21679)) ([7d49443](https://github.com/angular/angular/commit/7d49443)), closes [#21064](https://github.com/angular/angular/issues/21064)
-* avoid triggering a cli bug ([#21611](https://github.com/angular/angular/issues/21611)) ([0eabd07](https://github.com/angular/angular/commit/0eabd07))
-* **common:** don't remove special characters when extracting CLDR data ([#21626](https://github.com/angular/angular/issues/21626)) ([135a282](https://github.com/angular/angular/commit/135a282))
-* **common:** extract plural function from i18n locale data files for TS 2.6 ([#21626](https://github.com/angular/angular/issues/21626)) ([97b18b2](https://github.com/angular/angular/commit/97b18b2)), closes [#21608](https://github.com/angular/angular/issues/21608)
-* **common:** fallback to last defined value for named date and time formats ([#21299](https://github.com/angular/angular/issues/21299)) ([879756d](https://github.com/angular/angular/commit/879756d)), closes [#21282](https://github.com/angular/angular/issues/21282)
-* **compiler:** add support for marker tags in xliff serializers ([#21250](https://github.com/angular/angular/issues/21250)) ([f74130c](https://github.com/angular/angular/commit/f74130c)), closes [#21078](https://github.com/angular/angular/issues/21078)
-* **compiler:** Don't strip `/*# sourceURL ... */` ([#16088](https://github.com/angular/angular/issues/16088)) ([5f681f9](https://github.com/angular/angular/commit/5f681f9))
-* **compiler:** fix ICU select messages to use male/female/other ([#21713](https://github.com/angular/angular/issues/21713)) ([cb5090c](https://github.com/angular/angular/commit/cb5090c))
-* **compiler-cli:** do not fold errors past calls in the collector ([#21708](https://github.com/angular/angular/issues/21708)) ([dd86790](https://github.com/angular/angular/commit/dd86790))
-* **compiler-cli:** do not lower expressions in non-modules ([#21649](https://github.com/angular/angular/issues/21649)) ([7f93aad](https://github.com/angular/angular/commit/7f93aad))
-* **router:** don't use ParamsInheritanceStrategy in declarations ([#21574](https://github.com/angular/angular/issues/21574)) ([925e654](https://github.com/angular/angular/commit/925e654)), closes [#21456](https://github.com/angular/angular/issues/21456)
-
-
-### Features
-
-* **compiler:** implement "enableIvy" compiler option ([#21427](https://github.com/angular/angular/issues/21427)) ([64d16de](https://github.com/angular/angular/commit/64d16de))
-* **core:** optional generic type for ElementRef ([#20765](https://github.com/angular/angular/issues/20765)) ([d3d9aac](https://github.com/angular/angular/commit/d3d9aac)), closes [#13139](https://github.com/angular/angular/issues/13139)
-
-
-
-<a name="5.2.2"></a>
-## [5.2.2](https://github.com/angular/angular/compare/5.2.1...5.2.2) (2018-01-25)
-
-
-### 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="6.0.0-beta.0"></a>
-# [6.0.0-beta.0](https://github.com/angular/angular/compare/5.2.0...6.0.0-beta.0) (2018-01-17)
-
-
-### Bug Fixes
-
-* **animations:** fix increment/decrement aliases example ([#18323](https://github.com/angular/angular/issues/18323)) ([d2aa8ac](https://github.com/angular/angular/commit/d2aa8ac))
-* **benchpress:** should still support selenium_webdriver < 3.6.0 ([#21477](https://github.com/angular/angular/issues/21477)) ([9b84a32](https://github.com/angular/angular/commit/9b84a32))
-* **common:** set correct timezone for ISO8601 dates in Safari ([#21506](https://github.com/angular/angular/issues/21506)) ([05208b8](https://github.com/angular/angular/commit/05208b8)), closes [#21491](https://github.com/angular/angular/issues/21491)
-* **compiler:** cache external reference resolution ([#21359](https://github.com/angular/angular/issues/21359)) ([e3e2fc0](https://github.com/angular/angular/commit/e3e2fc0))
-* **compiler:** make `.ngsummary.json` files idempotent ([#21448](https://github.com/angular/angular/issues/21448)) ([e64b1e9](https://github.com/angular/angular/commit/e64b1e9))
-* **core:** fix chained http call ([#20924](https://github.com/angular/angular/issues/20924)) ([7e3f9a4](https://github.com/angular/angular/commit/7e3f9a4)), closes [#20921](https://github.com/angular/angular/issues/20921)
-* **ivy:** Add workaround for AJD in google3 ([#21488](https://github.com/angular/angular/issues/21488)) ([6af3672](https://github.com/angular/angular/commit/6af3672))
-* **language-service:** Clear caches when program changes ([#21337](https://github.com/angular/angular/issues/21337)) ([43e1520](https://github.com/angular/angular/commit/43e1520)), closes [#19405](https://github.com/angular/angular/issues/19405)
-* **service-worker:** properly handle invalid hashes in all scenarios ([#21288](https://github.com/angular/angular/issues/21288)) ([3951098](https://github.com/angular/angular/commit/3951098))
-
-
-### Features
-
-* **bazel:** allow ng_module rules to control whether type checking is enabled ([#21460](https://github.com/angular/angular/issues/21460)) ([cffa0fe](https://github.com/angular/angular/commit/cffa0fe))
-* **core:** add binding name to content changed error ([#20352](https://github.com/angular/angular/issues/20352)) ([d3bf54b](https://github.com/angular/angular/commit/d3bf54b))
-* **forms:** handle string with and without line boundary on pattern validator ([#19256](https://github.com/angular/angular/issues/19256)) ([54bf179](https://github.com/angular/angular/commit/54bf179))
-
-
-### Performance Improvements
-
-* **ivy:** add missing dom element in render3_function tree benchmark ([#21476](https://github.com/angular/angular/issues/21476)) ([9b5a485](https://github.com/angular/angular/commit/9b5a485))
-
-
-
-<a name="5.2.1"></a>
-## [5.2.1](https://github.com/angular/angular/compare/5.2.0...5.2.1) (2018-01-17)
-
-
-### 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)
-
-
-### Bug Fixes
-
-* **compiler-cli:** propagate ts.SourceFile moduleName into metadata ([a2ff4ab](https://github.com/angular/angular/commit/a2ff4ab))
-* **service-worker:** allow disabling SW while still using services ([f99335b](https://github.com/angular/angular/commit/f99335b))
-* **service-worker:** don't crash if SW not supported ([ee37d4b](https://github.com/angular/angular/commit/ee37d4b))
-* **service-worker:** send initialization signal from the application ([6bf07b4](https://github.com/angular/angular/commit/6bf07b4))
-* **service-worker:** use relative path for ngsw.json ([56c98f7](https://github.com/angular/angular/commit/56c98f7))
-
-
-
-<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)
-
-
-### Bug Fixes
-
-* **animations:** ensure multi-level enter animations work ([#19455](https://github.com/angular/angular/issues/19455)) ([22bbd6e](https://github.com/angular/angular/commit/22bbd6e))
-* **animations:** ensure multi-level leave animations work ([#19455](https://github.com/angular/angular/issues/19455)) ([c7b211c](https://github.com/angular/angular/commit/c7b211c))
-* **common:** accept falsy values as HTTP bodies ([#19958](https://github.com/angular/angular/issues/19958)) ([66fd1f8](https://github.com/angular/angular/commit/66fd1f8)), 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)) ([ead7596](https://github.com/angular/angular/commit/ead7596))
-* **common:** remove useless guard in HttpClient ([#19958](https://github.com/angular/angular/issues/19958)) ([e099911](https://github.com/angular/angular/commit/e099911)), 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)) ([bdaee50](https://github.com/angular/angular/commit/bdaee50)), 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-cli:** fix memory leak in program creation ([#20692](https://github.com/angular/angular/issues/20692)) ([38be44d](https://github.com/angular/angular/commit/38be44d)), 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)) ([2b0c896](https://github.com/angular/angular/commit/2b0c896)), closes [#20416](https://github.com/angular/angular/issues/20416)
-
-
-
-<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)
-
-
-### Bug Fixes
-
-* **animations:** always fire inner trigger callbacks even if blocked by parent animations ([#19753](https://github.com/angular/angular/issues/19753)) ([814f062](https://github.com/angular/angular/commit/814f062)), closes [#19100](https://github.com/angular/angular/issues/19100)
-* **animations:** validate against trigger() names that use @ symbols ([#20326](https://github.com/angular/angular/issues/20326)) ([15795d0](https://github.com/angular/angular/commit/15795d0))
-* **benchpress:** Allow ignoring navigationStart events in perflog metric. ([#20312](https://github.com/angular/angular/issues/20312)) ([9ca6ee9](https://github.com/angular/angular/commit/9ca6ee9))
-* **common:** return ISubscription from Location.subscribe() ([#20429](https://github.com/angular/angular/issues/20429)) ([bc904b1](https://github.com/angular/angular/commit/bc904b1)), 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)) ([81f1d42](https://github.com/angular/angular/commit/81f1d42))
-* **compiler:** support event bindings in `fullTemplateTypeCheck` ([#20490](https://github.com/angular/angular/issues/20490)) ([b53ead4](https://github.com/angular/angular/commit/b53ead4))
-* **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)) ([0feba49](https://github.com/angular/angular/commit/0feba49))
-* **core:** should support event.stopImmediatePropagation ([#20469](https://github.com/angular/angular/issues/20469)) ([82aace6](https://github.com/angular/angular/commit/82aace6))
-* **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)
-
-
-### Bug Fixes
-
-* **animations:** ensure final state() styles are applied within @.disabled animations ([#20267](https://github.com/angular/angular/issues/20267)) ([8b1a6b1](https://github.com/angular/angular/commit/8b1a6b1)), closes [#20266](https://github.com/angular/angular/issues/20266)
-* **compiler:** fix corner cases in shadow CSS ([5d1cd57](https://github.com/angular/angular/commit/5d1cd57))
-* **compiler:** recognize @NgModule with a redundant @Injectable ([#20320](https://github.com/angular/angular/issues/20320)) ([4cc6abb](https://github.com/angular/angular/commit/4cc6abb))
-* **compiler:** show explanatory text in template errors ([#20313](https://github.com/angular/angular/issues/20313)) ([424a323](https://github.com/angular/angular/commit/424a323))
-* **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)

--- a/CONTRIBUTING.md
+++ b/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
--- a/2
+++ b/2
@ -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
--- a/README.md
+++ b/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)


--- a/86
+++ b/86
@ -1,78 +1,24 @@
-workspace(name = "angular")
+workspace(name = "angular_src")

-http_archive(
-    name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.4.1.zip",
-    strip_prefix = "rules_nodejs-0.4.1",
-    sha256 = "e9bc013417272b17f302dc169ad597f05561bb277451f010043f4da493417607",
-)
-
-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories")
-
-check_bazel_version("0.9.0")
-node_repositories(package_json = ["//:package.json"])
-
-http_archive(
-    name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.10.1.zip",
-    strip_prefix = "rules_typescript-0.10.1",
-    sha256 = "a2c81776a4a492ff9f878f9705639f5647bef345f7f3e1da09c9eeb8dec80485",
-)
-
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
-local_repository(
-    name = "rxjs",
-    path = "node_modules/rxjs/src",
-)
+load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

 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",
+    name = "build_bazel_rules_nodejs",
+    remote = "https://github.com/bazelbuild/rules_nodejs.git",
+    # TODO(alexeagle): use the correct tag here.
+    commit = "2c6243df53fd33fdab283ebdd01582e4eb815db8",
 )

-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("@build_bazel_rules_nodejs//:defs.bzl", "node_repositories")
+
+node_repositories(package_json = ["//:package.json"])
+
+local_repository(
+    name = "build_bazel_rules_typescript",
+    path = "node_modules/@bazel/typescript",
 )

-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",
-)
-
-# We have a source dependency on the Devkit repository, because it's built with
-# Bazel.
-# This allows us to edit sources and have the effect appear immediately without
-# re-packaging or "npm link"ing.
-# Even better, things like aspects will visit the entire graph including
-# ts_library rules in the devkit repository.
-http_archive(
-    name = "angular_devkit",
-    url = "https://github.com/angular/devkit/archive/v0.3.1.zip",
-    strip_prefix = "devkit-0.3.1",
-    sha256 = "31d4b597fe9336650acf13df053c1c84dcbe9c29c6a833bcac3819cd3fd8cad3",
-)
-
-http_archive(
-    name = "org_brotli",
-    url = "https://github.com/google/brotli/archive/v1.0.2.zip",
-    strip_prefix = "brotli-1.0.2",
-    sha256 = "b43d5d6bc40f2fa6c785b738d86c6bbe022732fe25196ebbe43b9653a025920d",
+local_repository(
+    name = "angular",
+    path = "packages/bazel",
 )
--- a/aio/.angular-cli.json
+++ b/aio/.angular-cli.json
@ -39,7 +39,7 @@
  ],
  "e2e": {
    "protractor": {
-      "config": "tests/e2e/protractor.conf.js"
+      "config": "./protractor.conf.js"
    }
  },
  "lint": [
@ -50,21 +50,18 @@
      "project": "src/tsconfig.spec.json"
    },
    {
-      "project": "tests/e2e/tsconfig.e2e.json"
+      "project": "e2e/tsconfig.e2e.json"
    }
  ],
  "test": {
    "karma": {
-      "config": "src/karma.conf.js"
+      "config": "./karma.conf.js"
    }
  },
  "defaults": {
    "styleExt": "scss",
    "component": {
      "inlineStyle": true
-    },
-    "build": {
-      "namedChunks": true
    }
  }
 }
--- a/aio/README.md
+++ b/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
 ```

--- a/aio/content/examples/.DS_Store
+++ b/aio/content/examples/.DS_Store
--- a/aio/content/examples/.gitignore
+++ b/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
--- a/aio/content/examples/ajs-quick-reference/.angular-cli.1.json
+++ b/aio/content/examples/ajs-quick-reference/.angular-cli.1.json
@ -1,62 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "project": {
-    "name": "angular.io-example"
-  },
-  "apps": [
-    {
-      "root": "src",
-      "outDir": "dist",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      // #docregion styles
-      "styles": [
-        "styles.css"
-      ],
-      // #enddocregion styles
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    }
-  ],
-  "e2e": {
-    "protractor": {
-      "config": "./protractor.conf.js"
-    }
-  },
-  "lint": [
-    {
-      "project": "src/tsconfig.app.json",
-      "exclude": "**/node_modules/**"
-    },
-    {
-      "project": "src/tsconfig.spec.json",
-      "exclude": "**/node_modules/**"
-    },
-    {
-      "project": "e2e/tsconfig.e2e.json",
-      "exclude": "**/node_modules/**"
-    }
-  ],
-  "test": {
-    "karma": {
-      "config": "./karma.conf.js"
-    }
-  },
-  "defaults": {
-    "styleExt": "css",
-    "component": {}
-  }
-}
--- a/aio/content/examples/ajs-quick-reference/stackblitz.json
+++ b/aio/content/examples/ajs-quick-reference/stackblitz.json
@ -1,5 +1,6 @@
 {
  "description": "AngularJS to Angular Quick Reference",
+  "basePath": "src/",
  "files":[
    "!**/*.d.ts",
    "!**/*.js",
--- a/aio/content/examples/ajs-quick-reference/src/index.html
+++ b/aio/content/examples/ajs-quick-reference/src/index.html
@ -5,6 +5,9 @@
    <meta charset="UTF-8">
    <title>AngularJS to Angular Quick Reference</title>
    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- #docregion style -->
+    <link rel="stylesheet" href="styles.css">
+    <!-- #enddocregion style -->
  </head>

  <body>
--- a/aio/content/examples/animations/stackblitz.json
+++ b/aio/content/examples/animations/stackblitz.json
@ -1,5 +1,6 @@
 {
  "description": "Angular Animations",
+  "basePath": "src/",
  "files":[
    "!**/*.d.ts",
    "!**/*.js"
--- a/aio/content/examples/architecture/stackblitz.json
+++ b/aio/content/examples/architecture/stackblitz.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.*"
+  ]
 }
--- a/aio/content/examples/architecture/src/app/hero-detail.component.html
+++ b/aio/content/examples/architecture/src/app/hero-detail.component.html
@ -1,10 +1,9 @@
 <hr>
 <h4>{{hero.name}} Detail</h4>
 <div>Id: {{hero.id}}</div>
-<label>Name:
+<div>Name:
  <!-- #docregion ngModel -->
  <input [(ngModel)]="hero.name">
  <!-- #enddocregion ngModel -->
-</label>
-<br />
-<label>Power: <input [(ngModel)]="hero.power"></label>
+</div>
+<div>Power:<input [(ngModel)]="hero.power"></div>
--- a/aio/content/examples/architecture/src/app/sales-tax.component.ts
+++ b/aio/content/examples/architecture/src/app/sales-tax.component.ts
@ -7,7 +7,7 @@ import { TaxRateService }  from './tax-rate.service';
  selector:    'app-sales-tax',
  template: `
    <h2>Sales Tax Calculator</h2>
-    <label>Amount: <input #amountBox (change)="0"></label>
+    Amount: <input #amountBox (change)="0">

    <div *ngIf="amountBox.value">
    The sales tax is
--- a/aio/content/examples/attribute-directives/stackblitz.json
+++ b/aio/content/examples/attribute-directives/stackblitz.json
@ -1,9 +1,10 @@
 {
  "description": "Attribute Directive",
+  "basePath": "src/",
  "files":[
    "!**/*.d.ts",
    "!**/*.js",
-    "!**/*.[1,2,3].*"
+    "!app/*.[1,2,3].*"
  ],
  "tags": ["attribute", "directive"]
 }
--- a/aio/content/examples/attribute-directives/src/app/app.component.1.html
+++ b/aio/content/examples/attribute-directives/src/app/app.component.1.html
@ -1,14 +1,14 @@
 <!-- #docregion -->
 <h1>My First Attribute Directive</h1>
 <!-- #docregion applied -->
-<p appHighlight>Highlight me!</p>
+<p appHightlight>Highlight me!</p>
 <!-- #enddocregion applied,  -->

 <!-- #docregion color-1 -->
-<p appHighlight highlightColor="yellow">Highlighted in yellow</p>
-<p appHighlight [highlightColor]="'orange'">Highlighted in orange</p>
+<p appHightlight highlightColor="yellow">Highlighted in yellow</p>
+<p appHightlight [highlightColor]="'orange'">Highlighted in orange</p>
 <!-- #enddocregion color-1 -->

 <!-- #docregion color-2 -->
-<p appHighlight [highlightColor]="color">Highlighted with parent component's color</p>
+<p appHightlight [highlightColor]="color">Highlighted with parent component's color</p>
 <!-- #enddocregion color-2 -->
--- a/aio/content/examples/attribute-directives/src/app/dummy.module.1.ts
+++ b/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';
--- a/aio/content/examples/attribute-directives/src/app/highlight.directive.0.ts
+++ b/aio/content/examples/attribute-directives/src/app/highlight.directive.0.ts
@ -1,9 +0,0 @@
-// #docregion
-import { Directive } from '@angular/core';
-
-@Directive({
-  selector: '[appHighlight]'
-})
-export class HighlightDirective {
-  constructor() { }
-}
--- a/aio/content/examples/attribute-directives/src/app/highlight.directive.1.ts
+++ b/aio/content/examples/attribute-directives/src/app/highlight.directive.1.ts
@ -1,10 +1,8 @@
 /* tslint:disable:no-unused-variable */
 // #docregion
-import { Directive, ElementRef } from '@angular/core';
+import { Directive, ElementRef, Input } from '@angular/core';

-@Directive({
-  selector: '[appHighlight]'
-})
+@Directive({ selector: '[appHighlight]' })
 export class HighlightDirective {
    constructor(el: ElementRef) {
       el.nativeElement.style.backgroundColor = 'yellow';
--- a/aio/content/examples/attribute-directives/src/app/highlight.directive.2.ts
+++ b/aio/content/examples/attribute-directives/src/app/highlight.directive.2.ts
@ -1,10 +1,7 @@
 /* tslint:disable:no-unused-variable member-ordering */
 // #docplaster
-// #docregion imports,
-import { Directive, ElementRef, HostListener } from '@angular/core';
-// #enddocregion imports,
-import { Input } from '@angular/core';
 // #docregion
+import { Directive, ElementRef, HostListener, Input } from '@angular/core';

@Directive({
  selector: '[appHighlight]'
@ -38,7 +35,7 @@ export class HighlightDirective {
  // #enddocregion color

  // #docregion color-2
-  @Input() appHighlight: string;
+  @Input() myHighlight: string;
  // #enddocregion color-2
 }

--- a/aio/content/examples/attribute-directives/src/app/highlight.directive.3.ts
+++ b/aio/content/examples/attribute-directives/src/app/highlight.directive.3.ts
@ -1,7 +1,6 @@
 /* tslint:disable:member-ordering */
-// #docregion, imports
+// #docregion
 import { Directive, ElementRef, HostListener, Input } from '@angular/core';
-// #enddocregion imports

@Directive({
  selector: '[appHighlight]'
--- a/aio/content/examples/attribute-directives/src/app/highlight.directive.ts
+++ b/aio/content/examples/attribute-directives/src/app/highlight.directive.ts
@ -1,5 +1,7 @@
 /* tslint:disable:member-ordering */
+// #docregion imports,
 import { Directive, ElementRef, HostListener, Input } from '@angular/core';
+// #enddocregion imports

@Directive({
  selector: '[appHighlight]'
--- a/aio/content/examples/bootstrapping/bs-config.1.json
+++ b/aio/content/examples/bootstrapping/bs-config.1.json
@ -1,8 +0,0 @@
-{
-  "server": {
-    "baseDir": "src",
-    "routes": {
-      "/node_modules": "node_modules"
-    }
-  }
-}
--- a/aio/content/examples/bootstrapping/e2e/app.e2e-spec.ts
+++ b/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!');
-  });
-});
--- a/aio/content/examples/bootstrapping/src/app/app.component.css
+++ b/aio/content/examples/bootstrapping/src/app/app.component.css
--- a/aio/content/examples/bootstrapping/src/app/app.component.html
+++ b/aio/content/examples/bootstrapping/src/app/app.component.html
@ -1,3 +0,0 @@
-<h1>
-  {{title}}
-</h1>
--- a/aio/content/examples/bootstrapping/src/app/app.component.spec.ts
+++ b/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!');
-  }));
-});
--- a/aio/content/examples/bootstrapping/src/app/app.component.ts
+++ b/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!';
-}
--- a/aio/content/examples/bootstrapping/src/app/app.module.ts
+++ b/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
--- a/aio/content/examples/bootstrapping/src/app/item.directive.spec.ts
+++ b/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();
-  });
-});
--- a/aio/content/examples/bootstrapping/src/app/item.directive.ts
+++ b/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
--- a/aio/content/examples/bootstrapping/src/index.html
+++ b/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>
--- a/aio/content/examples/bootstrapping/src/main.ts
+++ b/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);
--- a/aio/content/examples/bootstrapping/stackblitz.json
+++ b/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"]
-}
--- a/aio/content/examples/component-interaction/stackblitz.json
+++ b/aio/content/examples/component-interaction/stackblitz.json
@ -1,5 +1,6 @@
 {
  "description": "Component Communication Cookbook samples",
+  "basePath": "src/",
  "files":[
    "!**/*.d.ts",
    "!**/*.js"
--- a/aio/content/examples/component-styles/stackblitz.json
+++ b/aio/content/examples/component-styles/stackblitz.json
@ -1,5 +1,6 @@
 {
  "description": "Component Styles",
+  "basePath": "src/",
  "files": [
    "!**/*.d.ts",
    "!**/*.js",
--- a/aio/content/examples/component-styles/src/app/hero-app.component.1.css
+++ b/aio/content/examples/component-styles/src/app/hero-app.component.1.css
--- a/aio/content/examples/component-styles/src/app/hero-details.component.css
+++ b/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 */
--- a/aio/content/examples/component-styles/src/app/hero-team.component.ts
+++ b/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">
--- a/aio/content/examples/dependency-injection-in-action/stackblitz.json
+++ b/aio/content/examples/dependency-injection-in-action/stackblitz.json
@ -1,5 +1,6 @@
 {
  "description": "Dependency Injection",
+  "basePath": "src/",
  "files":[
    "!**/*.d.ts",
    "!**/*.js",
--- a/aio/content/examples/dependency-injection/stackblitz.json
+++ b/aio/content/examples/dependency-injection/stackblitz.json
@ -1,10 +1,10 @@
 {
  "description": "Dependency Injection",
+  "basePath": "src/",
  "files":[
    "!**/*.d.ts",
    "!**/*.js",
-    "!**/*.[0,1,2].*",
-    "!**/dummy.module.ts"
+    "!**/*.[1,2].*"
  ],
  "tags": ["dependency", "di"]
 }
--- a/aio/content/examples/dependency-injection/src/app/app-config.ts
+++ b/aio/content/examples/dependency-injection/src/app/app-config.ts
@ -1,10 +0,0 @@
-/*
-  Must put this interface in its own file instead of app.config.ts
-  or else TypeScript gives a (bogus) warning:
-  WARNING in ./src/app/... .ts
-  "export 'AppConfig' was not found in './app.config'
-*/
-export interface AppConfig {
-  apiEndpoint: string;
-  title: string;
-}
--- a/aio/content/examples/dependency-injection/src/app/app.component.1.ts
+++ b/aio/content/examples/dependency-injection/src/app/app.component.1.ts
@ -1,5 +1,7 @@
+// Early versions
+
 // #docregion
-import { Component } from '@angular/core';
+import { Component }         from '@angular/core';

@Component({
  selector: 'app-root',
--- a/aio/content/examples/dependency-injection/src/app/app.component.2.ts
+++ b/aio/content/examples/dependency-injection/src/app/app.component.2.ts
@ -1,6 +1,7 @@
 // #docregion
 // #docregion imports
-import { Component, Inject } from '@angular/core';
+import { Component }         from '@angular/core';
+import { Inject }   from '@angular/core';

 import { APP_CONFIG, AppConfig }    from './app.config';
 // #enddocregion imports
@ -22,5 +23,3 @@ export class AppComponent {
  }
  // #enddocregion ctor
 }
-// #enddocregion
-
--- a/aio/content/examples/dependency-injection/src/app/app.component.ts
+++ b/aio/content/examples/dependency-injection/src/app/app.component.ts
@ -4,6 +4,7 @@
 import { Component, Inject } from '@angular/core';

 import { APP_CONFIG, AppConfig } from './app.config';
+import { Logger } from './logger.service';
 import { UserService } from './user.service';
 // #enddocregion imports

@ -22,7 +23,8 @@ import { UserService } from './user.service';
    <app-heroes id="authorized" *ngIf="isAuthorized"></app-heroes>
    <app-heroes id="unauthorized" *ngIf="!isAuthorized"></app-heroes>
    <app-providers></app-providers>
-  `
+  `,
+  providers: [Logger]
 })
 export class AppComponent {
  title: string;
--- a/aio/content/examples/dependency-injection/src/app/app.config.ts
+++ b/aio/content/examples/dependency-injection/src/app/app.config.ts
@ -1,13 +1,15 @@
-import { AppConfig } from './app-config';
-export { AppConfig } from './app-config';
-
 // #docregion token
 import { InjectionToken } from '@angular/core';

-export const APP_CONFIG = new InjectionToken<AppConfig>('app.config');
+export let APP_CONFIG = new InjectionToken<AppConfig>('app.config');
 // #enddocregion token

 // #docregion config
+export interface AppConfig {
+  apiEndpoint: string;
+  title: string;
+}
+
 export const HERO_DI_CONFIG: AppConfig = {
  apiEndpoint: 'api.heroes.com',
  title: 'Dependency Injection'
--- a/aio/content/examples/dependency-injection/src/app/app.module.ts
+++ b/aio/content/examples/dependency-injection/src/app/app.module.ts
@ -1,24 +1,32 @@
-// #docplaster
 import { NgModule } from '@angular/core';
 import { BrowserModule }  from '@angular/platform-browser';

-import { APP_CONFIG, HERO_DI_CONFIG }    from './app.config';
 import { AppComponent } from './app.component';
 import { CarComponent } from './car/car.component';
 import { HeroesComponent } from './heroes/heroes.component';
 import { HeroListComponent } from './heroes/hero-list.component';
 import { InjectorComponent } from './injector.component';
-import { Logger } from './logger.service';
 import { TestComponent } from './test.component';
+import { APP_CONFIG, HERO_DI_CONFIG }    from './app.config';
 import { UserService } from './user.service';
-
-import { ProvidersModule } from './providers.module';
+import {
+  ProvidersComponent,
+  Provider1Component,
+  Provider3Component,
+  Provider4Component,
+  Provider5Component,
+  Provider6aComponent,
+  Provider6bComponent,
+  Provider7Component,
+  Provider8Component,
+  Provider9Component,
+  Provider10Component,
+} from './providers.component';

 // #docregion ngmodule
@NgModule({
  imports: [
-    BrowserModule,
-    ProvidersModule
+    BrowserModule
  ],
  declarations: [
    AppComponent,
@ -27,19 +35,26 @@ import { ProvidersModule } from './providers.module';
    // #enddocregion ngmodule
    HeroListComponent,
    InjectorComponent,
-    TestComponent
+    TestComponent,
+    ProvidersComponent,
+    Provider1Component,
+    Provider3Component,
+    Provider4Component,
+    Provider5Component,
+    Provider6aComponent,
+    Provider6bComponent,
+    Provider7Component,
+    Provider8Component,
+    Provider9Component,
+    Provider10Component,
    // #docregion ngmodule
  ],
-  // #docregion providers, providers-2
+  // #docregion ngmodule-providers
  providers: [
-    // #enddocregion providers
-    Logger,
-    // #docregion providers
    UserService,
    { provide: APP_CONFIG, useValue: HERO_DI_CONFIG }
  ],
-  // #enddocregion providers, providers-2
-  exports: [ CarComponent, HeroesComponent ],
+  // #enddocregion ngmodule-providers
  bootstrap: [ AppComponent ]
 })
 export class AppModule { }
--- a/aio/content/examples/dependency-injection/src/app/dummy.module.ts
+++ b/aio/content/examples/dependency-injection/src/app/dummy.module.ts
@ -1,25 +0,0 @@
-
-/// Dummy modules to satisfy Angular Language Service
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-import { AppModule } from './app.module';
-
-////////
-
-import { AppComponent as AppComponent1 } from './app.component.1';
-
-@NgModule({
-  imports: [ CommonModule, AppModule ],
-  declarations: [ AppComponent1 ]
-})
-export class DummyModule1 {}
-
-/////////
-
-import { AppComponent as AppComponent2 } from './app.component.2';
-
-@NgModule({
-  imports: [ CommonModule, AppModule ],
-  declarations: [ AppComponent2 ]
-})
-export class DummyModule2 {}
--- a/aio/content/examples/dependency-injection/src/app/heroes/dummy.module.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/dummy.module.ts
@ -1,35 +0,0 @@
-
-/// Dummy modules to satisfy Angular Language Service
-import { NgModule } from '@angular/core';
-import { CommonModule } from '@angular/common';
-
-////////
-
-import { HeroListComponent as HeroListComponent1 } from './hero-list.component.1';
-
-@NgModule({
-  imports: [ CommonModule ],
-  declarations: [ HeroListComponent1 ],
-  exports: [ HeroListComponent1 ]
-})
-export class DummyModule1 {}
-
-/////////
-
-import { HeroListComponent as HeroListComponent2 } from './hero-list.component.2';
-
-@NgModule({
-  imports: [ CommonModule ],
-  declarations: [ HeroListComponent2 ]
-})
-export class DummyModule2 {}
-
-/////////
-
-import { HeroesComponent as HeroesComponent1 } from './heroes.component.1';
-
-@NgModule({
-  imports: [ CommonModule, DummyModule1 ],
-  declarations: [ HeroesComponent1 ]
-})
-export class DummyModule3 {}
--- a/aio/content/examples/dependency-injection/src/app/heroes/hero-list.component.1.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/hero-list.component.1.ts
@ -1,17 +1,16 @@
 // #docregion
 import { Component }   from '@angular/core';
+
 import { HEROES }      from './mock-heroes';

@Component({
  selector: 'app-hero-list',
  template: `
-    <div *ngFor="let hero of heroes">
-      {{hero.id}} - {{hero.name}}
-    </div>
+  <div *ngFor="let hero of heroes">
+    {{hero.id}} - {{hero.name}}
+  </div>
  `
 })
-// #docregion class
 export class HeroListComponent {
  heroes = HEROES;
 }
-// #enddocregion class
--- a/aio/content/examples/dependency-injection/src/app/heroes/hero-list.component.2.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/hero-list.component.2.ts
@ -1,6 +1,7 @@
 // #docplaster
 // #docregion
 import { Component }   from '@angular/core';
+
 import { Hero }        from './hero';
 // #enddocregion
 import { HeroService } from './hero.service.1';
@ -14,9 +15,9 @@ import { HeroService } from './hero.service';
@Component({
  selector: 'app-hero-list',
  template: `
-    <div *ngFor="let hero of heroes">
-      {{hero.id}} - {{hero.name}}
-    </div>
+  <div *ngFor="let hero of heroes">
+    {{hero.id}} - {{hero.name}}
+  </div>
  `
 })
 export class HeroListComponent {
--- a/aio/content/examples/dependency-injection/src/app/heroes/hero-list.component.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/hero-list.component.ts
@ -1,16 +1,17 @@
 /* tslint:disable:one-line */
 // #docregion
 import { Component }   from '@angular/core';
+
 import { Hero }        from './hero';
 import { HeroService } from './hero.service';

@Component({
  selector: 'app-hero-list',
  template: `
-    <div *ngFor="let hero of heroes">
-      {{hero.id}} - {{hero.name}}
-      ({{hero.isSecret ? 'secret' : 'public'}})
-    </div>
+  <div *ngFor="let hero of heroes">
+    {{hero.id}} - {{hero.name}}
+    ({{hero.isSecret ? 'secret' : 'public'}})
+  </div>
  `,
 })
 export class HeroListComponent {
--- a/aio/content/examples/dependency-injection/src/app/heroes/hero.service.0.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/hero.service.0.ts
@ -1,6 +0,0 @@
-import { Injectable } from '@angular/core';
-
-@Injectable()
-export class HeroService {
-  constructor() { }
-}
--- a/aio/content/examples/dependency-injection/src/app/heroes/hero.service.1.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/hero.service.1.ts
@ -1,5 +1,6 @@
 // #docregion
 import { Injectable } from '@angular/core';
+
 import { HEROES }     from './mock-heroes';

@Injectable()
--- a/aio/content/examples/dependency-injection/src/app/heroes/hero.service.2.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/hero.service.2.ts
@ -1,5 +1,6 @@
 // #docregion
 import { Injectable } from '@angular/core';
+
 import { HEROES }     from './mock-heroes';
 import { Logger }     from '../logger.service';

--- a/aio/content/examples/dependency-injection/src/app/heroes/hero.service.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/hero.service.ts
@ -1,5 +1,6 @@
 // #docregion
 import { Injectable } from '@angular/core';
+
 import { HEROES }     from './mock-heroes';
 import { Logger }     from '../logger.service';

--- a/aio/content/examples/dependency-injection/src/app/heroes/heroes.component.1.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/heroes.component.1.ts
@ -1,18 +1,21 @@
 // #docplaster
-// #docregion, v1
-import { Component } from '@angular/core';
+// #docregion full, v1
+import { Component }          from '@angular/core';
 // #enddocregion v1
-import { HeroService } from './hero.service';

-// #docregion v1
+import { HeroService }        from './hero.service';
+// #enddocregion full
+
+// #docregion full, v1
+
@Component({
  selector: 'app-heroes',
    // #enddocregion v1
-  providers: [ HeroService ],
+  providers: [HeroService],
  // #docregion v1
  template: `
-    <h2>Heroes</h2>
-    <app-hero-list></app-hero-list>
+  <h2>Heroes</h2>
+  <app-hero-list></app-hero-list>
  `
 })
 export class HeroesComponent { }
--- a/aio/content/examples/dependency-injection/src/app/heroes/heroes.component.ts
+++ b/aio/content/examples/dependency-injection/src/app/heroes/heroes.component.ts
@ -1,13 +1,14 @@
 // #docregion
 import { Component }          from '@angular/core';
+
 import { heroServiceProvider } from './hero.service.provider';

@Component({
  selector: 'app-heroes',
-  providers: [ heroServiceProvider ],
  template: `
-    <h2>Heroes</h2>
-    <app-hero-list></app-hero-list>
-  `
+  <h2>Heroes</h2>
+  <app-hero-list></app-hero-list>
+  `,
+  providers: [heroServiceProvider]
 })
 export class HeroesComponent { }
--- a/aio/content/examples/dependency-injection/src/app/providers.component.ts
+++ b/aio/content/examples/dependency-injection/src/app/providers.component.ts
@ -1,21 +1,19 @@
-/*
- * A collection of demo components showing different ways to provide services
- * in @Component metadata
- */
+/* tslint:disable:one-line:check-open-brace*/
+// Examples of provider arrays
+// #docplaster
 import { Component, Inject, Injectable, OnInit } from '@angular/core';

-import {
-  APP_CONFIG,
-  AppConfig,
-  HERO_DI_CONFIG } from './app.config';
+import { APP_CONFIG, AppConfig,
+         HERO_DI_CONFIG }       from './app.config';

-import { HeroService } from './heroes/hero.service';
-import { heroServiceProvider } from './heroes/hero.service.provider';
-import { Logger } from './logger.service';
-import { UserService } from './user.service';
+import { HeroService }          from './heroes/hero.service';
+import { heroServiceProvider }  from './heroes/hero.service.provider';
+import { Logger }               from './logger.service';
+import { UserService }    from './user.service';

-const template = '{{log}}';
+let template = '{{log}}';

+//////////////////////////////////////////
@Component({
  selector: 'provider-1',
  template: template,
@ -32,7 +30,6 @@ export class Provider1Component {
 }

 //////////////////////////////////////////
-
@Component({
  selector: 'provider-3',
  template: template,
@ -50,7 +47,7 @@ export class Provider3Component {
 }

 //////////////////////////////////////////
-export class BetterLogger extends Logger {}
+class BetterLogger extends Logger {}

@Component({
  selector: 'provider-4',
@ -69,10 +66,9 @@ export class Provider4Component {
 }

 //////////////////////////////////////////
-
 // #docregion EvenBetterLogger
@Injectable()
-export class EvenBetterLogger extends Logger {
+class EvenBetterLogger extends Logger {
  constructor(private userService: UserService) { super(); }

  log(message: string) {
@ -100,10 +96,8 @@ export class Provider5Component {
 }

 //////////////////////////////////////////
-
-export class NewLogger extends Logger {}
-
-export class OldLogger {
+class NewLogger extends Logger {}
+class OldLogger {
  logs: string[] = [];
  log(message: string) {
    throw new Error('Should not call the old logger!');
@ -155,14 +149,11 @@ export class Provider6bComponent {
 }

 //////////////////////////////////////////
-
 // #docregion silent-logger
 // An object in the shape of the logger service
-export function SilentLoggerFn() {}
-
-const silentLogger = {
+let silentLogger = {
  logs: ['Silent logger says "Shhhhh!". Provided via "useValue"'],
-  log: SilentLoggerFn
+  log: () => {}
 };
 // #enddocregion silent-logger

@ -181,7 +172,6 @@ export class Provider7Component {
    this.log = logger.logs[0];
  }
 }
-
 /////////////////

@Component({
@ -199,7 +189,6 @@ export class Provider8Component {
 }

 /////////////////
-
@Component({
  selector: 'provider-9',
  template: template,
@ -229,7 +218,6 @@ export class Provider9Component implements OnInit {
     this.log = 'APP_CONFIG Application title is ' + this.config.title;
  }
 }
-
 //////////////////////////////////////////
 // Sample providers 1 to 7 illustrate a required logger dependency.
 // Optional logger, can be null
@ -260,7 +248,6 @@ export class Provider10Component implements OnInit {
 }

 /////////////////
-
@Component({
  selector: 'app-providers',
  template: `
--- a/aio/content/examples/dependency-injection/src/app/providers.module.ts
+++ b/aio/content/examples/dependency-injection/src/app/providers.module.ts
@ -1,33 +0,0 @@
-import { NgModule } from '@angular/core';
-
-import {
-  Provider1Component,
-  Provider3Component,
-  Provider4Component,
-  Provider5Component,
-  Provider6aComponent,
-  Provider6bComponent,
-  Provider7Component,
-  Provider8Component,
-  Provider9Component,
-  Provider10Component,
-  ProvidersComponent,
-} from './providers.component';
-
-@NgModule({
-  declarations: [
-    Provider1Component,
-    Provider3Component,
-    Provider4Component,
-    Provider5Component,
-    Provider6aComponent,
-    Provider6bComponent,
-    Provider7Component,
-    Provider8Component,
-    Provider9Component,
-    Provider10Component,
-    ProvidersComponent,
-  ],
-  exports: [ ProvidersComponent ]
- })
- export class ProvidersModule {}
--- a/aio/content/examples/dependency-injection/src/app/test.component.ts
+++ b/aio/content/examples/dependency-injection/src/app/test.component.ts
@ -2,11 +2,10 @@
 // Simulate a simple test
 // Reader should look to the testing chapter for the real thing

-import { Component } from '@angular/core';
+import { Component }           from '@angular/core';

-import { Hero  } from './heroes/hero';
-import { HeroService } from './heroes/hero.service';
-import { HeroListComponent } from './heroes/hero-list.component';
+import { HeroService }         from './heroes/hero.service';
+import { HeroListComponent }   from './heroes/hero-list.component';

@Component({
  selector: 'app-tests',
@ -23,13 +22,12 @@ export class TestComponent {
 function runTests() {

  // #docregion spec
-  const expectedHeroes = [{name: 'A'}, {name: 'B'}]
-  const mockService = <HeroService> {getHeroes: () => expectedHeroes }
+  let expectedHeroes = [{name: 'A'}, {name: 'B'}]
+  let mockService = <HeroService> {getHeroes: () => expectedHeroes }

  it('should have heroes when HeroListComponent created', () => {
-    // Pass the mock to the constructor as the Angular injector would
-    const component = new HeroListComponent(mockService);
-    expect(component.heroes.length).toEqual(expectedHeroes.length);
+    let hlc = new HeroListComponent(mockService);
+    expect(hlc.heroes.length).toEqual(expectedHeroes.length);
  });
  // #enddocregion spec

--- a/aio/content/examples/displaying-data/stackblitz.json
+++ b/aio/content/examples/displaying-data/stackblitz.json
@ -1,5 +1,6 @@
 {
  "description": "Displaying Data",
+  "basePath": "src/",
  "files": [
    "!**/*.d.ts",
    "!**/*.js",
--- a/aio/content/examples/docs-style-guide/stackblitz.json
+++ b/aio/content/examples/docs-style-guide/stackblitz.json
@ -1,5 +1,6 @@
 {
  "description": "Authors style guide",
+  "basePath": "src/",
  "files": [
    "!**/*.d.ts",
    "!**/*.js",
--- a/aio/content/examples/docs-style-guide/second.plnkr.json
+++ b/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"]
+}
--- a/aio/content/examples/docs-style-guide/second.stackblitz.json
+++ b/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"]
-}
--- a/aio/content/examples/dynamic-component-loader/stackblitz.json
+++ b/aio/content/examples/dynamic-component-loader/stackblitz.json
@ -1,5 +1,6 @@
 {
  "description": "Dynamic Component Loader",
+  "basePath": "src/",
  "files":[
    "!**/*.d.ts",
    "!**/*.js"
--- a/aio/content/examples/dynamic-form/stackblitz.json
+++ b/aio/content/examples/dynamic-form/stackblitz.json
@ -1,5 +1,6 @@
 {
  "description": "Dynamic Form",
+  "basePath": "src/",
  "files":[
    "!**/*.d.ts",
    "!**/*.js",
--- a/aio/content/examples/feature-modules/e2e/app.e2e-spec.ts
+++ b/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!');
-  });
-});
-
-
-
--- a/aio/content/examples/feature-modules/example-config.json
+++ b/aio/content/examples/feature-modules/example-config.json
@ -1,4 +0,0 @@
-{
-  "build": "build:cli",
-  "run": "serve:cli"
-}
--- a/aio/content/examples/feature-modules/src/app/app.component.css
+++ b/aio/content/examples/feature-modules/src/app/app.component.css
--- a/aio/content/examples/feature-modules/src/app/app.component.html
+++ b/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 -->
--- a/aio/content/examples/feature-modules/src/app/app.component.spec.ts
+++ b/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!');
-  }));
-});
--- a/aio/content/examples/feature-modules/src/app/app.component.ts
+++ b/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!';
-}
--- a/aio/content/examples/feature-modules/src/app/app.module.ts
+++ b/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
--- a/aio/content/examples/feature-modules/src/app/customer-dashboard/customer-dashboard.module.ts
+++ b/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
--- a/aio/content/examples/feature-modules/src/app/customer-dashboard/customer-dashboard/customer-dashboard.component.css
+++ b/aio/content/examples/feature-modules/src/app/customer-dashboard/customer-dashboard/customer-dashboard.component.css
--- a/aio/content/examples/feature-modules/src/app/customer-dashboard/customer-dashboard/customer-dashboard.component.html
+++ b/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 -->
--- a/aio/content/examples/feature-modules/src/app/customer-dashboard/customer-dashboard/customer-dashboard.component.spec.ts
+++ b/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();
-  });
-});
--- a/aio/content/examples/feature-modules/src/app/customer-dashboard/customer-dashboard/customer-dashboard.component.ts
+++ b/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() {
-  }
-
-}
--- a/aio/content/examples/feature-modules/src/index.html
+++ b/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>
--- a/aio/content/examples/feature-modules/src/main.ts
+++ b/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);
--- a/aio/content/examples/feature-modules/stackblitz.json
+++ b/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"]
-}
--- a/aio/content/examples/form-validation/e2e/app.e2e-spec.ts
+++ b/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', () => {
--- a/aio/content/examples/form-validation/stackblitz.json
+++ b/aio/content/examples/form-validation/stackblitz.json
@ -1,5 +1,6 @@
 {
  "description": "Validation",
+  "basePath": "src/",
  "files":[
    "!**/*.d.ts",
    "!**/*.js"
--- a/aio/content/examples/form-validation/src/app/shared/forbidden-name.directive.ts
+++ b/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)
--- a/aio/content/examples/form-validation/src/app/template/hero-form-template.component.html
+++ b/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 -->

--- a/aio/content/examples/forms/stackblitz.json
+++ b/aio/content/examples/forms/stackblitz.json
@ -1,5 +1,6 @@
 {
  "description": "Forms",
+  "basePath": "src/",
  "files":[
    "!**/*.d.ts",
    "!**/*.js"
--- a/aio/content/examples/forms/src/app/app.component.css
+++ b/aio/content/examples/forms/src/app/app.component.css
--- a/aio/content/examples/forms/src/app/app.component.html
+++ b/aio/content/examples/forms/src/app/app.component.html
@ -1 +0,0 @@
-<app-hero-form></app-hero-form>
--- a/Show More
+++ b/Show More
 @ -1 +1 @@
 .9
 .9.5