release: cut the v6.0.0-rc.6 release

Revert "refactor(core): tree-shake application_module providers (#23477 )"
This reverts commit ac2b530f4b. The change is breaking targets in g3 see cl/194336387.
2018-04-27 10:47:56 -07:00 · 2018-04-27 07:13:56 -07:00 · 2018-04-25 15:54:41 -07:00 · 2018-04-25 13:21:52 -07:00 · 2018-04-24 15:05:31 -07:00 · 2018-04-24 14:43:34 -07:00
766 changed files with 12616 additions and 33193 deletions
--- a/.circleci/README.md
+++ b/.circleci/README.md
@ -1,19 +0,0 @@
-# Encryption
-
-Based on https://github.com/circleci/encrypted-files
-
-In the CircleCI web UI, we have a secret variable called `KEY`
-https://circleci.com/gh/angular/angular/edit#env-vars
-which is only exposed to non-fork builds
-(see "Pass secrets to builds from forked pull requests" under
-https://circleci.com/gh/angular/angular/edit#advanced-settings)
-
-We use this as a symmetric AES encryption key to encrypt tokens like
-a GitHub token that enables publishing snapshots.
-
-To create the github_token file, we take this approach:
- Find the angular-builds:token in http://valentine
- Go inside the ngcontainer docker image so you use the same version of openssl as we will at runtime: `docker run --rm -it angular/ngcontainer`
- echo "https://[token]:@github.com" > credentials
- openssl aes-256-cbc -e -in credentials -out .circleci/github_token -k $KEY
- If needed, base64-encode the result so you can copy-paste it out of docker: `base64 github_token`
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -12,8 +12,8 @@
 ## IMPORTANT
 # If you change the `docker_image` version, also change the `cache_key` suffix and the version of
 # `com_github_bazelbuild_buildtools` in the `/WORKSPACE` file.
-var_1: &docker_image angular/ngcontainer:0.3.2
-var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.3.2
+var_1: &docker_image angular/ngcontainer:0.2.0
+var_2: &cache_key v2-angular-{{ .Branch }}-{{ checksum "yarn.lock" }}-0.2.0

 # Define common ENV vars
 var_3: &define_env_vars
@ -63,7 +63,7 @@ jobs:
      - run: yarn install --frozen-lockfile --non-interactive
      - run: ./node_modules/.bin/gulp lint

-  test:
+  build:
    <<: *job_defaults
    resource_class: xlarge
    steps:
@ -80,152 +80,37 @@ jobs:

      - run: ls /home/circleci/bazel_repository_cache || true
      - run: bazel info release
-      - run: bazel run @nodejs//:yarn
+      - 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 the slowest build target to finish before running the first test
      # See https://github.com/bazelbuild/bazel/issues/4257
      # NOTE: Angular developers should typically just bazel build //packages/... or bazel test //packages/...
-      - run: bazel query --output=label //... | xargs bazel test --build_tag_filters=-ivy-only --test_tag_filters=-manual,-ivy-only
+      - run: bazel query --output=label //... | xargs bazel test
+
+      # We run the integration tests outside of Bazel for now.
+      # See comments inside this script.
+      - run: xvfb-run --auto-servernum ./integration/run_tests.sh

      # 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.
-      # The destination keys need be format {projectName}/{context}/{fileName} so that the github-robot can process them for size calculations
-      # projectName should remain consistant to group files
-      # context and fileName can be almost anything (within usual URI rules)
-      # There should only be exactly 2 forward slashes in the path
-      # This is so they're backwards compatiable with the existing data we have on bundle sizes
      - store_artifacts:
          path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js
-          destination: core/hello_world/bundle
+          destination: packages/core/test/bundling/hello_world/bundle.min.js
      - store_artifacts:
          path: dist/bin/packages/core/test/bundling/todo/bundle.min.js
-          destination: core/todo/bundle
+          destination: packages/core/test/bundling/todo/bundle.min.js
      - store_artifacts:
-          path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js.br
-          destination: core/hello_world/bundle.br
+          path: dist/bin/packages/core/test/bundling/hello_world/bundle.min.js.brotli
+          destination: packages/core/test/bundling/hello_world/bundle.min.js.brotli
      - store_artifacts:
-          path: dist/bin/packages/core/test/bundling/todo/bundle.min.js.br
-          destination: core/todo/bundle.br
+          path: dist/bin/packages/core/test/bundling/todo/bundle.min.js.brotli
+          destination: packages/core/test/bundling/todo/bundle.min.js.brotli
+
      - save_cache:
          key: *cache_key
          paths:
            - "node_modules"
            - "~/bazel_repository_cache"
-  # Temporary job to test what will happen when we flip the Ivy flag to true
-  test_ivy_jit:
-    <<: *job_defaults
-    resource_class: xlarge
-    steps:
-      - *define_env_vars
-      - checkout:
-          <<: *post_checkout
-      # See remote cache documentation in /docs/BAZEL.md
-      - run: .circleci/setup_cache.sh
-      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - *setup-bazel-remote-cache
-
-      - restore_cache:
-          key: *cache_key
-
-      - run: bazel run @yarn//:yarn
-      - run: bazel query --output=label //... | xargs bazel test --define=compile=jit --build_tag_filters=ivy-jit --test_tag_filters=-manual,ivy-jit
-
-  test_ivy_aot:
-    <<: *job_defaults
-    resource_class: xlarge
-    steps:
-      - *define_env_vars
-      - checkout:
-          <<: *post_checkout
-      # See remote cache documentation in /docs/BAZEL.md
-      - run: .circleci/setup_cache.sh
-      - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
-      - *setup-bazel-remote-cache
-
-      - restore_cache:
-          key: *cache_key
-
-      - run: bazel run @yarn//:yarn
-      - run: bazel query --output=label //... | xargs bazel test --define=compile=local --build_tag_filters=ivy-local --test_tag_filters=-manual,ivy-local
-
-  # This job exists only for backwards-compatibility with old scripts and tests
-  # that rely on the pre-Bazel dist/packages-dist layout.
-  # It duplicates some work with the job above: we build the bazel packages
-  # twice. Even though we have a remote cache, these jobs will typically run in
-  # parallel so up-to-date outputs will not be available at the time the build
-  # starts.
-  # No new jobs should depend on this one.
-  build-packages-dist:
-    <<: *job_defaults
-    resource_class: xlarge
-    steps:
-      - *define_env_vars
-      - 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: bazel run @nodejs//:yarn
-      - run: scripts/build-packages-dist.sh
-
-      # Save the npm packages from //packages/... for other workflow jobs to read
-      # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
-      - persist_to_workspace:
-          root: dist
-          paths:
-            - packages-dist
-            - packages-dist-ivy-jit
-            - packages-dist-ivy-local
-
-  # We run the integration tests outside of Bazel for now.
-  # They are a separate workflow job so that they can be easily re-run.
-  # When the tests are ported to bazel test targets, they should move to the "test"
-  # job above, as part of the bazel test command. That has flaky_test_attempts so the
-  # need to re-run manually should be alleviated.
-  # See comments inside the integration/run_tests.sh script.
-  integration_test:
-    <<: *job_defaults
-    # Note: we run Bazel in one of the integration tests, and it can consume >2G
-    # of memory. Together with the system under test, this can exhaust the RAM
-    # on a 4G worker so we use a larger machine here too.
-    resource_class: xlarge
-    steps:
-      - *define_env_vars
-      - checkout:
-          <<: *post_checkout
-      - attach_workspace:
-          at: dist
-      - run: xvfb-run --auto-servernum ./integration/run_tests.sh
-
-  # This job updates the content of repos like github.com/angular/core-builds
-  # for every green build on angular/angular.
-  publish_snapshot:
-    <<: *job_defaults
-    steps:
-      # See below - ideally this job should not trigger for non-upstream builds.
-      # But since it does, we have to check this condition.
-      - run:
-          name: Skip this job for Pull Requests and Fork builds
-          # Note, `|| true` on the end makes this step always exit 0
-          command: '[[
-              -v CIRCLE_PR_NUMBER
-              || "$CIRCLE_PROJECT_USERNAME" != "angular"
-              || "$CIRCLE_PROJECT_REPONAME" != "angular"
-          ]] && circleci step halt || true'
-      - checkout:
-          <<: *post_checkout
-      - attach_workspace:
-          at: dist
-      # CircleCI has a config setting to force SSH for all github connections
-      # This is not compatible with our mechanism of using a Personal Access Token
-      # Clear the global setting
-      - run: git config --global --unset "url.ssh://git@github.com.insteadof"
-      - run:
-          name: Decrypt github credentials
-          command: 'openssl aes-256-cbc -d -in .circleci/github_token -k "${KEY}" -out ~/.git_credentials'
-      - run: ./scripts/ci/publish-build-artifacts.sh

  aio_monitoring:
    <<: *job_defaults
@ -241,28 +126,7 @@ workflows:
  default_workflow:
    jobs:
      - lint
-      - test
-      - test_ivy_jit
-      - test_ivy_aot
-      - build-packages-dist
-      - integration_test:
-          requires:
-            - build-packages-dist
-      - publish_snapshot:
-          # Note: no filters on this job because we want it to run for all upstream branches
-          # We'd really like to filter out pull requests here, but not yet available:
-          # https://discuss.circleci.com/t/workflows-pull-request-filter/14396/4
-          # Instead, the job just exits immediately at the first step.
-          requires:
-            # Only publish if tests and integration tests pass
-            - test
-            - test_ivy_jit
-            - test_ivy_aot
-            - integration_test
-            # Get the artifacts to publish from the build-packages-dist job
-            # since the publishing script expects the legacy outputs layout.
-            - build-packages-dist
-
+      - build
  aio_monitoring:
    jobs:
      - aio_monitoring
--- a/.circleci/github_token
+++ b/.circleci/github_token
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@ -1,14 +1,5 @@
 # Configuration for angular-robot

-#options for the size plugin
-size:
-  disabled: false
-  maxSizeIncrease: 1000
-  circleCiStatusName: "ci/circleci: build-packages-dist"
-  status:
-    disabled: false
-    context: "ci/angular: size"
-
 # options for the merge plugin
 merge:
  # the status will be added to your pull requests
@ -45,12 +36,10 @@ merge:
      - "packages/language-service/**"
      - "**/.gitignore"
      - "**/.gitkeep"
-      - "**/package.json"
      - "**/tsconfig-build.json"
      - "**/tsconfig.json"
      - "**/rollup.config.js"
      - "**/BUILD.bazel"
-      - "packages/**/integrationtest/**"
      - "packages/**/test/**"

  # comment that will be added to a PR when there is a conflict, leave empty or set to false to disable
--- a/.pullapprove.yml
+++ b/.pullapprove.yml
@ -8,8 +8,8 @@
 # alexeagle - Alex Eagle
 # alxhub - Alex Rickabaugh
 # andrewseguin - Andrew Seguin
-# brandonroberts - Brandon Roberts
 # brocco - Mike Brocchi
+# chuckjaz - Chuck Jazdzewski
 # filipesilva - Filipe Silva
 # gkalpak - George Kalpakas
 # hansl - Hans Larsen
@ -17,7 +17,6 @@
 # jasonaden - Jason Aden
 # kapunahelewong - Kapunahele Wong
 # kara - Kara Erickson
-# kyliau - Keen Yee Liau
 # matsko - Matias Niemelä
 # mhevery - Misko Hevery
 # petebacondarwin - Pete Bacon Darwin
@ -94,7 +93,7 @@ groups:
          - "tools/bazel.rc"
    users:
      - alexeagle #primary
-      - kyliau
+      - chuckjaz
      - IgorMinar #fallback
      - mhevery
      - vikerman #fallback
@ -133,7 +132,7 @@ groups:
        - "packages/core/*"
    users:
      - mhevery #primary
-      - jasonaden
+      - chuckjaz
      - kara
      - vicb
      - IgorMinar #fallback
@ -163,7 +162,7 @@ groups:
      files:
        - "packages/compiler/*"
    users:
-      - alxhub #primary
+      - chuckjaz #primary
      - vicb
      - mhevery
      - IgorMinar #fallback
@ -237,7 +236,7 @@ groups:
      files:
        - "packages/language-service/*"
    users:
-      - kyliau #primary
+      - chuckjaz #primary
      # needs secondary
      - vicb
      - IgorMinar #fallback
@ -353,7 +352,6 @@ groups:
      - petebacondarwin
      - gkalpak
      - IgorMinar
-      - brandonroberts
      - mhevery #fallback

  angular.io-marketing:
--- a/BUILD.bazel
+++ b/BUILD.bazel
@ -11,7 +11,7 @@ exports_files([
 # This ensures that package.json in subdirectories get installed as well.
 alias(
    name = "install",
-    actual = "@nodejs//:yarn",
+    actual = "@yarn//:yarn",
 )

 node_modules_filegroup(
@ -44,16 +44,14 @@ filegroup(
        "//:node_modules/zone.js/dist/zone.js",
        "//:node_modules/zone.js/dist/zone-testing.js",
        "//:node_modules/zone.js/dist/task-tracking.js",
-        "//:test-events.js",
    ],
 )

 filegroup(
-    name = "angularjs_scripts",
+    name = "angularjs",
+    # do not sort
    srcs = [
-        "//:node_modules/angular-1.5/angular.js",
-        "//:node_modules/angular-mocks-1.5/angular-mocks.js",
-        "//:node_modules/angular-mocks/angular-mocks.js",
        "//:node_modules/angular/angular.js",
+        "//:node_modules/angular-mocks/angular-mocks.js",
    ],
 )
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,363 +1,13 @@
-<a name="6.1.0-beta.1"></a>
-# [6.1.0-beta.1](https://github.com/angular/angular/compare/6.1.0-beta.0...6.1.0-beta.1) (2018-06-13)
+<a name="6.0.0-rc.6"></a>
+# [6.0.0-rc.6](https://github.com/angular/angular/compare/6.0.0-rc.5...6.0.0-rc.6) (2018-04-27)


 ### Bug Fixes

-* **animations:** always render end-state styles for orphaned DOM nodes ([#24236](https://github.com/angular/angular/issues/24236)) ([dc4a3d0](https://github.com/angular/angular/commit/dc4a3d0))
-* **bazel:** Allow ng_module to depend on targets w no deps ([#24446](https://github.com/angular/angular/issues/24446)) ([282d351](https://github.com/angular/angular/commit/282d351))
-* **docs-infra:** use script nomodule to load IE polyfills, skip other polyfills ([#24317](https://github.com/angular/angular/issues/24317)) ([8be6892](https://github.com/angular/angular/commit/8be6892)), closes [#23647](https://github.com/angular/angular/issues/23647)
-* **ivy:** compute transitive scopes from NgModuleDef only ([#24334](https://github.com/angular/angular/issues/24334)) ([1135563](https://github.com/angular/angular/commit/1135563))
-* **ivy:** correctly handle queries with embedded views ([#24418](https://github.com/angular/angular/issues/24418)) ([014949f](https://github.com/angular/angular/commit/014949f))
-* **ivy:** remove debugger statement ([#24480](https://github.com/angular/angular/issues/24480)) ([70ef061](https://github.com/angular/angular/commit/70ef061))
-* **ivy:** special case [style] and [class] bindings for future use ([#23232](https://github.com/angular/angular/issues/23232)) ([1b253e1](https://github.com/angular/angular/commit/1b253e1))
-* **router:** fix lazy loading of aux routes ([#23459](https://github.com/angular/angular/issues/23459)) ([5731d07](https://github.com/angular/angular/commit/5731d07)), closes [#10981](https://github.com/angular/angular/issues/10981)
-* **service-worker:** fix `SwPush.unsubscribe()` ([#24162](https://github.com/angular/angular/issues/24162)) ([3ed2d75](https://github.com/angular/angular/commit/3ed2d75)), closes [#24095](https://github.com/angular/angular/issues/24095)
-
-
-### Features
-
-* **common:** introduce KeyValuePipe ([#24319](https://github.com/angular/angular/issues/24319)) ([2b49bf7](https://github.com/angular/angular/commit/2b49bf7))
-* **core:** export defaultKeyValueDiffers to private api ([#24319](https://github.com/angular/angular/issues/24319)) ([92b278c](https://github.com/angular/angular/commit/92b278c))
-* **core:** expose a Compiler API for accessing module ids from NgModule types ([#24258](https://github.com/angular/angular/issues/24258)) ([bd02b27](https://github.com/angular/angular/commit/bd02b27))
-* **core:** KeyValueDiffer#diff allows null values ([#24319](https://github.com/angular/angular/issues/24319)) ([52ce9d5](https://github.com/angular/angular/commit/52ce9d5))
-* **ivy:** a generic visitor which allows prefixing nodes for ngtsc ([#24230](https://github.com/angular/angular/issues/24230)) ([ca79e11](https://github.com/angular/angular/commit/ca79e11))
-* **ivy:** add support of ApplicationRef.bootstrapModuleFactory ([#23811](https://github.com/angular/angular/issues/23811)) ([e3759f7](https://github.com/angular/angular/commit/e3759f7))
-* **ivy:** namespaced attributes added to output instructions ([#24386](https://github.com/angular/angular/issues/24386)) ([82c5313](https://github.com/angular/angular/commit/82c5313))
-* **ivy:** now supports SVG and MathML elements ([#24377](https://github.com/angular/angular/issues/24377)) ([8c1ac28](https://github.com/angular/angular/commit/8c1ac28))
-* **router:** implement scrolling restoration service ([#20030](https://github.com/angular/angular/issues/20030)) ([49c5234](https://github.com/angular/angular/commit/49c5234)), closes [#13636](https://github.com/angular/angular/issues/13636) [#10929](https://github.com/angular/angular/issues/10929) [#7791](https://github.com/angular/angular/issues/7791) [#6595](https://github.com/angular/angular/issues/6595)
-
-
-
-<a name="6.0.5"></a>
-## [6.0.5](https://github.com/angular/angular/compare/6.0.4...6.0.5) (2018-06-13)
-
-* **animations:** always render end-state styles for orphaned DOM nodes ([#24236](https://github.com/angular/angular/issues/24236)) ([0139173](https://github.com/angular/angular/commit/0139173))
-* **bazel:** Allow ng_module to depend on targets w no deps ([#24446](https://github.com/angular/angular/issues/24446)) ([ea3669e](https://github.com/angular/angular/commit/ea3669e))
-* **docs-infra:** use script nomodule to load IE polyfills, skip other polyfills ([#24317](https://github.com/angular/angular/issues/24317)) ([e876535](https://github.com/angular/angular/commit/e876535)), closes [#23647](https://github.com/angular/angular/issues/23647)
-* **router:** fix lazy loading of aux routes ([#23459](https://github.com/angular/angular/issues/23459)) ([d20877b](https://github.com/angular/angular/commit/d20877b)), closes [#10981](https://github.com/angular/angular/issues/10981)
-* **service-worker:** fix `SwPush.unsubscribe()` ([#24162](https://github.com/angular/angular/issues/24162)) ([ea2987c](https://github.com/angular/angular/commit/ea2987c)), closes [#24095](https://github.com/angular/angular/issues/24095)
-
-
-
-<a name="6.1.0-beta.0"></a>
-## [6.1.0-beta.0](https://github.com/angular/angular/compare/6.0.0-rc.5...6.1.0-beta.0) (2018-06-06)
-
-
-### Bug Fixes
-
-* **animations:** do not throw errors when a destroyed component is animated ([#23836](https://github.com/angular/angular/issues/23836)) ([d2a8687](https://github.com/angular/angular/commit/d2a8687))
-* **animations:** Fix browser detection logic ([#24188](https://github.com/angular/angular/issues/24188)) ([b492b9e](https://github.com/angular/angular/commit/b492b9e))
-* **animations:** properly clean up queried element styles in safari/edge ([#23633](https://github.com/angular/angular/issues/23633)) ([da9ff25](https://github.com/angular/angular/commit/da9ff25))
-* **animations:** retain state styling for nodes that are moved around ([#23534](https://github.com/angular/angular/issues/23534)) ([65211f4](https://github.com/angular/angular/commit/65211f4))
-* **animations:** retain trigger-state for nodes that are moved around ([#24238](https://github.com/angular/angular/issues/24238)) ([8db928d](https://github.com/angular/angular/commit/8db928d))
-* **benchpress:** Fix promise chain in chrome_driver_extension. ([#23458](https://github.com/angular/angular/issues/23458)) ([d4b6c41](https://github.com/angular/angular/commit/d4b6c41))
-* **compiler:** avoid a crash in ngc-wrapped. ([#23468](https://github.com/angular/angular/issues/23468)) ([e1c4930](https://github.com/angular/angular/commit/e1c4930))
-* **compiler:** generate constant array for i18n attributes ([#23837](https://github.com/angular/angular/issues/23837)) ([cfde36d](https://github.com/angular/angular/commit/cfde36d))
-* **compiler:** generate core-compliant hostBindings property ([#24087](https://github.com/angular/angular/issues/24087)) ([01b5acd](https://github.com/angular/angular/commit/01b5acd)), closes [#24013](https://github.com/angular/angular/issues/24013)
-* **compiler:** handle undefined annotation metadata ([#23349](https://github.com/angular/angular/issues/23349)) ([ca776c5](https://github.com/angular/angular/commit/ca776c5))
-* **compiler-cli:** don't rely on incompatible TS method ([#23550](https://github.com/angular/angular/issues/23550)) ([b1f040f](https://github.com/angular/angular/commit/b1f040f))
-* **core:** avoid eager providers re-initialization ([#23559](https://github.com/angular/angular/issues/23559)) ([0c6dc45](https://github.com/angular/angular/commit/0c6dc45))
-* **core:** call ngOnDestroy on all services that have it ([#23755](https://github.com/angular/angular/issues/23755)) ([fc03427](https://github.com/angular/angular/commit/fc03427)), closes [#22466](https://github.com/angular/angular/issues/22466) [#22240](https://github.com/angular/angular/issues/22240) [#14818](https://github.com/angular/angular/issues/14818)
-* **elements:** always check to create strategy ([#23825](https://github.com/angular/angular/issues/23825)) ([b1cda36](https://github.com/angular/angular/commit/b1cda36))
-* **elements:** prevent closure renaming of platform properties ([#23843](https://github.com/angular/angular/issues/23843)) ([d4b8b24](https://github.com/angular/angular/commit/d4b8b24))
-* **forms:** properly handle special properties in FormGroup.get ([#22249](https://github.com/angular/angular/issues/22249)) ([9367e91](https://github.com/angular/angular/commit/9367e91)), closes [#17195](https://github.com/angular/angular/issues/17195)
-* **platform-server:** avoid clash between server and client style encapsulation attributes ([#24158](https://github.com/angular/angular/issues/24158)) ([b96a3c8](https://github.com/angular/angular/commit/b96a3c8))
-* **platform-server:** avoid dependency cycle when using http interceptor ([#24229](https://github.com/angular/angular/issues/24229)) ([60aa943](https://github.com/angular/angular/commit/60aa943)), closes [#23023](https://github.com/angular/angular/issues/23023)
-* **platform-server:** don't reflect innerHTML property to attibute ([#24213](https://github.com/angular/angular/issues/24213)) ([6a663a4](https://github.com/angular/angular/commit/6a663a4)), closes [#19278](https://github.com/angular/angular/issues/19278)
-* **platform-server:** provide Domino DOM types globally ([#24116](https://github.com/angular/angular/issues/24116)) ([c73196e](https://github.com/angular/angular/commit/c73196e)), closes [#23280](https://github.com/angular/angular/issues/23280) [#23133](https://github.com/angular/angular/issues/23133)
-* **router:** avoid freezing queryParams in-place ([#22663](https://github.com/angular/angular/issues/22663)) ([89f64e5](https://github.com/angular/angular/commit/89f64e5)), closes [#22617](https://github.com/angular/angular/issues/22617)
-* **router:** cache route handle if found ([#22475](https://github.com/angular/angular/issues/22475)) ([4cfa571](https://github.com/angular/angular/commit/4cfa571)), closes [#22474](https://github.com/angular/angular/issues/22474)
-* **router:** correct the segment parsing so it won't break on ampersand ([#23684](https://github.com/angular/angular/issues/23684)) ([553a680](https://github.com/angular/angular/commit/553a680))
-* **service-worker:** add badge to NOTIFICATION_OPTION_NAMES ([#23241](https://github.com/angular/angular/issues/23241)) ([fb59b2d](https://github.com/angular/angular/commit/fb59b2d)), closes [#23196](https://github.com/angular/angular/issues/23196)
-* **service-worker:** check platformBrowser before accessing navigator.serviceWorker ([#21231](https://github.com/angular/angular/issues/21231)) ([0bdd30e](https://github.com/angular/angular/commit/0bdd30e))
-* **service-worker:** correctly handle requests with empty `clientId` ([#23625](https://github.com/angular/angular/issues/23625)) ([e0ed59e](https://github.com/angular/angular/commit/e0ed59e)), closes [#23526](https://github.com/angular/angular/issues/23526)
-* **service-worker:** deprecate `versionedFiles` in asset-group resources ([#23584](https://github.com/angular/angular/issues/23584)) ([1d378e2](https://github.com/angular/angular/commit/1d378e2))
-
-
-### Features
-
-* **compiler:** support `// ...` and `// TODO` in mock compiler expectations ([#23441](https://github.com/angular/angular/issues/23441)) ([c6b206e](https://github.com/angular/angular/commit/c6b206e))
-* **compiler-cli:** update `tsickle` to `0.29.x` ([#24233](https://github.com/angular/angular/issues/24233)) ([f69ac67](https://github.com/angular/angular/commit/f69ac67))
-* **platform-browser:** add HammerJS lazy-loader symbols to public API ([#23943](https://github.com/angular/angular/issues/23943)) ([26fbf1d](https://github.com/angular/angular/commit/26fbf1d))
-* **platform-browser:** allow lazy-loading HammerJS ([#23906](https://github.com/angular/angular/issues/23906)) ([313bdce](https://github.com/angular/angular/commit/313bdce))
-* **platform-server:** use EventManagerPlugin on the server ([#24132](https://github.com/angular/angular/issues/24132)) ([d6595eb](https://github.com/angular/angular/commit/d6595eb))
-* **router:** add navigation execution context info to activation hooks ([#24204](https://github.com/angular/angular/issues/24204)) ([20c463e](https://github.com/angular/angular/commit/20c463e)), closes [#24202](https://github.com/angular/angular/issues/24202)
-
-
-<a name="6.0.4"></a>
-## [6.0.4](https://github.com/angular/angular/compare/6.0.3...6.0.4) (2018-06-06)
-
-
-### Bug Fixes
-
-* **animations:** Fix browser detection logic ([#24188](https://github.com/angular/angular/issues/24188)) ([c9eb491](https://github.com/angular/angular/commit/c9eb491))
-* **animations:** retain trigger-state for nodes that are moved around ([#24238](https://github.com/angular/angular/issues/24238)) ([19deca1](https://github.com/angular/angular/commit/19deca1))
-* **forms:** properly handle special properties in FormGroup.get ([#22249](https://github.com/angular/angular/issues/22249)) ([dc3e8aa](https://github.com/angular/angular/commit/dc3e8aa)), closes [#17195](https://github.com/angular/angular/issues/17195)
-* **platform-server:** avoid clash between server and client style encapsulation attributes ([#24158](https://github.com/angular/angular/issues/24158)) ([e9f2203](https://github.com/angular/angular/commit/e9f2203))
-* **platform-server:** avoid dependency cycle when using http interceptor ([#24229](https://github.com/angular/angular/issues/24229)) ([2991b1b](https://github.com/angular/angular/commit/2991b1b)), closes [#23023](https://github.com/angular/angular/issues/23023)
-* **platform-server:** don't reflect innerHTML property to attibute ([#24213](https://github.com/angular/angular/issues/24213)) ([c17098d](https://github.com/angular/angular/commit/c17098d)), closes [#19278](https://github.com/angular/angular/issues/19278)
-* **platform-server:** provide Domino DOM types globally ([#24116](https://github.com/angular/angular/issues/24116)) ([906b3ec](https://github.com/angular/angular/commit/906b3ec)), closes [#23280](https://github.com/angular/angular/issues/23280) [#23133](https://github.com/angular/angular/issues/23133)
-
-
-<a name="6.0.3"></a>
-## [6.0.3](https://github.com/angular/angular/compare/6.0.2...6.0.3) (2018-05-22)
-
-
-### Bug Fixes
-
-* **service-worker:** check platformBrowser before accessing navigator.serviceWorker ([#21231](https://github.com/angular/angular/issues/21231)) ([0ee5b7e](https://github.com/angular/angular/commit/0ee5b7e))
-
-
-
-<a name="6.0.2"></a>
-## [6.0.2](https://github.com/angular/angular/compare/6.0.1...6.0.2) (2018-05-15)
-
-
-### Bug Fixes
-
-* **animations:** do not throw errors when a destroyed component is animated ([#23836](https://github.com/angular/angular/issues/23836)) ([752b83a](https://github.com/angular/angular/commit/752b83a))
-* **service-worker:** deprecate `versionedFiles` in asset-group resources ([#23584](https://github.com/angular/angular/issues/23584)) ([c6b618d](https://github.com/angular/angular/commit/c6b618d))
-
-
-
-<a name="6.0.1"></a>
-# [6.0.1](https://github.com/angular/angular/compare/6.0.0...6.0.1) (2018-05-11)
-
-
-### Bug Fixes
-
-* **animations:** properly clean up queried element styles in safari/edge ([#23686](https://github.com/angular/angular/issues/23686)) ([3824e3f](https://github.com/angular/angular/commit/3824e3f))
-* **animations:** retain state styling for nodes that are moved around ([#23686](https://github.com/angular/angular/issues/23686)) ([05aa5e0](https://github.com/angular/angular/commit/05aa5e0))
-* **core:** call ngOnDestroy on all services that have it ([#23755](https://github.com/angular/angular/issues/23755)) ([5581e97](https://github.com/angular/angular/commit/5581e97)), closes [#22466](https://github.com/angular/angular/issues/22466) [#22240](https://github.com/angular/angular/issues/22240) [#14818](https://github.com/angular/angular/issues/14818)
-* **elements:** always check to create strategy ([#23825](https://github.com/angular/angular/issues/23825)) ([d280077](https://github.com/angular/angular/commit/d280077))
-* **router:** avoid freezing queryParams in-place ([#22663](https://github.com/angular/angular/issues/22663)) ([3d8799b](https://github.com/angular/angular/commit/3d8799b)), closes [#22617](https://github.com/angular/angular/issues/22617)
-* **router:** correct the segment parsing so it won't break on ampersand ([#23684](https://github.com/angular/angular/issues/23684)) ([8733843](https://github.com/angular/angular/commit/8733843))
-* **service-worker:** correctly handle requests with empty `clientId` ([#23625](https://github.com/angular/angular/issues/23625)) ([2254ac2](https://github.com/angular/angular/commit/2254ac2)), closes [#23526](https://github.com/angular/angular/issues/23526)
-
-
-
-<a name="6.0.0"></a>
-# [6.0.0](https://github.com/angular/angular/compare/6.0.0-beta.0...6.0.0) (2018-05-03)
-
-### Release Highlights & Update instructions
-
-Angular v6 is the first release of Angular that unifies the Framework, Material and CLI.
-
-To learn about the release highlights and our new CLI-powered update workflow for your projects please check out the [v6 release announcement](https://blog.angular.io/version-6-0-0-of-angular-now-available-cc56b0efa7a4).
-
-
-
-### Dependency updates
-
-* @angular/core now depends on
-  * TypeScript 2.7
-  * RxJS 6.0.0
-  * tslib 1.9.0
-* @angular/platform-server now depends on Domino 2.0
-
-
-
-### Small Features
-
-* **animations:** only use the WA-polyfill alongside AnimationBuilder ([#22143](https://github.com/angular/angular/issues/22143)) ([b2f366b](https://github.com/angular/angular/commit/b2f366b)), closes [#17496](https://github.com/angular/angular/issues/17496)
-* **animations:** expose `element` and `params` within transition matchers ([#22693](https://github.com/angular/angular/issues/22693)) ([58b94e6](https://github.com/angular/angular/commit/58b94e6))
-* **common:** better error message when non-template element used in NgIf ([#22274](https://github.com/angular/angular/issues/22274)) ([67cf11d](https://github.com/angular/angular/commit/67cf11d)), closes [#16410](https://github.com/angular/angular/issues/16410)
-* **common:** better error message when non-template element used in NgIf ([#22274](https://github.com/angular/angular/issues/22274)) ([67cf11d](https://github.com/angular/angular/commit/67cf11d)), closes [#16410](https://github.com/angular/angular/issues/16410)
-* **common:** export functions to format numbers, percents, currencies & dates ([#22423](https://github.com/angular/angular/issues/22423)) ([4180912](https://github.com/angular/angular/commit/4180912)), closes [#20536](https://github.com/angular/angular/issues/20536)
-* **compiler:** lower @NgModule ids if needed ([#23031](https://github.com/angular/angular/issues/23031)) ([bd024c0](https://github.com/angular/angular/commit/bd024c0))
-* **compiler:** implement "enableIvy" compiler option ([#21427](https://github.com/angular/angular/issues/21427)) ([64d16de](https://github.com/angular/angular/commit/64d16de))
-* **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))
-* **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:** support for singleline, multiline & jsdoc comments ([#22715](https://github.com/angular/angular/issues/22715)) ([3b167be](https://github.com/angular/angular/commit/3b167be))
-* **compiler-cli:** lower loadChildren fields to allow dynamic module paths ([#23088](https://github.com/angular/angular/issues/23088)) ([550433a](https://github.com/angular/angular/commit/550433a))
-* **compiler-cli:** check unvalidated combination of ngc and TypeScript ([#22293](https://github.com/angular/angular/issues/22293)) ([3ceee99](https://github.com/angular/angular/commit/3ceee99)), closes [#20669](https://github.com/angular/angular/issues/20669)
-* **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))
-* **compiler-cli:** Check unvalidated combination of ngc and TypeScript ([#22293](https://github.com/angular/angular/issues/22293)) ([3ceee99](https://github.com/angular/angular/commit/3ceee99)), closes [#20669](https://github.com/angular/angular/issues/20669)
-* **compiler-cli:** add resource inlining to ngc ([#22615](https://github.com/angular/angular/issues/22615)) ([b5be18f](https://github.com/angular/angular/commit/b5be18f))
-* **compiler-cli:** require node 8 as runtime engine ([#22669](https://github.com/angular/angular/issues/22669)) ([c602563](https://github.com/angular/angular/commit/c602563))
-* **core:** add binding name to content changed error ([#20352](https://github.com/angular/angular/issues/20352)) ([d3bf54b](https://github.com/angular/angular/commit/d3bf54b))
-* **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)
-* **core:** set `preserveWhitespaces` to false by default ([#22046](https://github.com/angular/angular/issues/22046)) ([f1a0632](https://github.com/angular/angular/commit/f1a0632)), closes [#22027](https://github.com/angular/angular/issues/22027)
-* **core:** support metadata reflection for native class types ([#22356](https://github.com/angular/angular/issues/22356)) ([5c89d6b](https://github.com/angular/angular/commit/5c89d6b)), closes [#21731](https://github.com/angular/angular/issues/21731)
-* **core:** change @Injectable() to support tree-shakeable tokens ([#22005](https://github.com/angular/angular/issues/22005)) ([235a235](https://github.com/angular/angular/commit/235a235))
-* **core:** support metadata reflection for native class types ([#22356](https://github.com/angular/angular/issues/22356)) ([b7544cc](https://github.com/angular/angular/commit/b7544cc)), closes [#21731](https://github.com/angular/angular/issues/21731)
-* **core:** allow direct scoping of @Injectables to the root injector ([#22185](https://github.com/angular/angular/issues/22185)) ([7ac34e4](https://github.com/angular/angular/commit/7ac34e4))
-* **core:** add task tracking to Testability ([#16863](https://github.com/angular/angular/issues/16863)) ([37fedd0](https://github.com/angular/angular/commit/37fedd0))
-* **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))
-* **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)
-* **forms:** allow markAsPending to emit events ([#20212](https://github.com/angular/angular/issues/20212)) ([e86b64b](https://github.com/angular/angular/commit/e86b64b)), closes [#17958](https://github.com/angular/angular/issues/17958)
-* **platform-browser:** add token marking which the type of animation module nearest in the injector tree ([#23075](https://github.com/angular/angular/issues/23075)) ([b551f84](https://github.com/angular/angular/commit/b551f84))
-* **platform-browser:** do not throw error when Hammer.js not loaded ([#22257](https://github.com/angular/angular/issues/22257)) ([991300b](https://github.com/angular/angular/commit/991300b)), closes [#16992](https://github.com/angular/angular/issues/16992)
-* **platform-browser:** fix [#19604](https://github.com/angular/angular/issues/19604), can config hammerOptions ([#21979](https://github.com/angular/angular/issues/21979)) ([1d571b2](https://github.com/angular/angular/commit/1d571b2))
-* **platform-server:** bump Domino to v2.0 ([#22411](https://github.com/angular/angular/issues/22411)) ([d3827a0](https://github.com/angular/angular/commit/d3827a0))
-* **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 support for configuring navigations URLs ([#23339](https://github.com/angular/angular/issues/23339)) ([08325aa](https://github.com/angular/angular/commit/08325aa)), closes [#20404](https://github.com/angular/angular/issues/20404)
-* **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))
-
-
-
-
-### Bug Fixes
-
-* **animations:** report correct totalTime value even during noOp animations ([#22225](https://github.com/angular/angular/issues/22225)) ([e1bf067](https://github.com/angular/angular/commit/e1bf067))
-* **animations:** avoid animation insertions during router back/refresh ([#21977](https://github.com/angular/angular/issues/21977)) ([f88fba0](https://github.com/angular/angular/commit/f88fba0)), closes [#19712](https://github.com/angular/angular/issues/19712)
-* **animations:** treat numeric state name values as strings ([#22923](https://github.com/angular/angular/issues/22923)) ([e5e1b0d](https://github.com/angular/angular/commit/e5e1b0d))
-* **animations:** report correct totalTime value even during noOp animations ([#22225](https://github.com/angular/angular/issues/22225)) ([e1bf067](https://github.com/angular/angular/commit/e1bf067))
-* **animations:** fix increment/decrement aliases example ([#18323](https://github.com/angular/angular/issues/18323)) ([d2aa8ac](https://github.com/angular/angular/commit/d2aa8ac))
-* **common:** NgClass should properly take className changes into account ([#21937](https://github.com/angular/angular/issues/21937)) ([4a42669](https://github.com/angular/angular/commit/4a42669)), closes [#21932](https://github.com/angular/angular/issues/21932)
-* **common:** fix the titlecase pipe ([#22600](https://github.com/angular/angular/issues/22600)) ([7966744](https://github.com/angular/angular/commit/7966744))
-* **common:** add locale currency values ([#21783](https://github.com/angular/angular/issues/21783)) ([420cc7a](https://github.com/angular/angular/commit/420cc7a)), closes [#20385](https://github.com/angular/angular/issues/20385)
-* **common:** round currencies based on decimal digits in `CurrencyPipe` ([#21783](https://github.com/angular/angular/issues/21783)) ([44154e7](https://github.com/angular/angular/commit/44154e7)), closes [#10189](https://github.com/angular/angular/issues/10189)
-* **common:** weaken AsyncPipe transform signature ([#22169](https://github.com/angular/angular/issues/22169)) ([be59c3a](https://github.com/angular/angular/commit/be59c3a))
-* **common:** http testing library should not 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)
-* **common:** correct mapping of Observable methods ([#20518](https://github.com/angular/angular/issues/20518)) ([2639b4b](https://github.com/angular/angular/commit/2639b4b)), closes [#20516](https://github.com/angular/angular/issues/20516)
-* **common:** then and else template might be set to null ([#22298](https://github.com/angular/angular/issues/22298)) ([8115edc](https://github.com/angular/angular/commit/8115edc))
-* **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)
-* **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)
-* **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:** 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:** avoid a crash in ngc-wrapped. ([#23468](https://github.com/angular/angular/issues/23468)) ([0bc8443](https://github.com/angular/angular/commit/0bc8443))
 * **compiler:** handle undefined annotation metadata ([#23349](https://github.com/angular/angular/issues/23349)) ([b9431e8](https://github.com/angular/angular/commit/b9431e8))
-* **compiler:** don't typecheck all inputs ([#22899](https://github.com/angular/angular/issues/22899)) ([838a610](https://github.com/angular/angular/commit/838a610))
-* **compiler:** fix support for html-like text in translatable attributes ([#23053](https://github.com/angular/angular/issues/23053)) ([28058b7](https://github.com/angular/angular/commit/28058b7))
-* **compiler:** take quoting into account when determining if object literals can be shared ([#22942](https://github.com/angular/angular/issues/22942)) ([d98e9e7](https://github.com/angular/angular/commit/d98e9e7))
-* **compiler:** do not emit line/char in ngsummary files. ([#22840](https://github.com/angular/angular/issues/22840)) ([5c387a7](https://github.com/angular/angular/commit/5c387a7))
-* **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)
-* **compiler:** allow tree-shakeable injectables to depend on string tokens ([#22376](https://github.com/angular/angular/issues/22376)) ([dd53447](https://github.com/angular/angular/commit/dd53447))
-* **compiler:** don't strip `/*# sourceURL ... */` ([#16088](https://github.com/angular/angular/issues/16088)) ([5f681f9](https://github.com/angular/angular/commit/5f681f9))
-* **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))
-* **compiler-cli:** shorten resolved module name in fileNameToModuleName to npm package name for typings ([#23231](https://github.com/angular/angular/issues/23231)) ([6199ea5](https://github.com/angular/angular/commit/6199ea5))
-* **compiler-cli:** strictMetadataEmit should not break on non-compliant libraries ([#23275](https://github.com/angular/angular/issues/23275)) ([5814355](https://github.com/angular/angular/commit/5814355)), closes [#22210](https://github.com/angular/angular/issues/22210)
-* **compiler-cli:** flat module index metadata should be transformed ([#23129](https://github.com/angular/angular/issues/23129)) ([f99cb5c](https://github.com/angular/angular/commit/f99cb5c))
-* **compiler-cli:** use numeric comparison for TypeScript version ([#22705](https://github.com/angular/angular/issues/22705)) ([193737a](https://github.com/angular/angular/commit/193737a)), closes [#22593](https://github.com/angular/angular/issues/22593)
-* **compiler-cli:** disableTypeScriptVersionCheck should be applied even for older tsc versions ([#22669](https://github.com/angular/angular/issues/22669)) ([3f70aba](https://github.com/angular/angular/commit/3f70aba))
-* **compiler-cli:** emit correct css string escape sequences ([#22776](https://github.com/angular/angular/issues/22776)) ([6e5e819](https://github.com/angular/angular/commit/6e5e819))
-* **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))
-* **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:** 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)
-* **core:** should check Zone existence when scheduleMicroTask ([#20656](https://github.com/angular/angular/issues/20656)) ([3a86940](https://github.com/angular/angular/commit/3a86940))
-* **core:** avoid eager providers re-initialization ([#23559](https://github.com/angular/angular/issues/23559)) ([697b6c0](https://github.com/angular/angular/commit/697b6c0))
-* **core:** add stacktrace in log when error during cleanup component in TestBed ([#22162](https://github.com/angular/angular/issues/22162)) ([16d1700](https://github.com/angular/angular/commit/16d1700))
-* **core:** ensure initial value of QueryList length ([#21980](https://github.com/angular/angular/issues/21980)) ([#21982](https://github.com/angular/angular/issues/21982)) ([e56de10](https://github.com/angular/angular/commit/e56de10)), closes [#21980](https://github.com/angular/angular/issues/21980)
-* **core:** use appropriate inert document strategy for Firefox & Safari ([#17019](https://github.com/angular/angular/issues/17019)) ([a751649](https://github.com/angular/angular/commit/a751649))
-* **core:** properly handle function without prototype in reflector ([#22284](https://github.com/angular/angular/issues/22284)) ([a7ebf5a](https://github.com/angular/angular/commit/a7ebf5a)), closes [#19978](https://github.com/angular/angular/issues/19978)
-* **core:** require factory to be provided for shakeable InjectionToken ([#22207](https://github.com/angular/angular/issues/22207)) ([f755db7](https://github.com/angular/angular/commit/f755db7)), closes [#22205](https://github.com/angular/angular/issues/22205)
-* **core:** remove core animation import symbols ([#22692](https://github.com/angular/angular/issues/22692)) ([f5a98f4](https://github.com/angular/angular/commit/f5a98f4))
-* **forms:** improve error message for invalid value accessors ([#22731](https://github.com/angular/angular/issues/22731)) ([23cc3ef](https://github.com/angular/angular/commit/23cc3ef))
-* **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)
-* **forms:** publish missing types ([#19941](https://github.com/angular/angular/issues/19941)) ([2707012](https://github.com/angular/angular/commit/2707012))
-* **forms:** set state before emitting a value from ngModelChange ([#21514](https://github.com/angular/angular/issues/21514)) ([3e6a86f](https://github.com/angular/angular/commit/3e6a86f)), closes [#21513](https://github.com/angular/angular/issues/21513)
-* **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)
-* **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))
-* **platform-browser:** do not throw error when Hammer.js not loaded ([#22257](https://github.com/angular/angular/issues/22257)) ([991300b](https://github.com/angular/angular/commit/991300b)), closes [#16992](https://github.com/angular/angular/issues/16992)
-* **platform-browser:** fix [#19604](https://github.com/angular/angular/issues/19604), can config hammerOptions ([#21979](https://github.com/angular/angular/issues/21979)) ([1d571b2](https://github.com/angular/angular/commit/1d571b2))
-* **platform-server:** require node v8+ ([#23331](https://github.com/angular/angular/issues/23331)) ([bbfa1d3](https://github.com/angular/angular/commit/bbfa1d3))
-* **platform-server:** generate correct stylings for camel case names ([#22263](https://github.com/angular/angular/issues/22263)) ([40ba009](https://github.com/angular/angular/commit/40ba009)), closes [#19235](https://github.com/angular/angular/issues/19235)
-* **platform-server:** add styles to elements correctly ([#22527](https://github.com/angular/angular/issues/22527)) ([cd2ebd2](https://github.com/angular/angular/commit/cd2ebd2))
 * **router:** cache route handle if found ([#22475](https://github.com/angular/angular/issues/22475)) ([d8de648](https://github.com/angular/angular/commit/d8de648)), closes [#22474](https://github.com/angular/angular/issues/22474)
-* **router:** don't use spread operator to workaround an issue in closure compiler ([#22884](https://github.com/angular/angular/issues/22884)) ([e6c731f](https://github.com/angular/angular/commit/e6c731f))
-* **router:** make locationSyncBootstrapListener public due to change in output after TS 2.7 update in [#22669](https://github.com/angular/angular/issues/22669) ([#22896](https://github.com/angular/angular/issues/22896)) ([623d769](https://github.com/angular/angular/commit/623d769))
-* **router:** correct over-encoding of URL fragment ([#22687](https://github.com/angular/angular/issues/22687)) ([0bf6fa5](https://github.com/angular/angular/commit/0bf6fa5))
-* **router:** don't mutate route configs ([#22358](https://github.com/angular/angular/issues/22358)) ([45eff4c](https://github.com/angular/angular/commit/45eff4c)), closes [#22203](https://github.com/angular/angular/issues/22203)
-* **router:** fix URL serialization so special characters are only encoded where needed ([#22337](https://github.com/angular/angular/issues/22337)) ([094666d](https://github.com/angular/angular/commit/094666d)), closes [#10280](https://github.com/angular/angular/issues/10280)
-* **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)
 * **service-worker:** add badge to NOTIFICATION_OPTION_NAMES ([#23241](https://github.com/angular/angular/issues/23241)) ([fb59b2d](https://github.com/angular/angular/commit/fb59b2d)), closes [#23196](https://github.com/angular/angular/issues/23196)
-* **service-worker:** let `*` match 0 characters in globs ([#23339](https://github.com/angular/angular/issues/23339)) ([6c2c958](https://github.com/angular/angular/commit/6c2c958))
-* **service-worker:** do not enter degraded mode when offline ([#22883](https://github.com/angular/angular/issues/22883)) ([9e9b8dd](https://github.com/angular/angular/commit/9e9b8dd)), closes [#21636](https://github.com/angular/angular/issues/21636)
-* **service-worker:** fix LruList bugs ([#22769](https://github.com/angular/angular/issues/22769)) ([8c2a578](https://github.com/angular/angular/commit/8c2a578)), closes [#22218](https://github.com/angular/angular/issues/22218) [#22768](https://github.com/angular/angular/issues/22768)
-* **service-worker:** ignore invalid `only-if-cached` requests ([#22883](https://github.com/angular/angular/issues/22883)) ([d9dc46e](https://github.com/angular/angular/commit/d9dc46e)), closes [#22362](https://github.com/angular/angular/issues/22362)
-* **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))
-* **upgrade:** correctly handle downgraded `OnPush` components ([#22209](https://github.com/angular/angular/issues/22209)) ([ad9ce5c](https://github.com/angular/angular/commit/ad9ce5c)), closes [#14286](https://github.com/angular/angular/issues/14286)
-* **upgrade:** propagate return value of resumeBootstrap ([#22754](https://github.com/angular/angular/issues/22754)) ([a2330ff](https://github.com/angular/angular/commit/a2330ff)), closes [#22723](https://github.com/angular/angular/issues/22723)
-* **upgrade:** two-way binding and listening for event ([#22772](https://github.com/angular/angular/issues/22772)) ([2b3de63](https://github.com/angular/angular/commit/2b3de63)), closes [#22734](https://github.com/angular/angular/issues/22734)
-* **upgrade:** correctly destroy nested downgraded component ([#22400](https://github.com/angular/angular/issues/22400)) ([8a85888](https://github.com/angular/angular/commit/8a85888)), closes [#22392](https://github.com/angular/angular/issues/22392)
-* **upgrade:** correctly handle `=` bindings in `[@angular](https://github.com/angular)/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([f089bf5](https://github.com/angular/angular/commit/f089bf5))
-* **upgrade:** fix empty transclusion content with AngularJS@>=1.5.8 ([#22167](https://github.com/angular/angular/issues/22167)) ([13ab91e](https://github.com/angular/angular/commit/13ab91e)), closes [#22175](https://github.com/angular/angular/issues/22175)
-
-
-
-### Possible Breaking Changes
-
-* **animations:** When animation is triggered within a disabled zone, the associated event (which an instance of AnimationEvent) will no longer report the totalTime as 0 (it will emit the actual time of the animation).
-
-  To detect if an animation event is reporting a disabled animation then the `event.disabled` property can be used instead.
-
-
-* **compiler:** The `<template>` tag was deprecated in Angular v4 to avoid collisions (i.e. when using Web Components).
-
-  This change removes support for `<template>`. `<ng-template>` should be used instead.
-
-  BEFORE:
-
-      <!-- html template -->
-      <template>some template content</template>
-
-      # tsconfig.json
-      {
-        # ...
-        "angularCompilerOptions": {
-          # ...
-          # This option is no more supported and will have no effect
-          "enableLegacyTemplate": [true|false]
-        }
-      }
-
-  AFTER:
-
-      <!-- html template -->
-      <ng-template>some template content</ng-template>
-
-* **core:** it is no longer possible to import animation-related functions from @angular/core. All animation symbols must now be imported from @angular/animations.
-
-
-* **forms:** - `AbstractControl#statusChanges` now emits an event of `'PENDING'` when you call `AbstractControl#markAsPending`
-  - Previously it did not emit an event when you called `markAsPending`
-  - To migrate you would need to ensure that if you are filtering or checking events from `statusChanges` that you account for the new event when calling `markAsPending`
-
-
-* **forms:** ngModelChange is now emitted after the value/validity is updated on its control.
-
-  Previously, ngModelChange was emitted before its underlying control was updated.
-  This was fine if you passed through the value directly through the $event keyword, e.g.
-
-  ```
-  <input [(ngModel)]="name" (ngModelChange)="onChange($event)">
-
-  onChange(value) {
-     console.log(value);               // would log updated value
-  }
-  ```
-
-  However, if you had a handler for the ngModelChange event that checked the value through the control,
-  you would get the old value rather than the updated value. e.g:
-
-  ```
-  <input #modelDir="ngModel" [(ngModel)]="name" (ngModelChange)="onChange(modelDir)">
-
-  onChange(ngModel: NgModel) {
-    console.log(ngModel.value);        // would log old value, not updated value
-  }
-  ```
-
-  Now the value and validity will be updated before the ngModelChange event is emitted,
-  so the same setup will log the updated value.
-
-  ```
-  onChange(ngModel: NgModel) {
-     console.log(ngModel.value);       // will log updated value
-  }
-  ```
-
-  We think this order will be less confusing when the control is checked directly.
-  You will only need to update your app if it has relied on this bug to keep track of the old control value.
-  If that is the case, you should be able to track the old value directly by saving it on your component.



@ -392,6 +42,231 @@ To learn about the release highlights and our new CLI-powered update workflow fo



+<a name="6.0.0-rc.5"></a>
+## [6.0.0-rc.5](https://github.com/angular/angular/compare/6.0.0-rc.4...6.0.0-rc.5) (2018-04-14)
+
+
+### Bug Fixes
+
+* **compiler:** use correct global name in compiler.umd.js ([#23354](https://github.com/angular/angular/issues/23354)) ([b76dd3b](https://github.com/angular/angular/commit/b76dd3b)), closes [#23343](https://github.com/angular/angular/issues/23343)
+* **compiler-cli:** shorten resolved module name in fileNameToModuleName to npm package name for typings ([#23231](https://github.com/angular/angular/issues/23231)) ([6199ea5](https://github.com/angular/angular/commit/6199ea5))
+* **elements:** include schematics in npm distro ([#23350](https://github.com/angular/angular/issues/23350)) ([9fabe2f](https://github.com/angular/angular/commit/9fabe2f))
+* **service-worker:** let `*` match 0 characters in globs ([#23339](https://github.com/angular/angular/issues/23339)) ([6c2c958](https://github.com/angular/angular/commit/6c2c958))
+
+
+### Features
+
+* **platform-browser:** add token marking which the type of animation module nearest in the injector tree ([#23075](https://github.com/angular/angular/issues/23075)) ([b551f84](https://github.com/angular/angular/commit/b551f84))
+* **service-worker:** add support for configuring navigations URLs ([#23339](https://github.com/angular/angular/issues/23339)) ([08325aa](https://github.com/angular/angular/commit/08325aa)), closes [#20404](https://github.com/angular/angular/issues/20404)
+
+
+
+<a name="6.0.0-rc.4"></a>
+## [6.0.0-rc.4](https://github.com/angular/angular/compare/6.0.0-rc.3...6.0.0-rc.4) (2018-04-12)
+
+
+### Bug Fixes
+
+* **bazel:** set rollup output.name and amd.id ([#23274](https://github.com/angular/angular/issues/23274)) ([3e8eef6](https://github.com/angular/angular/commit/3e8eef6)), closes [#23238](https://github.com/angular/angular/issues/23238)
+* **common:** replace i18n locale undefined values by a const ([#23265](https://github.com/angular/angular/issues/23265)) ([5706810](https://github.com/angular/angular/commit/5706810)), closes [#22988](https://github.com/angular/angular/issues/22988)
+* **common:** workaround UMD/webpack limitation ([#23271](https://github.com/angular/angular/issues/23271)) ([5a298b1](https://github.com/angular/angular/commit/5a298b1)), closes [#23217](https://github.com/angular/angular/issues/23217)
+* **compiler:** Pretty print object instead of [Object object] ([#22689](https://github.com/angular/angular/issues/22689)) ([8555a3a](https://github.com/angular/angular/commit/8555a3a))
+* **compiler-cli:** strictMetadataEmit should not break on non-compliant libraries ([#23275](https://github.com/angular/angular/issues/23275)) ([5814355](https://github.com/angular/angular/commit/5814355)), closes [#22210](https://github.com/angular/angular/issues/22210)
+* **elements:** avoid exception when window is undefined ([#23324](https://github.com/angular/angular/issues/23324)) ([af46d09](https://github.com/angular/angular/commit/af46d09))
+* **platform-server:** require node v8+ ([#23331](https://github.com/angular/angular/issues/23331)) ([bbfa1d3](https://github.com/angular/angular/commit/bbfa1d3))
+
+
+### Features
+
+* **elements:** add schematics ([#23298](https://github.com/angular/angular/issues/23298)) ([37d2cb4](https://github.com/angular/angular/commit/37d2cb4))
+
+
+
+<a name="6.0.0-rc.3"></a>
+## [6.0.0-rc.3](https://github.com/angular/angular/compare/6.0.0-rc.2...6.0.0-rc.3) (2018-04-06)
+
+
+### Bug Fixes
+
+* **bazel:** don't produce ngfactory files for ng_packages ([#23237](https://github.com/angular/angular/issues/23237)) ([da58a55](https://github.com/angular/angular/commit/da58a55))
+* **compiler-cli:** don't lower expressions in flat module metadata ([#23226](https://github.com/angular/angular/issues/23226)) ([11ea3a3](https://github.com/angular/angular/commit/11ea3a3))
+
+
+
+<a name="6.0.0-rc.2"></a>
+## [6.0.0-rc.2](https://github.com/angular/angular/compare/6.0.0-rc.1...6.0.0-rc.2) (2018-04-05)
+
+
+### Bug Fixes
+
+* **common:** `locales` are not being shipped ([#23136](https://github.com/angular/angular/issues/23136)) ([7ca7720](https://github.com/angular/angular/commit/7ca7720))
+* **common:** properly take className changes into account ([#21937](https://github.com/angular/angular/issues/21937)) ([4a42669](https://github.com/angular/angular/commit/4a42669)), closes [#21932](https://github.com/angular/angular/issues/21932)
+* **compiler-cli:** flat module index metadata should be transformed ([#23129](https://github.com/angular/angular/issues/23129)) ([f99cb5c](https://github.com/angular/angular/commit/f99cb5c))
+* **core:** inject() should always work in an NgModule injection scope ([#23148](https://github.com/angular/angular/issues/23148)) ([fab6b39](https://github.com/angular/angular/commit/fab6b39)), closes [angular/material2#10586](https://github.com/angular/material2/issues/10586)
+* **forms:** improve error message for invalid value accessors ([#22731](https://github.com/angular/angular/issues/22731)) ([23cc3ef](https://github.com/angular/angular/commit/23cc3ef))
+* **upgrade:** correctly handle downgraded `OnPush` components ([#22209](https://github.com/angular/angular/issues/22209)) ([ad9ce5c](https://github.com/angular/angular/commit/ad9ce5c)), closes [#14286](https://github.com/angular/angular/issues/14286)
+* **upgrade:** propagate return value of resumeBootstrap ([#22754](https://github.com/angular/angular/issues/22754)) ([a2330ff](https://github.com/angular/angular/commit/a2330ff)), closes [#22723](https://github.com/angular/angular/issues/22723)
+
+
+### Features
+
+* **compiler-cli:** lower loadChildren fields to allow dynamic module paths ([#23088](https://github.com/angular/angular/issues/23088)) ([550433a](https://github.com/angular/angular/commit/550433a))
+
+
+
+<a name="6.0.0-rc.1"></a>
+## [6.0.0-rc.1](https://github.com/angular/angular/compare/6.0.0-rc.0...6.0.0-rc.1) (2018-03-30)
+
+
+### Bug Fixes
+
+* **animations:** avoid animation insertions during router back/refresh ([#21977](https://github.com/angular/angular/issues/21977)) ([f88fba0](https://github.com/angular/angular/commit/f88fba0)), closes [#19712](https://github.com/angular/angular/issues/19712)
+* **animations:** treat numeric state name values as strings ([#22923](https://github.com/angular/angular/issues/22923)) ([e5e1b0d](https://github.com/angular/angular/commit/e5e1b0d))
+* **bazel:** complete the rollup globals list for all angular entrypoints ([#23080](https://github.com/angular/angular/issues/23080)) ([439030f](https://github.com/angular/angular/commit/439030f))
+* **bazel:** don't inline tslib into fesms ([#23044](https://github.com/angular/angular/issues/23044)) ([0049743](https://github.com/angular/angular/commit/0049743))
+* **bazel:** don't try to do flatmoduleindex under Blaze ([#23083](https://github.com/angular/angular/issues/23083)) ([be10bf5](https://github.com/angular/angular/commit/be10bf5))
+* **bazel:** downlevel decorators in fesm5 files ([#23078](https://github.com/angular/angular/issues/23078)) ([481b22e](https://github.com/angular/angular/commit/481b22e))
+* **bazel:** ng_package packages attr not forwarded to npm_package ([#22967](https://github.com/angular/angular/issues/22967)) ([2aabbc5](https://github.com/angular/angular/commit/2aabbc5))
+* **bazel:** ng_package should include private exports in fesms ([#23054](https://github.com/angular/angular/issues/23054)) ([0d9140c](https://github.com/angular/angular/commit/0d9140c))
+* **bazel:** pass --global option to rollup ([#23073](https://github.com/angular/angular/issues/23073)) ([45e090b](https://github.com/angular/angular/commit/45e090b))
+* **common:** titlecase pipe ([#22600](https://github.com/angular/angular/issues/22600)) ([7966744](https://github.com/angular/angular/commit/7966744))
+* **compiler:** don't typecheck all inputs ([#22899](https://github.com/angular/angular/issues/22899)) ([838a610](https://github.com/angular/angular/commit/838a610))
+* consistently rewrite Injector to INJECTOR ([#23008](https://github.com/angular/angular/issues/23008)) ([884bf0e](https://github.com/angular/angular/commit/884bf0e))
+* **compiler:** fix support for html-like text in translatable attributes ([#23053](https://github.com/angular/angular/issues/23053)) ([28058b7](https://github.com/angular/angular/commit/28058b7))
+* **compiler:** take quoting into account when determining if object literals can be shared ([#22942](https://github.com/angular/angular/issues/22942)) ([d98e9e7](https://github.com/angular/angular/commit/d98e9e7))
+* **compiler-cli:** use numeric comparison for TypeScript version ([#22705](https://github.com/angular/angular/issues/22705)) ([193737a](https://github.com/angular/angular/commit/193737a)), closes [#22593](https://github.com/angular/angular/issues/22593)
+* **core:** don't override ngInjectableDef in the decorator if present on the type ([#22943](https://github.com/angular/angular/issues/22943)) ([6f01917](https://github.com/angular/angular/commit/6f01917))
+* **service-worker:** do not enter degraded mode when offline ([#22883](https://github.com/angular/angular/issues/22883)) ([9e9b8dd](https://github.com/angular/angular/commit/9e9b8dd)), closes [#21636](https://github.com/angular/angular/issues/21636)
+* **service-worker:** fix LruList bugs ([#22769](https://github.com/angular/angular/issues/22769)) ([8c2a578](https://github.com/angular/angular/commit/8c2a578)), closes [#22218](https://github.com/angular/angular/issues/22218) [#22768](https://github.com/angular/angular/issues/22768)
+* **service-worker:** ignore invalid `only-if-cached` requests ([#22883](https://github.com/angular/angular/issues/22883)) ([d9dc46e](https://github.com/angular/angular/commit/d9dc46e)), closes [#22362](https://github.com/angular/angular/issues/22362)
+
+
+### Features
+
+* **bazel:** prefix private-export (barred-latin-o) symbols ([#23007](https://github.com/angular/angular/issues/23007)) ([27e14b2](https://github.com/angular/angular/commit/27e14b2))
+* **compiler:** lower @NgModule ids if needed ([#23031](https://github.com/angular/angular/issues/23031)) ([bd024c0](https://github.com/angular/angular/commit/bd024c0))
+
+
+
+<a name="6.0.0-rc.0"></a>
+# [6.0.0-rc.0](https://github.com/angular/angular/compare/6.0.0-beta.8...6.0.0-rc.0) (2018-03-21)
+
+v6 framework is now feature complete, the cli and material/cdk parts of the v6 release and other integrations are still
+in works and will be completed by the time we cut v6.0.0.
+
+Please [file new issues](https://github.com/angular/angular/issues/new) at our issue tracker with as many details as
+possible, and ideally also a include a good reproduction of the problem.
+
+### Bug Fixes
+
+* **bazel:** correct expected outs for external sources in ng_module ([#22755](https://github.com/angular/angular/issues/22755)) ([bfe077a](https://github.com/angular/angular/commit/bfe077a))
+* **compiler:** do not emit line/char in ngsummary files. ([#22840](https://github.com/angular/angular/issues/22840)) ([5c387a7](https://github.com/angular/angular/commit/5c387a7))
+* correct several esm2015 entry-points in package.jsons ([#22892](https://github.com/angular/angular/issues/22892)) ([7d095b9](https://github.com/angular/angular/commit/7d095b9))
+* **router:** don't use spread operator to workaround an issue in closure compiler ([#22884](https://github.com/angular/angular/issues/22884)) ([e6c731f](https://github.com/angular/angular/commit/e6c731f))
+* **router:** make locationSyncBootstrapListener public due to change in output after TS 2.7 update in [#22669](https://github.com/angular/angular/issues/22669) ([#22896](https://github.com/angular/angular/issues/22896)) ([623d769](https://github.com/angular/angular/commit/623d769))
+* **upgrade:** two-way binding and listening for event ([#22772](https://github.com/angular/angular/issues/22772)) ([2b3de63](https://github.com/angular/angular/commit/2b3de63)), closes [#22734](https://github.com/angular/angular/issues/22734)
+
+
+### Features
+
+* **core:** update the package output of build.sh to [APF v6](https://goo.gl/jB3GVv) ([#22808](https://github.com/angular/angular/issues/22808)) ([ce63dc6](https://github.com/angular/angular/commit/ce63dc6))
+* **core:** upgrade rxjs to 6.0.0-beta.0, please see this [RxJS Upgrade Guide](https://goo.gl/osWFzo) for more info ([#22573](https://github.com/angular/angular/issues/22573)) ([b43f8bc](https://github.com/angular/angular/commit/b43f8bc))
+
+
+
+<a name="6.0.0-beta.8"></a>
+## [6.0.0-beta.8](https://github.com/angular/angular/compare/6.0.0-beta.7...6.0.0-beta.8) (2018-03-16)
+
+
+### Bug Fixes
+
+* **aio:** constrain error logging to improve reporting ([#22713](https://github.com/angular/angular/issues/22713)) ([049757b](https://github.com/angular/angular/commit/049757b))
+* **compiler-cli:** annotate Ivy fields as [@nocollapse](https://github.com/nocollapse) in closure mode ([#22691](https://github.com/angular/angular/issues/22691)) ([6e00410](https://github.com/angular/angular/commit/6e00410))
+* **compiler-cli:** disableTypeScriptVersionCheck should be applied even for older tsc versions ([#22669](https://github.com/angular/angular/issues/22669)) ([3f70aba](https://github.com/angular/angular/commit/3f70aba))
+* **compiler-cli:** emit correct css string escape sequences ([#22776](https://github.com/angular/angular/issues/22776)) ([6e5e819](https://github.com/angular/angular/commit/6e5e819))
+* **compiler-cli:** enableResourceInlining handles both styles and styleUrls ([#22688](https://github.com/angular/angular/issues/22688)) ([40315be](https://github.com/angular/angular/commit/40315be))
+* **compiler-cli:** generate proper exports.* identifiers in cjs output ([#22564](https://github.com/angular/angular/issues/22564)) ([0d8deb0](https://github.com/angular/angular/commit/0d8deb0))
+* **compiler-cli:** resolve resource URLs before loading them under enableResourceInlining ([#22688](https://github.com/angular/angular/issues/22688)) ([123efba](https://github.com/angular/angular/commit/123efba))
+* **core:** remove core animation import symbols ([#22692](https://github.com/angular/angular/issues/22692)) ([f5a98f4](https://github.com/angular/angular/commit/f5a98f4))
+* **elements:** fix elements test bootstrap ([#22839](https://github.com/angular/angular/issues/22839)) ([5d82d8d](https://github.com/angular/angular/commit/5d82d8d))
+* overloading a function doesn't generate all of the signatures ([#22569](https://github.com/angular/angular/issues/22569)) ([e8326e6](https://github.com/angular/angular/commit/e8326e6))
+* **platform-server:** add styles to elements correctly ([#22527](https://github.com/angular/angular/issues/22527)) ([cd2ebd2](https://github.com/angular/angular/commit/cd2ebd2))
+* **router:** correct over-encoding of URL fragment ([#22687](https://github.com/angular/angular/issues/22687)) ([0bf6fa5](https://github.com/angular/angular/commit/0bf6fa5))
+
+
+### Code Refactoring
+
+* **compiler:** Drop support for the deprecated `<template>`. Use `<ng-template>` instead ([#22783](https://github.com/angular/angular/issues/22783)) ([0ebd577](https://github.com/angular/angular/commit/0ebd577))
+
+
+### Features
+
+* **aio:** add hack, remove me ([#22413](https://github.com/angular/angular/issues/22413)) ([4d506ac](https://github.com/angular/angular/commit/4d506ac))
+* **aio:** migrate embedded comp to elements ([#22413](https://github.com/angular/angular/issues/22413)) ([7c9b411](https://github.com/angular/angular/commit/7c9b411))
+* **aio:** update payload size ([#22413](https://github.com/angular/angular/issues/22413)) ([400460c](https://github.com/angular/angular/commit/400460c))
+* **animations:** expose `element` and `params` within transition matchers ([#22693](https://github.com/angular/angular/issues/22693)) ([58b94e6](https://github.com/angular/angular/commit/58b94e6))
+* **bazel:** change ng_package rule to APF v6 ([#22782](https://github.com/angular/angular/issues/22782)) ([88b3198](https://github.com/angular/angular/commit/88b3198))
+* **compiler:** support for singleline, multiline & jsdoc comments ([#22715](https://github.com/angular/angular/issues/22715)) ([3b167be](https://github.com/angular/angular/commit/3b167be))
+* **compiler-cli:** add resource inlining to ngc ([#22615](https://github.com/angular/angular/issues/22615)) ([b5be18f](https://github.com/angular/angular/commit/b5be18f))
+* **compiler-cli:** require node 8 as runtime engine ([#22669](https://github.com/angular/angular/issues/22669)) ([c602563](https://github.com/angular/angular/commit/c602563))
+* **core:** add task tracking to Testability ([#16863](https://github.com/angular/angular/issues/16863)) ([37fedd0](https://github.com/angular/angular/commit/37fedd0))
+* **elements:** add polyfill for elements es5 shim ([#22413](https://github.com/angular/angular/issues/22413)) ([863aff1](https://github.com/angular/angular/commit/863aff1))
+* **elements:** add support for creating custom elements ([#22413](https://github.com/angular/angular/issues/22413)) ([22b96b9](https://github.com/angular/angular/commit/22b96b9))
+* **elements:** add tests for component factory strategy ([#22413](https://github.com/angular/angular/issues/22413)) ([d2be675](https://github.com/angular/angular/commit/d2be675))
+* **elements:** another polyfill solution ([#22413](https://github.com/angular/angular/issues/22413)) ([cf3ff7d](https://github.com/angular/angular/commit/cf3ff7d))
+* **elements:** fix lint ([#22413](https://github.com/angular/angular/issues/22413)) ([0b45dfa](https://github.com/angular/angular/commit/0b45dfa))
+* **elements:** fix payload size ([#22413](https://github.com/angular/angular/issues/22413)) ([fe21437](https://github.com/angular/angular/commit/fe21437))
+* **elements:** fix test ([#22413](https://github.com/angular/angular/issues/22413)) ([44f637a](https://github.com/angular/angular/commit/44f637a))
+* **elements:** George's comments ([#22413](https://github.com/angular/angular/issues/22413)) ([46efd4b](https://github.com/angular/angular/commit/46efd4b))
+* **elements:** injector create ([#22413](https://github.com/angular/angular/issues/22413)) ([87f60bc](https://github.com/angular/angular/commit/87f60bc))
+* **elements:** make bazel happy ([#22413](https://github.com/angular/angular/issues/22413)) ([39a12d2](https://github.com/angular/angular/commit/39a12d2))
+* **elements:** provide type, not factory; remove config need ([#22413](https://github.com/angular/angular/issues/22413)) ([1936808](https://github.com/angular/angular/commit/1936808))
+* **elements:** rebase ([#22413](https://github.com/angular/angular/issues/22413)) ([d72f445](https://github.com/angular/angular/commit/d72f445))
+* **elements:** remove attribute/input from config ([#22413](https://github.com/angular/angular/issues/22413)) ([688096b](https://github.com/angular/angular/commit/688096b))
+* **elements:** rename API to createCustomElement ([#22413](https://github.com/angular/angular/issues/22413)) ([167fdf7](https://github.com/angular/angular/commit/167fdf7))
+* **elements:** update package.json with latest ([#22413](https://github.com/angular/angular/issues/22413)) ([2e450f6](https://github.com/angular/angular/commit/2e450f6))
+* mark angular packages as side-effect free ([#22785](https://github.com/angular/angular/issues/22785)) ([44de10e](https://github.com/angular/angular/commit/44de10e))
+* tree-shakeable providers API updates ([#22655](https://github.com/angular/angular/issues/22655)) ([db56836](https://github.com/angular/angular/commit/db56836))
+* update tslib to 1.9.0 ([#22667](https://github.com/angular/angular/issues/22667)) ([489fec1](https://github.com/angular/angular/commit/489fec1))
+
+
+### BREAKING CHANGES
+
+* **compiler:** The `<template>` tag was deprecated in Angular v4 to avoid collisions (i.e. when
+using Web Components).
+
+This commit removes support for `<template>`. `<ng-template>` should be used
+instead.
+
+BEFORE:
+
+    <!-- html template -->
+    <template>some template content</template>
+
+    # tsconfig.json
+    {
+      # ...
+      "angularCompilerOptions": {
+        # ...
+        # This option is no more supported and will have no effect
+        "enableLegacyTemplate": [true|false]
+      }
+    }
+
+AFTER:
+
+    <!-- html template -->
+    <ng-template>some template content</ng-template>
+* **core:** it is no longer possible to import
+animation-related functions from @angular/core. All
+animation symbols must now be imported from @angular/animations.
+* after this change, npm and yarn will issue incompatible peerDependencies warning
+
+We don't expect this to actually break an application, but the application/library package.json
+will need to be updated to provide tslib 1.9.0 or higher.
+
+
+
 <a name="5.2.9"></a>
 ## [5.2.9](https://github.com/angular/angular/compare/5.2.8...5.2.9) (2018-03-14)

@ -403,6 +278,18 @@ To learn about the release highlights and our new CLI-powered update workflow fo



+<a name="6.0.0-beta.7"></a>
+# [6.0.0-beta.7](https://github.com/angular/angular/compare/6.0.0-beta.6...6.0.0-beta.7) (2018-03-07)
+
+
+### Bug Fixes
+
+* **bazel:** fixes for ng_package on Windows ([#22597](https://github.com/angular/angular/issues/22597)) ([4c40812](https://github.com/angular/angular/commit/4c40812))
+* **compiler:** allow tree-shakeable injectables to depend on string tokens ([#22376](https://github.com/angular/angular/issues/22376)) ([dd53447](https://github.com/angular/angular/commit/dd53447))
+* **router:** fix URL serialization so special characters are only encoded where needed ([#22337](https://github.com/angular/angular/issues/22337)) ([fa974c7](https://github.com/angular/angular/commit/fa974c7)), closes [#10280](https://github.com/angular/angular/issues/10280)
+
+
+
 <a name="5.2.8"></a>
 ## [5.2.8](https://github.com/angular/angular/compare/5.2.7...5.2.8) (2018-03-07)

@ -417,6 +304,63 @@ To learn about the release highlights and our new CLI-powered update workflow fo
 * **upgrade:** fix empty transclusion content with AngularJS@>=1.5.8 ([#22167](https://github.com/angular/angular/issues/22167)) ([a9a0e27](https://github.com/angular/angular/commit/a9a0e27)), closes [#22175](https://github.com/angular/angular/issues/22175)


+<a name="6.0.0-beta.6"></a>
+# [6.0.0-beta.6](https://github.com/angular/angular/compare/6.0.0-beta.5...6.0.0-beta.6) (2018-02-28)
+
+
+### Bug Fixes
+
+* **animations:** only use the WA-polyfill alongside AnimationBuilder ([#22143](https://github.com/angular/angular/issues/22143)) ([b2f366b](https://github.com/angular/angular/commit/b2f366b)), closes [#17496](https://github.com/angular/angular/issues/17496)
+* **animations:** report correct totalTime value even during noOp animations ([#22225](https://github.com/angular/angular/issues/22225)) ([e1bf067](https://github.com/angular/angular/commit/e1bf067))
+* **bazel:** ng_package includes transitive .d.ts and flatModuleMetadata ([#22499](https://github.com/angular/angular/issues/22499)) ([aabe16c](https://github.com/angular/angular/commit/aabe16c)), closes [#22419](https://github.com/angular/angular/issues/22419)
+* **common:** correct mapping of Observable methods ([#20518](https://github.com/angular/angular/issues/20518)) ([2639b4b](https://github.com/angular/angular/commit/2639b4b)), closes [#20516](https://github.com/angular/angular/issues/20516)
+* **common:** then and else template might be set to null ([#22298](https://github.com/angular/angular/issues/22298)) ([8115edc](https://github.com/angular/angular/commit/8115edc))
+* **compiler-cli:** add missing entry point to package, update tsickle ([#22295](https://github.com/angular/angular/issues/22295)) ([28ac244](https://github.com/angular/angular/commit/28ac244))
+* **core:** export inject() from [@angular](https://github.com/angular)/core ([#22389](https://github.com/angular/angular/issues/22389)) ([f8749bf](https://github.com/angular/angular/commit/f8749bf)), closes [#22388](https://github.com/angular/angular/issues/22388)
+* **core:** properly handle function without prototype in reflector ([#22284](https://github.com/angular/angular/issues/22284)) ([a7ebf5a](https://github.com/angular/angular/commit/a7ebf5a)), closes [#19978](https://github.com/angular/angular/issues/19978)
+* **core:** require factory to be provided for shakeable InjectionToken ([#22207](https://github.com/angular/angular/issues/22207)) ([f755db7](https://github.com/angular/angular/commit/f755db7)), closes [#22205](https://github.com/angular/angular/issues/22205)
+* **forms:** set state before emitting a value from ngModelChange ([#21514](https://github.com/angular/angular/issues/21514)) ([3e6a86f](https://github.com/angular/angular/commit/3e6a86f)), closes [#21513](https://github.com/angular/angular/issues/21513)
+* **platform-server:** generate correct stylings for camel case names ([#22263](https://github.com/angular/angular/issues/22263)) ([40ba009](https://github.com/angular/angular/commit/40ba009)), closes [#19235](https://github.com/angular/angular/issues/19235)
+* **router:** don't mutate route configs ([#22358](https://github.com/angular/angular/issues/22358)) ([45eff4c](https://github.com/angular/angular/commit/45eff4c)), closes [#22203](https://github.com/angular/angular/issues/22203)
+* **router:** fix URL serialization so special characters are only encoded where needed ([#22337](https://github.com/angular/angular/issues/22337)) ([094666d](https://github.com/angular/angular/commit/094666d)), closes [#10280](https://github.com/angular/angular/issues/10280)
+* **upgrade:** correctly destroy nested downgraded component ([#22400](https://github.com/angular/angular/issues/22400)) ([8a85888](https://github.com/angular/angular/commit/8a85888)), closes [#22392](https://github.com/angular/angular/issues/22392)
+* **upgrade:** correctly handle `=` bindings in `[@angular](https://github.com/angular)/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([f089bf5](https://github.com/angular/angular/commit/f089bf5))
+* **upgrade:** fix empty transclusion content with AngularJS@>=1.5.8 ([#22167](https://github.com/angular/angular/issues/22167)) ([13ab91e](https://github.com/angular/angular/commit/13ab91e)), closes [#22175](https://github.com/angular/angular/issues/22175)
+
+
+### Features
+
+* **bazel:** add an ng_package rule ([#22221](https://github.com/angular/angular/issues/22221)) ([b43b164](https://github.com/angular/angular/commit/b43b164))
+* **bazel:** introduce a binary stamping feature ([#22176](https://github.com/angular/angular/issues/22176)) ([bba65e0](https://github.com/angular/angular/commit/bba65e0))
+* **bazel:** ng_module produces bundle index ([#22176](https://github.com/angular/angular/issues/22176)) ([029dbf0](https://github.com/angular/angular/commit/029dbf0))
+* **bazel:** ng_package adds package.json props ([#22499](https://github.com/angular/angular/issues/22499)) ([b6c9410](https://github.com/angular/angular/commit/b6c9410)), closes [#22416](https://github.com/angular/angular/issues/22416)
+* **common:** better error message when non-template element used in NgIf ([#22274](https://github.com/angular/angular/issues/22274)) ([67cf11d](https://github.com/angular/angular/commit/67cf11d)), closes [#16410](https://github.com/angular/angular/issues/16410)
+* **common:** export functions to format numbers, percents, currencies & dates ([#22423](https://github.com/angular/angular/issues/22423)) ([4180912](https://github.com/angular/angular/commit/4180912)), closes [#20536](https://github.com/angular/angular/issues/20536)
+* **compiler-cli:** Check unvalidated combination of ngc and TypeScript ([#22293](https://github.com/angular/angular/issues/22293)) ([3ceee99](https://github.com/angular/angular/commit/3ceee99)), closes [#20669](https://github.com/angular/angular/issues/20669)
+* **core:** set preserveWhitespaces to false by default ([#22046](https://github.com/angular/angular/issues/22046)) ([f1a0632](https://github.com/angular/angular/commit/f1a0632)), closes [#22027](https://github.com/angular/angular/issues/22027)
+* **core:** support metadata reflection for native class types ([#22356](https://github.com/angular/angular/issues/22356)) ([5c89d6b](https://github.com/angular/angular/commit/5c89d6b)), closes [#21731](https://github.com/angular/angular/issues/21731)
+* **core:** support metadata reflection for native class types ([#22356](https://github.com/angular/angular/issues/22356)) ([b7544cc](https://github.com/angular/angular/commit/b7544cc)), closes [#21731](https://github.com/angular/angular/issues/21731)
+* **forms:** allow markAsPending to emit events ([#20212](https://github.com/angular/angular/issues/20212)) ([e86b64b](https://github.com/angular/angular/commit/e86b64b)), closes [#17958](https://github.com/angular/angular/issues/17958)
+* allow direct scoping of @Injectables to the root injector ([#22185](https://github.com/angular/angular/issues/22185)) ([7ac34e4](https://github.com/angular/angular/commit/7ac34e4))
+* **platform-browser:** do not throw error when Hammer.js not loaded ([#22257](https://github.com/angular/angular/issues/22257)) ([991300b](https://github.com/angular/angular/commit/991300b)), closes [#16992](https://github.com/angular/angular/issues/16992)
+* **platform-browser:** fix [#19604](https://github.com/angular/angular/issues/19604), can config hammerOptions ([#21979](https://github.com/angular/angular/issues/21979)) ([1d571b2](https://github.com/angular/angular/commit/1d571b2))
+* **platform-server:** bump Domino to v2.0 ([#22411](https://github.com/angular/angular/issues/22411)) ([d3827a0](https://github.com/angular/angular/commit/d3827a0))
+
+
+### BREAKING CHANGES
+
+* **platform-server:** * Bump the dependency on Domino to 2.0 to resolve issues with
+  namespacing
+* **forms:** - `AbstractControl#statusChanges` now emits an event of `'PENDING'` when you call `AbstractControl#markAsPending`
+- Previously it did not emit an event when you called `markAsPending`
+- To migrate you would need to ensure that if you are filtering or checking events from `statusChanges` that you account for the new event when calling `markAsPending`
+* **animations:** When animation is trigged within a disabled zone, the
+associated event (which an instance of AnimationEvent) will no longer
+report the totalTime as 0 (it will emit the actual time of the
+animation). To detect if an animation event is reporting a disabled
+animation then the `event.disabled` property can be used instead.
+
+

 <a name="5.2.7"></a>
 ## [5.2.7](https://github.com/angular/angular/compare/5.2.6...5.2.7) (2018-02-28)
@ -430,7 +374,72 @@ To learn about the release highlights and our new CLI-powered update workflow fo
 * **upgrade:** correctly handle `=` bindings in `[@angular](https://github.com/angular)/upgrade` ([#22167](https://github.com/angular/angular/issues/22167)) ([6638390](https://github.com/angular/angular/commit/6638390))
 * **upgrade:** fix empty transclusion content with AngularJS@>=1.5.8 ([#22167](https://github.com/angular/angular/issues/22167)) ([a9a0e27](https://github.com/angular/angular/commit/a9a0e27)), closes [#22175](https://github.com/angular/angular/issues/22175)

+<a name="6.0.0-beta.5"></a>
+# [6.0.0-beta.5](https://github.com/angular/angular/compare/6.0.0-beta.4...6.0.0-beta.5) (2018-02-22)

+### Bug Fixes
+
+* **animations:** report correct totalTime value even during noOp animations ([#22225](https://github.com/angular/angular/issues/22225)) ([e1bf067](https://github.com/angular/angular/commit/e1bf067))
+* **common:** correct mapping of Observable methods ([#20518](https://github.com/angular/angular/issues/20518)) ([2639b4b](https://github.com/angular/angular/commit/2639b4b)), closes [#20516](https://github.com/angular/angular/issues/20516)
+* **common:** then and else template might be set to null ([#22298](https://github.com/angular/angular/issues/22298)) ([8115edc](https://github.com/angular/angular/commit/8115edc))
+* **compiler-cli:** add missing entry point to package, update tsickle ([#22295](https://github.com/angular/angular/issues/22295)) ([28ac244](https://github.com/angular/angular/commit/28ac244))
+* **core:** properly handle function without prototype in reflector ([#22284](https://github.com/angular/angular/issues/22284)) ([a7ebf5a](https://github.com/angular/angular/commit/a7ebf5a)), closes [#19978](https://github.com/angular/angular/issues/19978)
+* **core:** require factory to be provided for shakeable InjectionToken ([#22207](https://github.com/angular/angular/issues/22207)) ([f755db7](https://github.com/angular/angular/commit/f755db7)), closes [#22205](https://github.com/angular/angular/issues/22205)
+* **forms:** set state before emitting a value from ngModelChange ([#21514](https://github.com/angular/angular/issues/21514)) ([3e6a86f](https://github.com/angular/angular/commit/3e6a86f)), closes [#21513](https://github.com/angular/angular/issues/21513)
+* **core:** set `preserveWhitespaces` to false by default ([#22046](https://github.com/angular/angular/issues/22046)) ([f1a0632](https://github.com/angular/angular/commit/f1a0632)), closes [#22027](https://github.com/angular/angular/issues/22027)
+
+### Features
+
+* **common:** better error message when non-template element used in NgIf ([#22274](https://github.com/angular/angular/issues/22274)) ([67cf11d](https://github.com/angular/angular/commit/67cf11d)), closes [#16410](https://github.com/angular/angular/issues/16410)
+* **compiler-cli:** Check unvalidated combination of ngc and TypeScript ([#22293](https://github.com/angular/angular/issues/22293)) ([3ceee99](https://github.com/angular/angular/commit/3ceee99)), closes [#20669](https://github.com/angular/angular/issues/20669)
+* **core:** support metadata reflection for native class types ([#22356](https://github.com/angular/angular/issues/22356)) ([5c89d6b](https://github.com/angular/angular/commit/5c89d6b)), closes [#21731](https://github.com/angular/angular/issues/21731)
+* **platform-browser:** do not throw error when Hammer.js not loaded ([#22257](https://github.com/angular/angular/issues/22257)) ([991300b](https://github.com/angular/angular/commit/991300b)), closes [#16992](https://github.com/angular/angular/issues/16992)
+* **platform-browser:** fix [#19604](https://github.com/angular/angular/issues/19604), can config hammerOptions ([#21979](https://github.com/angular/angular/issues/21979)) ([1d571b2](https://github.com/angular/angular/commit/1d571b2))
+
+### BREAKING CHANGES
+
+* **animations:** When animation is triggered within a disabled zone, the
+associated event (which an instance of AnimationEvent) will no longer
+report the totalTime as 0 (it will emit the actual time of the
+animation). To detect if an animation event is reporting a disabled
+animation then the `event.disabled` property can be used instead.
+
+* **forms:** ngModelChange is now emitted after the value/validity is updated on its control.
+
+Previously, ngModelChange was emitted before its underlying control was updated.
+This was fine if you passed through the value directly through the $event keyword, e.g.
+
+```
+<input [(ngModel)]="name" (ngModelChange)="onChange($event)">
+
+onChange(value) {
+   console.log(value);               // would log updated value
+}
+```
+
+However, if you had a handler for the ngModelChange event that checked the value through the control,
+you would get the old value rather than the updated value. e.g:
+
+```
+<input #modelDir="ngModel" [(ngModel)]="name" (ngModelChange)="onChange(modelDir)">
+
+onChange(ngModel: NgModel) {
+  console.log(ngModel.value);        // would log old value, not updated value
+}
+```
+
+Now the value and validity will be updated before the ngModelChange event is emitted,
+so the same setup will log the updated value.
+
+```
+onChange(ngModel: NgModel) {
+   console.log(ngModel.value);       // will log updated value
+}
+```
+
+We think this order will be less confusing when the control is checked directly.
+You will only need to update your app if it has relied on this bug to keep track of the old control value.
+If that is the case, you should be able to track the old value directly by saving it on your component.

 <a name="5.2.6"></a>
 ## [5.2.6](https://github.com/angular/angular/compare/5.2.5...5.2.6) (2018-02-22)
@ -443,7 +452,34 @@ To learn about the release highlights and our new CLI-powered update workflow fo
 * **core:** properly handle function without prototype in reflector ([#22284](https://github.com/angular/angular/issues/22284)) ([5ec38f2](https://github.com/angular/angular/commit/5ec38f2)), closes [#19978](https://github.com/angular/angular/issues/19978)
 * **core:** support metadata reflection for native class types ([#22356](https://github.com/angular/angular/issues/22356)) ([ee91de9](https://github.com/angular/angular/commit/ee91de9)), closes [#21731](https://github.com/angular/angular/issues/21731)

+<a name="6.0.0-beta.4"></a>
+# [6.0.0-beta.4](https://github.com/angular/angular/compare/6.0.0-beta.3...6.0.0-beta.4) (2018-02-14)

+### Bug Fixes
+
+* **bazel:** allow TS to read ambient typings ([#21876](https://github.com/angular/angular/issues/21876)) ([b081dfe](https://github.com/angular/angular/commit/b081dfe)), closes [#21872](https://github.com/angular/angular/issues/21872)
+* **bazel:** improve error message for missing assets ([#22096](https://github.com/angular/angular/issues/22096)) ([dcf64a0](https://github.com/angular/angular/commit/dcf64a0)), closes [#22095](https://github.com/angular/angular/issues/22095)
+* **common:** add locale currency values ([#21783](https://github.com/angular/angular/issues/21783)) ([420cc7a](https://github.com/angular/angular/commit/420cc7a)), closes [#20385](https://github.com/angular/angular/issues/20385)
+* **common:** round currencies based on decimal digits in `CurrencyPipe` ([#21783](https://github.com/angular/angular/issues/21783)) ([44154e7](https://github.com/angular/angular/commit/44154e7)), closes [#10189](https://github.com/angular/angular/issues/10189)
+* **common:** weaken AsyncPipe transform signature ([#22169](https://github.com/angular/angular/issues/22169)) ([be59c3a](https://github.com/angular/angular/commit/be59c3a))
+* **compiler:** make unary plus operator consistent to JavaScript ([#22154](https://github.com/angular/angular/issues/22154)) ([72f8abd](https://github.com/angular/angular/commit/72f8abd)), closes [#22089](https://github.com/angular/angular/issues/22089)
+* **core:** add stacktrace in log when error during cleanup component in TestBed ([#22162](https://github.com/angular/angular/issues/22162)) ([16d1700](https://github.com/angular/angular/commit/16d1700))
+* **core:** ensure initial value of QueryList length ([#21980](https://github.com/angular/angular/issues/21980)) ([#21982](https://github.com/angular/angular/issues/21982)) ([e56de10](https://github.com/angular/angular/commit/e56de10)), closes [#21980](https://github.com/angular/angular/issues/21980)
+* **core:** use appropriate inert document strategy for Firefox & Safari ([#17019](https://github.com/angular/angular/issues/17019)) ([a751649](https://github.com/angular/angular/commit/a751649))
+* **forms:** make Validators.email support optional controls ([#20869](https://github.com/angular/angular/issues/20869)) ([140e7c0](https://github.com/angular/angular/commit/140e7c0))
+* **forms:** prevent event emission on enable/disable when emitEvent is false ([#12366](https://github.com/angular/angular/issues/12366)) ([#21018](https://github.com/angular/angular/issues/21018)) ([0bcfae7](https://github.com/angular/angular/commit/0bcfae7))
+* **forms:** set state before emitting a value from ngModelChange ([#21514](https://github.com/angular/angular/issues/21514)) ([9744a1c](https://github.com/angular/angular/commit/9744a1c)), closes [#21513](https://github.com/angular/angular/issues/21513)
+* **language-service:** correct instructions to install the language service ([#22000](https://github.com/angular/angular/issues/22000)) ([b37cee3](https://github.com/angular/angular/commit/b37cee3))
+* **platform-browser:** add @Injectable where it was missing ([#22005](https://github.com/angular/angular/issues/22005)) ([0a1a397](https://github.com/angular/angular/commit/0a1a397))
+* **platform-browser:** support 0/false/null values in transfer_state ([#22179](https://github.com/angular/angular/issues/22179)) ([6435ecd](https://github.com/angular/angular/commit/6435ecd))
+
+
+### Features
+
+* **bazel:** allow explicit specification of factories ([#22003](https://github.com/angular/angular/issues/22003)) ([e442881](https://github.com/angular/angular/commit/e442881))
+* **compiler:** mark @NgModules in provider lists for identification at runtime ([#22005](https://github.com/angular/angular/issues/22005)) ([2d5e7d1](https://github.com/angular/angular/commit/2d5e7d1))
+* **forms:** multiple validators for array method ([#20766](https://github.com/angular/angular/issues/20766)) ([941e88f](https://github.com/angular/angular/commit/941e88f)), closes [#20665](https://github.com/angular/angular/issues/20665)
+* change @Injectable() to support tree-shakeable tokens ([#22005](https://github.com/angular/angular/issues/22005)) ([235a235](https://github.com/angular/angular/commit/235a235))

 <a name="5.2.5"></a>
 ## [5.2.5](https://github.com/angular/angular/compare/5.2.4...5.2.5) (2018-02-14)
@ -462,6 +498,34 @@ To learn about the release highlights and our new CLI-powered update workflow fo
 * **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 existence 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>
@ -477,6 +541,17 @@ To learn about the release highlights and our new CLI-powered update workflow fo



+<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)

@ -494,6 +569,32 @@ To learn about the release highlights and our new CLI-powered update workflow fo



+<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)

@ -513,6 +614,36 @@ To learn about the release highlights and our new CLI-powered update workflow fo



+<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)

--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -227,15 +227,10 @@ The following is the list of supported scopes:

 There are currently a few exceptions to the "use package name" rule:

-* **packaging**: used for changes that change the npm package layout in all of our packages, e.g.
-  public path changes, package.json changes done to all packages, d.ts file/format changes, changes
-  to bundles, etc.
+* **packaging**: used for changes that change the npm package layout in all of our packages, e.g. public path changes, package.json changes done to all packages, d.ts file/format changes, changes to bundles, etc.
 * **changelog**: used for updating the release notes in CHANGELOG.md
-* **docs-infra**: used for docs-app (angular.io) related changes within the /aio directory of the
-  repo
-* none/empty string: useful for `style`, `test` and `refactor` changes that are done across all
-  packages (e.g. `style: add missing semicolons`) and for docs changes that are not related to a
-  specific package (e.g. `docs: fix typo in tutorial`).
+* **aio**: used for docs-app (angular.io) related changes within the /aio directory of the repo
+* none/empty string: useful for `style`, `test` and `refactor` changes that are done across all packages (e.g. `style: add missing semicolons`)

 ### Subject
 The subject contains a succinct description of the change:
@ -274,7 +269,7 @@ changes to be accepted, the CLA must be signed. It's a quick process, we promise
  * 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.
+  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>

--- a/README.md
+++ b/README.md
@ -5,6 +5,10 @@
 [![npm version](https://badge.fury.io/js/%40angular%2Fcore.svg)](https://www.npmjs.com/@angular/core)


+[![Sauce Test Status](https://saucelabs.com/browser-matrix/angular2-ci.svg)](https://saucelabs.com/u/angular2-ci)
+
+*Safari (7+), iOS (7+) and IE mobile (11) are tested on [BrowserStack][browserstack].*
+
 # Angular

 Angular is a development platform for building mobile and desktop web applications using Typescript/JavaScript and other languages.
@ -13,19 +17,12 @@ Angular is a development platform for building mobile and desktop web applicatio

 [Get started in 5 minutes][quickstart].

-
-## Changelog
-
-[Learn about the latest improvements][changelog]. 
-
-
 ## Want to help?

 Want to file a bug, contribute some code, or improve documentation? Excellent! Read up on our
 guidelines for [contributing][contributing] and then check out one of our issues in the [hotlist: community-help](https://github.com/angular/angular/labels/hotlist%3A%20community-help).

 [browserstack]: https://www.browserstack.com/automate/public-build/LzF3RzBVVGt6VWE2S0hHaC9uYllOZz09LS1BVjNTclBKV0x4eVRlcjA4QVY1M0N3PT0=--eb4ce8c8dc2c1c5b2b5352d473ee12a73ac20e06
-[contributing]: https://github.com/angular/angular/blob/master/CONTRIBUTING.md
-[quickstart]: https://angular.io/guide/quickstart
-[changelog]: https://github.com/angular/angular/blob/master/CHANGELOG.md
-[ng]: https://angular.io
+[contributing]: http://github.com/angular/angular/blob/master/CONTRIBUTING.md
+[quickstart]: https://angular.io/docs/ts/latest/quickstart.html
+[ng]: http://angular.io
--- a/144
+++ b/144
@ -1,28 +1,56 @@
 workspace(name = "angular")

-#
-# Download Bazel toolchain dependencies as needed by build actions
-#
-
 http_archive(
    name = "build_bazel_rules_nodejs",
-    url = "https://github.com/bazelbuild/rules_nodejs/archive/0.9.1.zip",
-    strip_prefix = "rules_nodejs-0.9.1",
-    sha256 = "6139762b62b37c1fd171d7f22aa39566cb7dc2916f0f801d505a9aaf118c117f",
+    url = "https://github.com/bazelbuild/rules_nodejs/archive/1931156c232a08356dfda02e9c8b0275c2e63c00.zip",
+    strip_prefix = "rules_nodejs-1931156c232a08356dfda02e9c8b0275c2e63c00",
+    sha256 = "9cfe33276a6ac0076ee9ee159c4a2576f9851c0f437435b5ac19b2e592493078",
 )

-http_archive(
-    name = "io_bazel_rules_webtesting",
-    url = "https://github.com/bazelbuild/rules_webtesting/archive/v0.2.0.zip",
-    strip_prefix = "rules_webtesting-0.2.0",
-    sha256 = "cecc12f07e95740750a40d38e8b14b76fefa1551bef9332cb432d564d693723c",
+load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
+
+check_bazel_version("0.11.1")
+node_repositories(package_json = ["//:package.json"])
+
+yarn_install(
+    name = "ts-api-guardian_runtime_deps",
+    package_json = "//tools/ts-api-guardian:package.json",
+    yarn_lock = "//tools/ts-api-guardian:yarn.lock",
 )

 http_archive(
    name = "build_bazel_rules_typescript",
-    url = "https://github.com/bazelbuild/rules_typescript/archive/0.15.0.zip",
-    strip_prefix = "rules_typescript-0.15.0",
-    sha256 = "1aa75917330b820cb239b3c10a936a10f0a46fe215063d4492dd76dc6e1616f4",
+    url = "https://github.com/bazelbuild/rules_typescript/archive/0.12.1.zip",
+    strip_prefix = "rules_typescript-0.12.1",
+    sha256 = "24e2c36f60508c6d270ae4265b89b381e3f66d550e70c367ed3755ad8d7ce3b0",
+)
+
+load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
+
+ts_setup_workspace()
+
+local_repository(
+    name = "rxjs",
+    path = "node_modules/rxjs/src",
+)
+
+# Point to the integration test workspace just so that Bazel doesn't descend into it
+# when expanding the //... pattern
+local_repository(
+    name = "bazel_integration_test",
+    path = "integration/bazel",
+)
+
+# This commit matches the version of buildifier in angular/ngcontainer
+# If you change this, also check if it matches the version in the angular/ngcontainer
+# version in /.circleci/config.yml
+BAZEL_BUILDTOOLS_VERSION = "70bc7843bb9950fece2bc014ed16de03419e36e2"
+
+http_archive(
+    name = "com_github_bazelbuild_buildtools",
+    url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % BAZEL_BUILDTOOLS_VERSION,
+    strip_prefix = "buildtools-%s" % BAZEL_BUILDTOOLS_VERSION,
+    sha256 = "367c23a5fe7fc2a7cb57863d3718b4149f0e57426c48c8ad54c45348a0b53cc1",
 )

 http_archive(
@ -31,24 +59,18 @@ http_archive(
    sha256 = "feba3278c13cde8d67e341a837f69a029f698d7a27ddbb2a202be7a10b22142a",
 )

-# This commit matches the version of buildifier in angular/ngcontainer
-# If you change this, also check if it matches the version in the angular/ngcontainer
-# version in /.circleci/config.yml
-BAZEL_BUILDTOOLS_VERSION = "82b21607e00913b16fe1c51bec80232d9d6de31c"
+load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")

-http_archive(
-    name = "com_github_bazelbuild_buildtools",
-    url = "https://github.com/bazelbuild/buildtools/archive/%s.zip" % BAZEL_BUILDTOOLS_VERSION,
-    strip_prefix = "buildtools-%s" % BAZEL_BUILDTOOLS_VERSION,
-    sha256 = "edb24c2f9c55b10a820ec74db0564415c0cf553fa55e9fc709a6332fb6685eff",
-)
+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/968f87900dce45a7af749a965b72dbac51b176b3.zip",
-    strip_prefix = "bazel-968f87900dce45a7af749a965b72dbac51b176b3",
-    sha256 = "e373d2ae24955c1254c495c9c421c009d88966565c35e4e8444c082cb1f0f48f",
+    url = "https://github.com/bazelbuild/bazel/archive/5a35e72f9e97c06540c479f8c31512fb4656202f.zip",
+    strip_prefix = "bazel-5a35e72f9e97c06540c479f8c31512fb4656202f",
+    sha256 = "ed33a52874c14e3b487fb50f390c541fab9c81a33d986d38fb01766a66dbcd21",
 )

 # We have a source dependency on the Devkit repository, because it's built with
@ -66,67 +88,7 @@ http_archive(

 http_archive(
    name = "org_brotli",
-    url = "https://github.com/google/brotli/archive/f9b8c02673c576a3e807edbf3a9328e9e7af6d7c.zip",
-    strip_prefix = "brotli-f9b8c02673c576a3e807edbf3a9328e9e7af6d7c",
-    sha256 = "8a517806d2b7c8505ba5c53934e7d7c70d341b68ffd268e9044d35b564a48828",
-)
-
-#
-# Load and install our dependencies downloaded above.
-#
-
-load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")
-
-check_bazel_version("0.14.0")
-node_repositories(package_json = ["//:package.json"])
-
-load("@io_bazel_rules_go//go:def.bzl", "go_rules_dependencies", "go_register_toolchains")
-
-go_rules_dependencies()
-go_register_toolchains()
-
-load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories")
-
-web_test_repositories()
-browser_repositories(
-    chromium = True,
-    firefox = True,
-)
-
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
-
-ts_setup_workspace()
-
-#
-# Point Bazel to WORKSPACEs that live in subdirectories
-#
-
-local_repository(
-    name = "rxjs",
-    path = "node_modules/rxjs/src",
-)
-
-# Point to the integration test workspace just so that Bazel doesn't descend into it
-# when expanding the //... pattern
-local_repository(
-    name = "bazel_integration_test",
-    path = "integration/bazel",
-)
-
-#
-# Ask Bazel to manage these toolchain dependencies for us.
-# Bazel will run `yarn install` when one of these toolchains is requested during
-# a build.
-#
-
-yarn_install(
-    name = "ts-api-guardian_runtime_deps",
-    package_json = "//tools/ts-api-guardian:package.json",
-    yarn_lock = "//tools/ts-api-guardian:yarn.lock",
-)
-
-yarn_install(
-    name = "http-server_runtime_deps",
-    package_json = "//tools/http-server:package.json",
-    yarn_lock = "//tools/http-server:yarn.lock",
+    url = "https://github.com/google/brotli/archive/c6333e1e79fb62ea088443f192293f964409b04e.zip",
+    strip_prefix = "brotli-c6333e1e79fb62ea088443f192293f964409b04e",
+    sha256 = "3f781988dee7dd3bcce2bf238294663cfaaf3b6433505bdb762e24d0a284d1dc",
 )
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/clean-up/build-cleaner.ts
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/clean-up/build-cleaner.ts
@ -52,7 +52,8 @@ export class BuildCleaner {
  protected removeDir(dir: string) {
    try {
      if (shell.test('-d', dir)) {
-        shell.chmod('-R', 'a+w', dir);
+        // Undocumented signature (see https://github.com/shelljs/shelljs/pull/663).
+        (shell as any).chmod('-R', 'a+w', dir);
        shell.rm('-rf', dir);
      }
    } catch (err) {
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/build-creator.ts
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/upload-server/build-creator.ts
@ -106,7 +106,8 @@ export class BuildCreator extends EventEmitter {
        }

        try {
-          shell.chmod('-R', 'a-w', outputDir);
+          // Undocumented signature (see https://github.com/shelljs/shelljs/pull/663).
+          (shell as any).chmod('-R', 'a-w', outputDir);
          shell.rm('-f', inputFile);
          resolve();
        } catch (err) {
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/helper.ts
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/lib/verify-setup/helper.ts
@ -98,7 +98,8 @@ class Helper {
    const prDir = this.getPrDir(pr, isPublic);

    if (fs.existsSync(prDir)) {
-      shell.chmod('-R', 'a+w', prDir);
+      // Undocumented signature (see https://github.com/shelljs/shelljs/pull/663).
+      (shell as any).chmod('-R', 'a+w', prDir);
      shell.rm('-rf', prDir);
    }
  }
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/package.json
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/package.json
@ -8,7 +8,7 @@
  "scripts": {
    "prebuild": "yarn clean-dist",
    "build": "tsc",
-    "build-watch": "yarn build --watch",
+    "build-watch": "yarn tsc --watch",
    "clean-dist": "node --eval \"require('shelljs').rm('-rf', 'dist')\"",
    "dev": "concurrently --kill-others --raw --success first \"yarn build-watch\" \"yarn test-watch\"",
    "lint": "tslint --project tsconfig.json",
@ -33,7 +33,7 @@
    "@types/jasmine": "^2.6.0",
    "@types/jsonwebtoken": "^7.2.3",
    "@types/node": "^8.0.30",
-    "@types/shelljs": "^0.8.0",
+    "@types/shelljs": "^0.7.4",
    "@types/supertest": "^2.0.3",
    "concurrently": "^3.5.0",
    "nodemon": "^1.12.1",
--- a/aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock
+++ b/aio/aio-builds-setup/dockerbuild/scripts-js/yarn.lock
@ -69,9 +69,9 @@
    "@types/express-serve-static-core" "*"
    "@types/mime" "*"

-"@types/shelljs@^0.8.0":
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.8.0.tgz#0caa56b68baae4f68f44e0dd666ab30b098e3632"
+"@types/shelljs@^0.7.4":
+  version "0.7.4"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.4.tgz#137b5f31306eaff4de120ffe5b9d74b297809cfc"
  dependencies:
    "@types/glob" "*"
    "@types/node" "*"
--- a/aio/aio-builds-setup/scripts/update-preview-server.sh
+++ b/aio/aio-builds-setup/scripts/update-preview-server.sh
@ -3,7 +3,7 @@
 set -eux -o pipefail
 exec 3>&1

-echo -e "\n\n[`date`] - Updating the preview server..."
+echo "\n\n[`date`] - Updating the preview server..."

 # Input
 readonly HOST_REPO_DIR=$1
--- a/aio/angular.json
+++ b/aio/angular.json
@ -8,7 +8,6 @@
  "projects": {
    "site": {
      "root": "",
-      "sourceRoot": "src",
      "projectType": "application",
      "architect": {
        "build": {
@ -30,12 +29,36 @@
            "vendorChunk": false,
            "polyfills": "src/polyfills.ts",
            "assets": [
-              "src/assets",
-              "src/generated",
-              "src/app/search/search-worker.js",
-              "src/favicon.ico",
-              "src/pwa-manifest.json",
-              "src/google385281288605d160.html",
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/generated",
+                "output": "/generated"
+              },
+              {
+                "glob": "app/search/search-worker.js",
+                "input": "src",
+                "output": "/"
+              },
+              {
+                "glob": "favicon.ico",
+                "input": "src",
+                "output": "/"
+              },
+              {
+                "glob": "pwa-manifest.json",
+                "input": "src",
+                "output": "/"
+              },
+              {
+                "glob": "google385281288605d160.html",
+                "input": "src",
+                "output": "/"
+              },
              {
                "glob": "custom-elements.min.js",
                "input": "node_modules/@webcomponents/custom-elements",
@ -48,14 +71,14 @@
              }
            ],
            "styles": [
-              "src/styles.scss"
+              {
+                "input": "src/styles.scss"
+              }
            ],
-            "scripts": []
+            "scripts": [],
+
          },
          "configurations": {
-            "fast": {
-              "optimization": false
-            },
            "next": {
              "fileReplacements": [
                {
@ -88,9 +111,6 @@
            "browserTarget": "site:build"
          },
          "configurations": {
-            "fast": {
-              "browserTarget": "site:build:fast"
-            },
            "next": {
              "browserTarget": "site:build:next"
            },
@ -117,15 +137,41 @@
            "tsConfig": "src/tsconfig.spec.json",
            "scripts": [],
            "styles": [
-              "src/styles.scss"
+              {
+                "input": "src/styles.scss"
+              }
            ],
            "assets": [
-              "src/assets",
-              "src/generated",
-              "src/app/search/search-worker.js",
-              "src/favicon.ico",
-              "src/pwa-manifest.json",
-              "src/google385281288605d160.html",
+              {
+                "glob": "**/*",
+                "input": "src/assets",
+                "output": "/assets"
+              },
+              {
+                "glob": "**/*",
+                "input": "src/generated",
+                "output": "/generated"
+              },
+              {
+                "glob": "app/search/search-worker.js",
+                "input": "src",
+                "output": "/"
+              },
+              {
+                "glob": "favicon.ico",
+                "input": "src",
+                "output": "/"
+              },
+              {
+                "glob": "pwa-manifest.json",
+                "input": "src",
+                "output": "/"
+              },
+              {
+                "glob": "google385281288605d160.html",
+                "input": "src",
+                "output": "/"
+              },
              {
                "glob": "custom-elements.min.js",
                "input": "node_modules/@webcomponents/custom-elements",
@ -186,4 +232,4 @@
      "prefix": "aio"
    }
  }
-}
+}
--- a/aio/content/examples/.DS_Store
+++ b/aio/content/examples/.DS_Store
--- a/aio/content/examples/cli-quickstart/README.md
+++ b/aio/content/examples/cli-quickstart/README.md
@ -0,0 +1,27 @@
+# MasterProject
+
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 1.0.0-rc.0.
+
+## Development server
+Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+
+## Code scaffolding
+
+Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/class/module`.
+
+## Build
+
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
+
+## Running unit tests
+
+Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
+
+## Running end-to-end tests
+
+Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+Before running the tests make sure you are serving the app via `ng serve`.
+
+## Further help
+
+To get more help on the Angular CLI use `ng help` or go check out the [Angular CLI README](https://github.com/angular/angular-cli/blob/master/README.md).
--- a/aio/content/examples/cli-quickstart/zipper.json
+++ b/aio/content/examples/cli-quickstart/zipper.json
@ -3,7 +3,7 @@
    "!**/*.d.ts",
    "!**/*.js",
    "!**/*.[0-9].*",
-    "angular.json",
+    ".angular-cli.json",
    "protractor.conf.js"
  ]
 }
--- a/aio/content/examples/component-interaction/src/app/voter.component.ts
+++ b/aio/content/examples/component-interaction/src/app/voter.component.ts
@ -5,18 +5,18 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
  selector: 'app-voter',
  template: `
    <h4>{{name}}</h4>
-    <button (click)="vote(true)"  [disabled]="didVote">Agree</button>
-    <button (click)="vote(false)" [disabled]="didVote">Disagree</button>
+    <button (click)="vote(true)"  [disabled]="voted">Agree</button>
+    <button (click)="vote(false)" [disabled]="voted">Disagree</button>
  `
 })
 export class VoterComponent {
  @Input()  name: string;
-  @Output() voted = new EventEmitter<boolean>();
-  didVote = false;
+  @Output() onVoted = new EventEmitter<boolean>();
+  voted = false;

  vote(agreed: boolean) {
-    this.voted.emit(agreed);
-    this.didVote = true;
+    this.onVoted.emit(agreed);
+    this.voted = true;
  }
 }
 // #enddocregion
--- a/aio/content/examples/component-interaction/src/app/votetaker.component.ts
+++ b/aio/content/examples/component-interaction/src/app/votetaker.component.ts
@ -8,7 +8,7 @@ import { Component }      from '@angular/core';
    <h3>Agree: {{agreed}}, Disagree: {{disagreed}}</h3>
    <app-voter *ngFor="let voter of voters"
      [name]="voter"
-      (voted)="onVoted($event)">
+      (onVoted)="onVoted($event)">
    </app-voter>
  `
 })
--- 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
@ -5,7 +5,7 @@ import { AbstractControl, NG_VALIDATORS, Validator, ValidatorFn, Validators } fr
 // #docregion custom-validator
 /** A hero's name can't match the given regular expression */
 export function forbiddenNameValidator(nameRe: RegExp): ValidatorFn {
-  return (control: AbstractControl): {[key: string]: any} | null => {
+  return (control: AbstractControl): {[key: string]: any} => {
    const forbidden = nameRe.test(control.value);
    return forbidden ? {'forbiddenName': {value: control.value}} : null;
  };
@ -22,7 +22,7 @@ export function forbiddenNameValidator(nameRe: RegExp): ValidatorFn {
 export class ForbiddenValidatorDirective implements Validator {
  @Input('appForbiddenName') forbiddenName: string;

-  validate(control: AbstractControl): {[key: string]: any} | null {
+  validate(control: AbstractControl): {[key: string]: any} {
    return this.forbiddenName ? forbiddenNameValidator(new RegExp(this.forbiddenName, 'i'))(control)
                              : null;
  }
--- a/aio/content/examples/http/src/testing/http-client.spec.ts
+++ b/aio/content/examples/http/src/testing/http-client.spec.ts
@ -150,7 +150,7 @@ describe('HttpClient testing', () => {

    // Create mock ErrorEvent, raised when something goes wrong at the network level.
    // Connection timeout, DNS error, offline, etc
-    const mockError = new ErrorEvent('Network error', {
+    const errorEvent = new ErrorEvent('so sad', {
      message: emsg,
      // #enddocregion network-error
      // The rest of this is optional and not used.
@ -162,7 +162,7 @@ describe('HttpClient testing', () => {
    });

    // Respond with mock error
-    req.error(mockError);
+    req.error(errorEvent);
  });
  // #enddocregion network-error

--- a/aio/content/examples/lifecycle-hooks/src/app/counter.component.ts
+++ b/aio/content/examples/lifecycle-hooks/src/app/counter.component.ts
@ -38,6 +38,8 @@ export class MyCounterComponent implements OnChanges {
  }
 }

+/***************************************/
+
@Component({
  selector: 'counter-parent',
  template: `
--- a/aio/content/examples/lifecycle-hooks/src/app/do-check.component.ts
+++ b/aio/content/examples/lifecycle-hooks/src/app/do-check.component.ts
@ -72,6 +72,8 @@ export class DoCheckComponent implements DoCheck {
  }
 }

+/***************************************/
+
@Component({
  selector: 'do-check-parent',
  templateUrl: './do-check-parent.component.html',
--- a/aio/content/examples/lifecycle-hooks/src/app/on-changes.component.ts
+++ b/aio/content/examples/lifecycle-hooks/src/app/on-changes.component.ts
@ -46,6 +46,8 @@ export class OnChangesComponent implements OnChanges {
  reset() { this.changeLog = []; }
 }

+/***************************************/
+
@Component({
  selector: 'on-changes-parent',
  templateUrl: './on-changes-parent.component.html',
--- a/aio/content/examples/pipes/src/app/app.module.ts
+++ b/aio/content/examples/pipes/src/app/app.module.ts
@ -2,7 +2,7 @@
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
-import { HttpClientModule } from '@angular/common/http';
+import { HttpClientModule } from '@angular//common/http';

 import { AppComponent } from './app.component';
 import {
--- a/aio/content/examples/router/src/app/compose-message.component.ts
+++ b/aio/content/examples/router/src/app/compose-message.component.ts
@ -15,7 +15,6 @@ export class ComposeMessageComponent {
  @HostBinding('style.position')  position = 'absolute';

  details: string;
-  message: string;
  sending = false;

  constructor(private router: Router) {}
--- a/aio/content/examples/service-worker-getting-started/src/ngsw-config.json
+++ b/aio/content/examples/service-worker-getting-started/src/ngsw-config.json
@ -7,9 +7,12 @@
    "resources": {
      "files": [
        "/favicon.ico",
-        "/index.html",
-        "/*.css",
-        "/*.js"
+        "/index.html"
+      ],
+      "versionedFiles": [
+        "/*.bundle.css",
+        "/*.bundle.js",
+        "/*.chunk.js"
      ]
    }
  }, {
@ -22,4 +25,4 @@
      ]
    }
  }]
-}
+}
--- a/aio/content/examples/testing/src/tests.sb.ts
+++ b/aio/content/examples/testing/src/tests.sb.ts
@ -1,26 +1,26 @@
 // Import spec files individually for Stackblitz
-import './app/about/about.component.spec.ts';
-import './app/app-initial.component.spec.ts';
-import './app/app.component.router.spec.ts';
-import './app/app.component.spec.ts';
-import './app/banner/banner-initial.component.spec.ts';
-import './app/banner/banner.component.spec.ts';
-import './app/banner/banner.component.detect-changes.spec.ts';
-import './app/banner/banner-external.component.spec.ts';
-import './app/dashboard/dashboard-hero.component.spec.ts';
-import './app/dashboard/dashboard.component.no-testbed.spec.ts';
-import './app/dashboard/dashboard.component.spec.ts';
-import './app/demo/async-helper.spec.ts';
-import './app/demo/demo.spec.ts';
-import './app/demo/demo.testbed.spec.ts';
-import './app/hero/hero-detail.component.no-testbed.spec.ts';
-import './app/hero/hero-detail.component.spec.ts';
-import './app/hero/hero-list.component.spec.ts';
-import './app/model/hero.service.spec.ts';
-import './app/model/http-hero.service.spec.ts';
-import './app/model/testing/http-client.spec.ts';
-import './app/shared/highlight.directive.spec.ts';
-import './app/shared/title-case.pipe.spec.ts';
-import './app/twain/twain.component.spec.ts';
-import './app/twain/twain.component.marbles.spec.ts';
-import './app/welcome/welcome.component.spec.ts';
+import 'app/about/about.component.spec.ts';
+import 'app/app-initial.component.spec.ts';
+import 'app/app.component.router.spec.ts';
+import 'app/app.component.spec.ts';
+import 'app/banner/banner-initial.component.spec.ts';
+import 'app/banner/banner.component.spec.ts';
+import 'app/banner/banner.component.detect-changes.spec.ts';
+import 'app/banner/banner-external.component.spec.ts';
+import 'app/dashboard/dashboard-hero.component.spec.ts';
+import 'app/dashboard/dashboard.component.no-testbed.spec.ts';
+import 'app/dashboard/dashboard.component.spec.ts';
+import 'app/demo/async-helper.spec.ts';
+import 'app/demo/demo.spec.ts';
+import 'app/demo/demo.testbed.spec.ts';
+import 'app/hero/hero-detail.component.no-testbed.spec.ts';
+import 'app/hero/hero-detail.component.spec.ts';
+import 'app/hero/hero-list.component.spec.ts';
+import 'app/model/hero.service.spec.ts';
+import 'app/model/http-hero.service.spec.ts';
+import 'app/model/testing/http-client.spec.ts';
+import 'app/shared/highlight.directive.spec.ts';
+import 'app/shared/title-case.pipe.spec.ts';
+import 'app/twain/twain.component.spec.ts';
+import 'app/twain/twain.component.marbles.spec.ts';
+import 'app/welcome/welcome.component.spec.ts';
--- a/aio/content/examples/toh-pt5/src/app/app.component.css
+++ b/aio/content/examples/toh-pt5/src/app/app.component.css
@ -18,11 +18,11 @@ nav a {
  border-radius: 4px;
 }
 nav a:visited, a:link {
-  color: #607d8b;
+  color: #607D8B;
 }
 nav a:hover {
  color: #039be5;
-  background-color: #cfd8dc;
+  background-color: #CFD8DC;
 }
 nav a.active {
  color: #039be5;
--- a/aio/content/examples/toh-pt5/src/app/dashboard/dashboard.component.css
+++ b/aio/content/examples/toh-pt5/src/app/dashboard/dashboard.component.css
@ -33,11 +33,11 @@ h4 {
  color: #eee;
  max-height: 120px;
  min-width: 120px;
-  background-color: #607d8b;
+  background-color: #607D8B;
  border-radius: 2px;
 }
 .module:hover {
-  background-color: #eee;
+  background-color: #EEE;
  cursor: pointer;
  color: #607d8b;
 }
--- a/aio/content/examples/toh-pt6/src/app/hero.service.ts
+++ b/aio/content/examples/toh-pt6/src/app/hero.service.ts
@ -84,7 +84,7 @@ export class HeroService {
      // if not search term, return empty hero array.
      return of([]);
    }
-    return this.http.get<Hero[]>(`${this.heroesUrl}/?name=${term}`).pipe(
+    return this.http.get<Hero[]>(`api/heroes/?name=${term}`).pipe(
      tap(_ => this.log(`found heroes matching "${term}"`)),
      catchError(this.handleError<Hero[]>('searchHeroes', []))
    );
--- a/aio/content/examples/universal/server.ts
+++ b/aio/content/examples/universal/server.ts
@ -17,7 +17,7 @@ const PORT = process.env.PORT || 4000;
 const DIST_FOLDER = join(process.cwd(), 'dist');

 // * NOTE :: leave this as require() since this file is built Dynamically from webpack
-const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main');
+const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main.bundle');

 // Express Engine
 import { ngExpressEngine } from '@nguniversal/express-engine';
@ -51,7 +51,7 @@ app.get('*.*', express.static(join(DIST_FOLDER, 'browser')));
 // #docregion navigation-request
 // All regular routes use the Universal engine
 app.get('*', (req, res) => {
-  res.render('index', { req });
+  res.render(join(DIST_FOLDER, 'browser', 'index.html'), { req });
 });
 // #enddocregion navigation-request

--- a/aio/content/examples/universal/src/app/hero.service.ts
+++ b/aio/content/examples/universal/src/app/hero.service.ts
@ -64,7 +64,7 @@ export class HeroService {
      // if not search term, return empty hero array.
      return of([]);
    }
-    return this.http.get<Hero[]>(`${this.heroesUrl}/?name=${term}`).pipe(
+    return this.http.get<Hero[]>(`api/heroes/?name=${term}`).pipe(
      tap(_ => this.log(`found heroes matching "${term}"`)),
      catchError(this.handleError<Hero[]>('searchHeroes', []))
    );
--- a/aio/content/examples/universal/webpack.server.config.js
+++ b/aio/content/examples/universal/webpack.server.config.js
@ -5,9 +5,8 @@ module.exports = {
  entry: { server: './server.ts' },
  resolve: { extensions: ['.js', '.ts'] },
  target: 'node',
-  mode: 'none',
  // this makes sure we include node_modules and other 3rd party libraries
-  externals: [/node_modules/],
+  externals: [/(node_modules|main\..*\.js)/],
  output: {
    path: path.join(__dirname, 'dist'),
    filename: '[name].js'
--- a/aio/content/examples/webpack/config/helpers.js
+++ b/aio/content/examples/webpack/config/helpers.js
@ -0,0 +1,12 @@
+// #docregion
+var path = require('path');
+
+var _root = path.resolve(__dirname, '..');
+
+function root(args) {
+  args = Array.prototype.slice.call(arguments, 0);
+  return path.join.apply(path, [_root].concat(args));
+}
+
+exports.root = root;
+// #enddocregion
--- a/aio/content/examples/webpack/config/karma-test-shim.js
+++ b/aio/content/examples/webpack/config/karma-test-shim.js
@ -0,0 +1,17 @@
+// #docregion
+Error.stackTraceLimit = Infinity;
+
+require('core-js/es6');
+require('core-js/es7/reflect');
+
+require('zone.js/dist/zone');
+require('zone.js/dist/zone-testing');
+
+var appContext = require.context('../src', true, /\.spec\.ts/);
+
+appContext.keys().forEach(appContext);
+
+var testing = require('@angular/core/testing');
+var browser = require('@angular/platform-browser-dynamic/testing');
+
+testing.TestBed.initTestEnvironment(browser.BrowserDynamicTestingModule, browser.platformBrowserDynamicTesting());
--- a/aio/content/examples/webpack/config/karma.conf.js
+++ b/aio/content/examples/webpack/config/karma.conf.js
@ -0,0 +1,39 @@
+// #docregion
+var webpackConfig = require('./webpack.test');
+
+module.exports = function (config) {
+  var _config = {
+    basePath: '',
+
+    frameworks: ['jasmine'],
+
+    files: [
+      {pattern: './config/karma-test-shim.js', watched: false}
+    ],
+
+    preprocessors: {
+      './config/karma-test-shim.js': ['webpack', 'sourcemap']
+    },
+
+    webpack: webpackConfig,
+
+    webpackMiddleware: {
+      stats: 'errors-only'
+    },
+
+    webpackServer: {
+      noInfo: true
+    },
+
+    reporters: ['progress', 'kjhtml'],
+    port: 9876,
+    colors: true,
+    logLevel: config.LOG_INFO,
+    autoWatch: false,
+    browsers: ['Chrome'],
+    singleRun: true
+  };
+
+  config.set(_config);
+};
+// #enddocregion
--- a/aio/content/examples/webpack/config/webpack.common.js
+++ b/aio/content/examples/webpack/config/webpack.common.js
@ -0,0 +1,81 @@
+// #docplaster
+// #docregion
+var webpack = require('webpack');
+var HtmlWebpackPlugin = require('html-webpack-plugin');
+var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var helpers = require('./helpers');
+
+module.exports = {
+  // #docregion entries, one-entry, two-entries
+  entry: {
+    // #enddocregion one-entry, two-entries
+    'polyfills': './src/polyfills.ts',
+    // #docregion two-entries
+    'vendor': './src/vendor.ts',
+    // #docregion one-entry
+    'app': './src/main.ts'
+  },
+  // #enddocregion entries, one-entry, two-entries
+
+  // #docregion resolve
+  resolve: {
+    extensions: ['.ts', '.js']
+  },
+  // #enddocregion resolve
+
+  // #docregion loaders
+  module: {
+    rules: [
+      {
+        test: /\.ts$/,
+        loaders: [
+          {
+            loader: 'awesome-typescript-loader',
+            options: { configFileName: helpers.root('src', 'tsconfig.json') }
+          } , 'angular2-template-loader'
+        ]
+      },
+      {
+        test: /\.html$/,
+        loader: 'html-loader'
+      },
+      {
+        test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
+        loader: 'file-loader?name=assets/[name].[hash].[ext]'
+      },
+      {
+        test: /\.css$/,
+        exclude: helpers.root('src', 'app'),
+        loader: ExtractTextPlugin.extract({ fallbackLoader: 'style-loader', loader: 'css-loader?sourceMap' })
+      },
+      {
+        test: /\.css$/,
+        include: helpers.root('src', 'app'),
+        loader: 'raw-loader'
+      }
+    ]
+  },
+  // #enddocregion loaders
+
+  // #docregion plugins
+  plugins: [
+    // Workaround for angular/angular#11580
+    new webpack.ContextReplacementPlugin(
+      // The (\\|\/) piece accounts for path separators in *nix and Windows
+      /angular(\\|\/)core(\\|\/)@angular/,
+      helpers.root('./src'), // location of your src
+      {} // a map of your routes
+    ),
+
+    new webpack.optimize.CommonsChunkPlugin({
+      name: ['app', 'vendor', 'polyfills']
+    }),
+
+    new HtmlWebpackPlugin({
+      template: 'src/index.html'
+    })
+  ]
+  // #enddocregion plugins
+};
+// #enddocregion
+
--- a/aio/content/examples/webpack/config/webpack.dev.js
+++ b/aio/content/examples/webpack/config/webpack.dev.js
@ -0,0 +1,26 @@
+// #docregion
+var webpackMerge = require('webpack-merge');
+var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var commonConfig = require('./webpack.common.js');
+var helpers = require('./helpers');
+
+module.exports = webpackMerge(commonConfig, {
+  devtool: 'cheap-module-eval-source-map',
+
+  output: {
+    path: helpers.root('dist'),
+    publicPath: '/',
+    filename: '[name].js',
+    chunkFilename: '[id].chunk.js'
+  },
+
+  plugins: [
+    new ExtractTextPlugin('[name].css')
+  ],
+
+  devServer: {
+    historyApiFallback: true,
+    stats: 'minimal'
+  }
+});
+// #enddocregion
--- a/aio/content/examples/webpack/config/webpack.prod.js
+++ b/aio/content/examples/webpack/config/webpack.prod.js
@ -0,0 +1,41 @@
+// #docregion
+var webpack = require('webpack');
+var webpackMerge = require('webpack-merge');
+var ExtractTextPlugin = require('extract-text-webpack-plugin');
+var commonConfig = require('./webpack.common.js');
+var helpers = require('./helpers');
+
+const ENV = process.env.NODE_ENV = process.env.ENV = 'production';
+
+module.exports = webpackMerge(commonConfig, {
+  devtool: 'source-map',
+
+  output: {
+    path: helpers.root('dist'),
+    publicPath: '/',
+    filename: '[name].[hash].js',
+    chunkFilename: '[id].[hash].chunk.js'
+  },
+
+  plugins: [
+    new webpack.NoEmitOnErrorsPlugin(),
+    new webpack.optimize.UglifyJsPlugin({ // https://github.com/angular/angular/issues/10618
+      mangle: {
+        keep_fnames: true
+      }
+    }),
+    new ExtractTextPlugin('[name].[hash].css'),
+    new webpack.DefinePlugin({
+      'process.env': {
+        'ENV': JSON.stringify(ENV)
+      }
+    }),
+    new webpack.LoaderOptionsPlugin({
+      htmlLoader: {
+        minimize: false // workaround for ng2
+      }
+    })
+  ]
+});
+
+// #enddocregion
--- a/aio/content/examples/webpack/config/webpack.test.js
+++ b/aio/content/examples/webpack/config/webpack.test.js
@ -0,0 +1,55 @@
+// #docregion
+var webpack = require('webpack');
+var helpers = require('./helpers');
+
+module.exports = {
+  devtool: 'inline-source-map',
+
+  resolve: {
+    extensions: ['.ts', '.js']
+  },
+
+  module: {
+    rules: [
+      {
+        test: /\.ts$/,
+        loaders: [
+          {
+            loader: 'awesome-typescript-loader',
+            options: { configFileName: helpers.root('src', 'tsconfig.json') }
+          } , 'angular2-template-loader'
+        ]
+      },
+      {
+        test: /\.html$/,
+        loader: 'html-loader'
+
+      },
+      {
+        test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
+        loader: 'null-loader'
+      },
+      {
+        test: /\.css$/,
+        exclude: helpers.root('src', 'app'),
+        loader: 'null-loader'
+      },
+      {
+        test: /\.css$/,
+        include: helpers.root('src', 'app'),
+        loader: 'raw-loader'
+      }
+    ]
+  },
+
+  plugins: [
+    new webpack.ContextReplacementPlugin(
+      // The (\\|\/) piece accounts for path separators in *nix and Windows
+      /angular(\\|\/)core(\\|\/)@angular/,
+      helpers.root('./src'), // location of your src
+      {} // a map of your routes
+    )
+  ]
+}
+
+// #enddocregion
--- a/aio/content/examples/webpack/e2e-spec.ts
+++ b/aio/content/examples/webpack/e2e-spec.ts
@ -0,0 +1,21 @@
+'use strict'; // necessary for es6 output in node
+
+import { browser, element, by } from 'protractor';
+
+describe('QuickStart E2E Tests', function () {
+
+  let expectedMsg = 'Hello from Angular App with Webpack';
+
+  beforeEach(function () {
+    browser.get('');
+  });
+
+  it(`should display: ${expectedMsg}`, function () {
+    expect(element(by.css('h1')).getText()).toEqual(expectedMsg);
+  });
+
+  it('should display an image', function () {
+    expect(element(by.css('img')).isPresent()).toBe(true);
+  });
+
+});
--- a/aio/content/examples/webpack/example-config.json
+++ b/aio/content/examples/webpack/example-config.json
@ -0,0 +1,5 @@
+{
+  "build": "build:webpack",
+  "run": "serve:cli",
+  "projectType": "systemjs"
+}
--- a/aio/content/examples/webpack/karma.webpack.conf.js
+++ b/aio/content/examples/webpack/karma.webpack.conf.js
@ -0,0 +1,2 @@
+// #docregion
+module.exports = require('./config/karma.conf.js');
--- a/aio/content/examples/webpack/package.webpack.json
+++ b/aio/content/examples/webpack/package.webpack.json
@ -0,0 +1,49 @@
+{
+  "name": "angular2-webpack",
+  "version": "1.0.0",
+  "description": "A webpack starter for Angular",
+  "scripts": {
+    "start": "webpack-dev-server --inline --progress --port 8080",
+    "test": "karma start",
+    "build": "rimraf dist && webpack --config config/webpack.prod.js --progress --profile --bail"
+  },
+  "license": "MIT",
+  "dependencies": {
+    "@angular/common": "~4.2.0",
+    "@angular/compiler": "~4.2.0",
+    "@angular/core": "~4.2.0",
+    "@angular/forms": "~4.2.0",
+    "@angular/http": "~4.2.0",
+    "@angular/platform-browser": "~4.2.0",
+    "@angular/platform-browser-dynamic": "~4.2.0",
+    "@angular/router": "~4.2.0",
+    "core-js": "^2.4.1",
+    "rxjs": "5.0.1",
+    "zone.js": "^0.8.4"
+  },
+  "devDependencies": {
+    "@types/node": "^6.0.45",
+    "@types/jasmine": "2.5.36",
+    "angular2-template-loader": "^0.6.0",
+    "awesome-typescript-loader": "^3.0.4",
+    "css-loader": "^0.26.1",
+    "extract-text-webpack-plugin": "2.0.0-beta.5",
+    "file-loader": "^0.9.0",
+    "html-loader": "^0.4.3",
+    "html-webpack-plugin": "^2.16.1",
+    "jasmine-core": "^2.4.1",
+    "karma": "^1.2.0",
+    "karma-chrome-launcher": "^2.0.0",
+    "karma-jasmine": "^1.0.2",
+    "karma-sourcemap-loader": "^0.3.7",
+    "karma-webpack": "^2.0.1",
+    "null-loader": "^0.1.1",
+    "raw-loader": "^0.5.1",
+    "rimraf": "^2.5.2",
+    "style-loader": "^0.13.1",
+    "typescript": "~2.3.1",
+    "webpack": "2.2.1",
+    "webpack-dev-server": "2.4.1",
+    "webpack-merge": "^3.0.0"
+  }
+}
--- a/aio/content/examples/webpack/src/app/app.component.css
+++ b/aio/content/examples/webpack/src/app/app.component.css
@ -0,0 +1,9 @@
+/* #docregion */
+main {
+  padding: 1em;
+  font-family: Arial, Helvetica, sans-serif;
+  text-align: center;
+  margin-top: 50px;
+  display: block;
+}
+/* #enddocregion */
--- a/aio/content/examples/webpack/src/app/app.component.html
+++ b/aio/content/examples/webpack/src/app/app.component.html
@ -0,0 +1,7 @@
+<!-- #docregion -->
+<main>
+  <h1>Hello from Angular App with Webpack</h1>
+
+  <img src="../assets/images/angular.png">
+</main>
+<!-- #enddocregion -->
--- a/aio/content/examples/webpack/src/app/app.component.spec.ts
+++ b/aio/content/examples/webpack/src/app/app.component.spec.ts
@ -0,0 +1,16 @@
+// #docregion
+import { TestBed } from '@angular/core/testing';
+
+import { AppComponent } from './app.component';
+
+describe('App', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({ declarations: [AppComponent]});
+  });
+
+  it ('should work', () => {
+    let fixture = TestBed.createComponent(AppComponent);
+    expect(fixture.componentInstance instanceof AppComponent).toBe(true, 'should create AppComponent');
+  });
+});
+// #enddocregion
--- a/aio/content/examples/webpack/src/app/app.component.ts
+++ b/aio/content/examples/webpack/src/app/app.component.ts
@ -0,0 +1,16 @@
+// #docplaster
+// #docregion
+// #docregion component
+import { Component } from '@angular/core';
+
+// #enddocregion component
+import '../assets/css/styles.css';
+
+// #docregion component
+@Component({
+  selector: 'my-app',
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.css']
+})
+export class AppComponent { }
+// #enddocregion
--- a/aio/content/examples/webpack/src/app/app.module.ts
+++ b/aio/content/examples/webpack/src/app/app.module.ts
@ -0,0 +1,16 @@
+// #docregion
+import { NgModule } from '@angular/core';
+import { BrowserModule }  from '@angular/platform-browser';
+
+import { AppComponent } from './app.component';
+
+@NgModule({
+  imports: [
+    BrowserModule
+  ],
+  declarations: [
+    AppComponent
+  ],
+  bootstrap: [ AppComponent ]
+})
+export class AppModule { }
--- a/aio/content/examples/webpack/src/assets/css/styles.css
+++ b/aio/content/examples/webpack/src/assets/css/styles.css
@ -0,0 +1,6 @@
+/* #docregion */
+body {
+    background: #0147A7;
+    color: #fff;
+}
+/* #enddocregion */
--- a/aio/content/examples/webpack/src/assets/images/angular.png
+++ b/aio/content/examples/webpack/src/assets/images/angular.png
--- a/aio/content/examples/webpack/src/index.html
+++ b/aio/content/examples/webpack/src/index.html
@ -0,0 +1,14 @@
+<!-- #docregion -->
+<!DOCTYPE html>
+<html>
+  <head>
+    <base href="/">
+    <title>Angular With Webpack</title>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+  </head>
+  <body>
+    <my-app>Loading...</my-app>
+  </body>
+</html>
+<!-- #enddocregion -->
--- a/aio/content/examples/webpack/src/main.ts
+++ b/aio/content/examples/webpack/src/main.ts
@ -0,0 +1,14 @@
+// #docregion
+import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { enableProdMode } from '@angular/core';
+
+import { AppModule } from './app/app.module';
+
+// #docregion enable-prod
+if (process.env.ENV === 'production') {
+  enableProdMode();
+}
+// #enddocregion enable-prod
+
+platformBrowserDynamic().bootstrapModule(AppModule);
+// #enddocregion
--- a/aio/content/examples/webpack/src/polyfills.ts
+++ b/aio/content/examples/webpack/src/polyfills.ts
@ -0,0 +1,12 @@
+// #docregion
+import 'core-js/es6';
+import 'core-js/es7/reflect';
+require('zone.js/dist/zone');
+
+if (process.env.ENV === 'production') {
+  // Production
+} else {
+  // Development and test
+  Error['stackTraceLimit'] = Infinity;
+  require('zone.js/dist/long-stack-trace-zone');
+}
--- a/aio/content/examples/webpack/src/tsconfig.1.json
+++ b/aio/content/examples/webpack/src/tsconfig.1.json
@ -0,0 +1,13 @@
+{
+  "compilerOptions": {
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "sourceMap": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "lib": ["es2015", "dom"],
+    "noImplicitAny": true,
+    "suppressImplicitAnyIndexErrors": true
+  }
+}
--- a/aio/content/examples/webpack/src/vendor.ts
+++ b/aio/content/examples/webpack/src/vendor.ts
@ -0,0 +1,18 @@
+// TODO(i): this no longer works. we need to review this example and if absolutely necessary rewrite it to use the
+// rxjs-compat package
+
+// #docregion
+// Angular
+import '@angular/platform-browser';
+import '@angular/platform-browser-dynamic';
+import '@angular/core';
+import '@angular/common';
+import '@angular/http';
+import '@angular/router';
+
+// RxJS
+import 'rxjs';
+
+// Other vendors for example jQuery, Lodash or Bootstrap
+// You can import js, ts, css, sass, ...
+// #enddocregion
--- a/aio/content/examples/webpack/webpack.config.js
+++ b/aio/content/examples/webpack/webpack.config.js
@ -0,0 +1,3 @@
+// #docregion
+module.exports = require('./config/webpack.dev.js');
+// #enddocregion
--- a/aio/content/examples/webpack/zipper.json
+++ b/aio/content/examples/webpack/zipper.json
@ -0,0 +1,12 @@
+{
+  "files":[
+    "!**/*.d.ts",
+    "!**/*.js",
+    "!**/*.[0-9].*",
+    "config/**/*",
+    "webpack.config.js",
+    "karma.webpack.conf.js"
+  ],
+  "removeSystemJsConfig": true,
+  "type": "webpack"
+}
--- a/aio/content/guide/ajs-quick-reference.md
+++ b/aio/content/guide/ajs-quick-reference.md
@ -1,4 +1,4 @@
-# AngularJS to Angular Concepts: Quick Reference
+# AngularJS to Angular Quick Reference


 {@a top}
@ -1256,7 +1256,7 @@ also encapsulate a style sheet within a specific component.
      ### Styles configuration
      <code-example hideCopy path="ajs-quick-reference/.angular-cli.1.json" region="styles" linenums="false"></code-example>

-      With the Angular CLI, you can configure your global styles in the `angular.json` file.
+      With the Angular CLI, you can configure your global styles in the `.angular-cli.json` file.
      You can rename the extension to `.scss` to use sass.

      ### StyleUrls
--- a/aio/content/guide/api-page-class.md
+++ b/aio/content/guide/api-page-class.md
@ -0,0 +1,175 @@
+<div class="breadcrumb">
+    <a href="#">API<a> / <a href="#">@core<a>
+</div>
+<header class="api-header">
+    <h1><label class="api-status-label experimental">experimental</label><label class="api-type-label class">class</label>Class Name</h1>
+</header>
+<div class="page-actions">
+    <a href="#"><label class="raised page-label"><i class="material-icons">mode_edit</i>suggest edits</label></a>
+    <a href="#"><label class="raised page-label"><i class="material-icons">code</i>view source</label></a>
+</div>
+<p>Class description goes here. This is a short and to the point one or two sentence description that easily introduces the reader to the class.</p>
+<div class="api-body">
+    <section>
+        <h2>Overview</h2>
+        <code-example language="ts" hidecopy="true" ng-version="5.2.0"><aio-code class="simple-code" ng-reflect-ng-class="[object Object]" ng-reflect-code="
+    class <a href=&quot;api/core/Compi" ng-reflect-hide-copy="true" ng-reflect-language="ts" ng-reflect-linenums="" ng-reflect-path="" ng-reflect-region="" ng-reflect-title=""><pre class="prettyprint lang-ts">
+        <code class="animated fadeIn"><span class="kwd">class</span><span class="pln"> </span><a href="api/core/Compiler" class="code-anchor"><span class="typ">Compiler</span></a><span class="pln"> </span><span class="pun">{</span><span class="pln">
+    </span><a class="code-anchor" href="api/core/Compiler#compileModuleSync"><span class="pln">compileModuleSync</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;(</span><span class="pln">moduleType</span><span class="pun">:</span><span class="pln"> </span><span class="typ">Type</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;):</span><span class="pln"> </span><span class="typ">NgModuleFactory</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;</span></a><span class="pln">
+    </span><a class="code-anchor" href="api/core/Compiler#compileModuleAsync"><span class="pln">compileModuleAsync</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;(</span><span class="pln">moduleType</span><span class="pun">:</span><span class="pln"> </span><span class="typ">Type</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;):</span><span class="pln"> </span><span class="typ">Promise</span><span class="pun">&lt;</span><span class="typ">NgModuleFactory</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;&gt;</span></a><span class="pln">
+    </span><a class="code-anchor" href="api/core/Compiler#compileModuleAndAllComponentsSync"><span class="pln">compileModuleAndAllComponentsSync</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;(</span><span class="pln">moduleType</span><span class="pun">:</span><span class="pln"> </span><span class="typ">Type</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;):</span><span class="pln"> </span><span class="typ">ModuleWithComponentFactories</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;</span></a><span class="pln">
+    </span><a class="code-anchor" href="api/core/Compiler#compileModuleAndAllComponentsAsync"><span class="pln">compileModuleAndAllComponentsAsync</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;(</span><span class="pln">moduleType</span><span class="pun">:</span><span class="pln"> </span><span class="typ">Type</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;):</span><span class="pln"> </span><span class="typ">Promise</span><span class="pun">&lt;</span><span class="typ">ModuleWithComponentFactories</span><span class="pun">&lt;</span><span class="pln">T</span><span class="pun">&gt;&gt;</span></a><span class="pln">
+    </span><a class="code-anchor" href="api/core/Compiler#clearCache"><span class="pln">clearCache</span><span class="pun">():</span><span class="pln"> </span><span class="kwd">void</span></a><span class="pln">
+    </span><a class="code-anchor" href="api/core/Compiler#clearCacheFor"><span class="pln">clearCacheFor</span><span class="pun">(</span><span class="pln">type</span><span class="pun">:</span><span class="pln"> </span><span class="typ">Type</span><span class="pun">&lt;</span><span class="pln">any</span><span class="pun">&gt;)</span></a><span class="pln">
+    </span><span class="pun">}</span></code>
+        </pre></aio-code></code-example>
+    </section>
+    <section>
+        <h2>Description</h2>
+        <p>The longer class description goes here which can include multiple paragraphs.</p>
+        </p>Bacon ipsum dolor amet pork belly capicola sirloin venison alcatra ground round ham hock jowl turkey picanha bresaola pancetta brisket chicken fatback. Burgdoggen kevin salami jowl shoulder jerky leberkas meatball. Ham hock picanha burgdoggen pork belly rump bacon cupim. Bacon kielbasa sirloin shank strip steak ground round. Bresaola cow salami meatloaf pork chop leberkas flank turducken biltong meatball chuck pork tri-tip chicken. Ribeye corned beef shoulder, meatloaf strip steak jerky porchetta capicola alcatra ham.</p>
+        <h3>Subclasses</h3>
+        <ul>
+            <li><a href="#">Subclass1</a></li>
+            <li><a href="#">Subclass2</a></li>
+            <li><a href="#">Subclass3</a></li>
+        </ul>
+        <h3>See Also</h3>
+        <ul>
+            <li><a href="#">Link1</a></li>
+            <li><a href="#">Link2</a></li>
+        </ul>
+    </section>
+    <section>
+        <h2>Constructor</h2>
+        <code-example hidecopy="true" class="no-box api-heading" ng-version="5.2.0">
+        <aio-code class="simple-code"><pre class="prettyprint lang-">   
+        <code class="animated fadeIn"><span class="kwd">constructor</span><span class="pun">(</span><span class="pln">element</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">,</span><span class="pln"> keyframes</span><span class="pun">:</span><span class="pln"> </span><span class="pun">{</span><span class="pln">
+        </span><span class="pun">[</span><span class="pln">key</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">]:</span><span class="pln"> </span><span class="kwd">string</span><span class="pln"> </span><span class="pun">|</span><span class="pln"> number</span><span class="pun">;</span><span class="pln">
+    </span><span class="pun">}[],</span><span class="pln"> duration</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> delay</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> easing</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">,</span><span class="pln"> previousPlayers</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">[])</span></code>
+        </pre></aio-code></code-example>
+    </section>
+    <section>
+        <h2>Properties</h2>
+        <table class="is-full-width list-table">
+        <thead>
+        <tr>
+        <th>Property</th>
+        <th>Type</th>
+        <th>Description</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+        <td>
+            <code><strong>Property1</strong></code>
+        </td>
+        <td><label class="property-type-label type">Type</label></td>
+        <td>Description goes here</td>
+        </tr>
+        <tr>
+        <td>
+            <code><strong>Property2</strong></code>
+        </td>
+        <td>Type</td>
+        <td>Description goes here</td>
+        </tr>
+        <tr>
+        <td>
+            <code><strong>Property3</strong></code>
+        </td>
+        <td>Type</td>
+        <td>Description goes here</td>
+        </tr>
+        </tbody>
+    </table>
+    </section>
+    <section class="api-method">
+        <h2>Methods</h2>
+        <table class="is-full-width item-table">
+        <thead>
+        <tr>
+        <th>Method1Name( )</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+        <td>
+            <p>Description goes here</p>
+            <br>
+            <p>Bacon ipsum dolor amet pork belly capicola sirloin venison alcatra ground round ham hock jowl turkey picanha bresaola pancetta brisket chicken fatback. Burgdoggen kevin salami jowl shoulder jerky leberkas meatball. Ham hock picanha burgdoggen pork belly rump bacon cupim. Bacon kielbasa sirloin shank strip steak ground round. Bresaola cow salami meatloaf pork chop leberkas flank turducken biltong meatball chuck pork tri-tip chicken. Ribeye corned beef shoulder, meatloaf strip steak jerky porchetta capicola alcatra ham.</p>
+        </td>
+        </tr>
+        </tbody>
+    </table>
+    <table class="is-full-width api-method item-table">
+        <thead>
+        <tr>
+        <th>Method2Name( )</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+        <td>
+            <p>Description goes here</p>
+            <hr>
+            <h5>Declaration</h5>
+            <code-example language="ts" hidecopy="true" ng-version="5.2.0">
+                <aio-code class="simple-code"><pre class="prettyprint lang-ts">
+                    <code class="animated fadeIn"><span class="kwd">class</span><span class="pln"> </span><a href="api/animations/AnimationBuilder" class="code-anchor"><span class="typ">AnimationBuilder</span></a><span class="pln"> </span><span class="pun">{</span><span class="pln"></span><a class="code-anchor" href="api/animations/AnimationBuilder#build"><span class="pln">build</span><span class="pun">(</span><span class="pln">animation</span><span class="pun">:</span><span class="pln"> </span><span class="typ">AnimationMetadata</span><span class="pln"> </span><span class="pun">|</span><span class="pln"> </span><span class="typ">AnimationMetadata</span><span class="pun">[]):</span><span class="pln"> </span><span class="typ">AnimationFactory</span></a><span class="pln"></span><span class="pun">}</span></code></pre>
+                </aio-code>
+            </code-example>
+            <h6>Parameters</h6>
+            <h6>Returns</h6>
+            <p>Returns information and results goes here.</p>
+            <h6>Errors</h6>
+            <p>Error information goes here</p>
+            <hr>
+            <p>Further details provided as needed. Bacon ipsum dolor amet pork belly capicola sirloin venison alcatra ground round ham hock jowl turkey picanha bresaola pancetta brisket chicken fatback. Burgdoggen kevin salami jowl shoulder jerky leberkas meatball.</p><hr>
+            <h6>Overloads</h6>
+                <table class="is-full-width">
+                <tbody>
+                <tr>
+                <td>
+                    <code-example hidecopy="true" class="no-box api-heading" ng-version="5.2.0">
+        <aio-code class="simple-code"><pre class="prettyprint lang-">   
+        <code class="animated fadeIn"><span class="kwd">constructor</span><span class="pun">(</span><span class="pln">element</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">,</span><span class="pln"> keyframes</span><span class="pun">:</span><span class="pln"> </span><span class="pun">{</span><span class="pln">
+        </span><span class="pun">[</span><span class="pln">key</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">]:</span><span class="pln"> </span><span class="kwd">string</span><span class="pln"> </span><span class="pun">|</span><span class="pln"> number</span><span class="pun">;</span><span class="pln">
+    </span><span class="pun">}[],</span><span class="pln"> duration</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> delay</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> easing</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">,</span><span class="pln"> previousPlayers</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">[])</span></code>
+        </pre></aio-code></code-example>
+                </td>
+                <td>Description goes here</td>
+                </tr>
+                <tr>
+                <td>
+                    <code-example hidecopy="true" class="no-box api-heading" ng-version="5.2.0">
+        <aio-code class="simple-code"><pre class="prettyprint lang-">   
+        <code class="animated fadeIn"><span class="kwd">constructor</span><span class="pun">(</span><span class="pln">element</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">,</span><span class="pln"> keyframes</span><span class="pun">:</span><span class="pln"> </span><span class="pun">{</span><span class="pln">
+        </span><span class="pun">[</span><span class="pln">key</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">]:</span><span class="pln"> </span><span class="kwd">string</span><span class="pln"> </span><span class="pun">|</span><span class="pln"> number</span><span class="pun">;</span><span class="pln">
+    </span><span class="pun">}[],</span><span class="pln"> duration</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> delay</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> easing</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">,</span><span class="pln"> previousPlayers</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">[])</span></code>
+        </pre></aio-code></code-example>
+                </td>
+                <td>Description goes here</td>
+                </tr>
+                </tbody>
+            </table>
+            <hr>
+            <h5>Example: Descriptive Title of Method Example</h5>
+            <p>Bacon ipsum dolor amet pork belly capicola sirloin venison alcatra ground round ham hock jowl turkey picanha bresaola pancetta brisket chicken fatback. Burgdoggen kevin salami jowl shoulder jerky leberkas meatball. Ham hock picanha burgdoggen pork belly rump bacon cupim. Bacon kielbasa sirloin shank strip steak ground round. Bresaola cow salami meatloaf pork chop leberkas flank turducken biltong meatball chuck pork tri-tip chicken. Ribeye corned beef shoulder, meatloaf strip steak jerky porchetta capicola alcatra ham.</p>
+        </td>
+        </tr>
+        </tbody>
+    </table>
+    </section>
+    <section>
+        <h2>Example: Descriptive Title of Combined Example Goes Here</h2>
+        <p>Intro description text about what the example is and how it can be used.</p>
+            <code-example hidecopy="true" class="no-box api-heading" ng-version="5.2.0">
+        <aio-code class="simple-code"><pre class="prettyprint lang-">   
+        <code class="animated fadeIn"><span class="kwd">constructor</span><span class="pun">(</span><span class="pln">element</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">,</span><span class="pln"> keyframes</span><span class="pun">:</span><span class="pln"> </span><span class="pun">{</span><span class="pln">
+        </span><span class="pun">[</span><span class="pln">key</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">]:</span><span class="pln"> </span><span class="kwd">string</span><span class="pln"> </span><span class="pun">|</span><span class="pln"> number</span><span class="pun">;</span><span class="pln">
+    </span><span class="pun">}[],</span><span class="pln"> duration</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> delay</span><span class="pun">:</span><span class="pln"> number</span><span class="pun">,</span><span class="pln"> easing</span><span class="pun">:</span><span class="pln"> </span><span class="kwd">string</span><span class="pun">,</span><span class="pln"> previousPlayers</span><span class="pun">:</span><span class="pln"> any</span><span class="pun">[])</span></code>
+        </pre></aio-code></code-example>
+        <p>Further explanation provided as needed. Bacon ipsum dolor amet pork belly capicola sirloin venison alcatra ground round ham hock jowl turkey picanha bresaola pancetta brisket chicken fatback. Burgdoggen kevin salami jowl shoulder jerky leberkas meatball.</p>
+    </section>
+</div>
--- a/aio/content/guide/bootstrapping.md
+++ b/aio/content/guide/bootstrapping.md
@ -177,4 +177,4 @@ root module's `bootstrap` array.
 ## More about Angular Modules

 For more on NgModules you're likely to see frequently in apps,
-see [Frequently Used Modules](guide/frequent-ngmodules).
+see [Frequently Used Modules](#).
--- a/aio/content/guide/component-styles.md
+++ b/aio/content/guide/component-styles.md
@ -236,7 +236,7 @@ In this case, the URL is relative to the CSS file into which you're importing.

 ### External and global style files

-When building with the CLI, you must configure the `angular.json` to include _all external assets_, including external style files.
+When building with the CLI, you must configure the `.angular-cli.json` to include _all external assets_, including external style files.

 Register **global** style files in the `styles` section which, by default, is pre-configured with the global `styles.css` file.

--- a/aio/content/guide/dependency-injection.md
+++ b/aio/content/guide/dependency-injection.md
@ -32,7 +32,7 @@ from the [The Tour of Heroes](tutorial/).
 </code-tabs>

 The `HeroesComponent` is the top-level heroes component.
-Its only purpose is to display the `HeroListComponent`
+It's only purpose is to display the `HeroListComponent`
 which displays a list of hero names.

 This version of the `HeroListComponent` gets its `heroes` from the `HEROES` array, an in-memory collection
@ -440,12 +440,6 @@ The service can be instantiated by configuring a factory function as shown below

 <code-example path="dependency-injection/src/app/tree-shaking/service.0.ts"  title="src/app/tree-shaking/service.0.ts" linenums="false"> </code-example>

-<div class="l-sub-section">
-
-To override tree-shakable providers, register the provider using the `providers: []` array syntax of any Angular decorator that supports it.
-
-</div>
-
 {@a injector-config} 
 {@a bootstrap}

--- a/aio/content/guide/deployment.md
+++ b/aio/content/guide/deployment.md
@ -218,7 +218,7 @@ It serves build artifacts from memory instead for a faster development experienc
 <div class="l-sub-section">

 The output folder is  `dist/` by default.
-To output to a different folder, change the `outputPath` in `angular.json`.
+To output to a different folder, change the `outDir` in `.angular-cli.json`.

 </div>

--- a/aio/content/guide/elements.md
+++ b/aio/content/guide/elements.md
@ -1,23 +1,12 @@
 # Angular Elements Overview

-_Angular elements_ are Angular components packaged as _custom elements_, a web standard for defining new HTML elements in a framework-agnostic way.
-
 [Custom elements](https://developer.mozilla.org/en-US/docs/Web/Web_Components/Using_custom_elements) are a Web Platform feature currently supported by Chrome, Opera, and Safari, and available in other browsers through polyfills (see [Browser Support](#browser-support)).
 A custom element extends HTML by allowing you to define a tag whose content is created and controlled by JavaScript code. 
 The browser maintains a `CustomElementRegistry` of defined custom elements (also called Web Components), which maps an instantiable JavaScript class to an HTML tag.

 The `@angular/elements` package exports a `createCustomElement()` API that provides a bridge from Angular's component interface and change detection functionality to the built-in DOM API. 

-Transforming a component to a custom element makes all of the required Angular infrastructure available to the browser. 
-Creating a custom element is simple and straightforward, and automatically connects your component-defined view with change detection and data binding, mapping Angular functionality to the corresponding native HTML equivalents. 
-
-<div class="l-sub-section">
-
-    We are working on custom elements that can be used by web apps built on other frameworks. 
-    A minimal, self-contained version of the Angular framework will be injected as a service to support the component's change-detection and data-binding functionality. 
-    For more about the direction of development, check out this [video presentation](https://www.youtube.com/watch?v=Z1gLFPLVJjY&t=4s).
-
-</div>
+Transforming a component to a custom element makes all of the required Angular infrastructure available to the browser. Creating a custom element is simple and straightforward, and automatically connects your component-defined view with change detection and data binding, mapping Angular functionality to the corresponding native HTML equivalents. 

 ## Using custom elements

@ -50,6 +39,14 @@ When your custom element is placed on a page, the browser creates an instance of

 <hr class="clear">

+<div class="l-sub-section">
+
+    We are working on custom elements that can be used by web apps built on other frameworks. 
+    A minimal, self-contained version of the Angular framework will be injected as a service to support the component's change-detection and data-binding functionality. 
+    For more about the direction of development, check out this [video presentation](https://www.youtube.com/watch?v=vHI5C-9vH-E).
+
+</div>
+
 ## Transforming components to custom elements

 Angular provides the `createCustomElement()` function for converting an Angular component, 
--- a/aio/content/guide/frequent-ngmodules.md
+++ b/aio/content/guide/frequent-ngmodules.md
@ -44,25 +44,25 @@ of some of the things they contain:
 <tr>
   <td><code>FormsModule</code></td>
   <td><code>@angular/forms</code></td>
-   <td>When you want to build template driven forms (includes <code>NgModel</code>)</td>
+   <td>When you build template driven forms (includes <code>NgModel</code>)</td>
 </tr>

 <tr>
   <td><code>ReactiveFormsModule</code></td>
   <td><code>@angular/forms</code></td>
-   <td>When you want to build reactive forms</td>
+   <td>When building reactive forms</td>
 </tr>

 <tr>
   <td><code>RouterModule</code></td>
   <td><code>@angular/router</code></td>
-   <td>When you want to use <code>RouterLink</code>, <code>.forRoot()</code>, and <code>.forChild()</code></td>
+   <td>For Routing and when you want to use <code>RouterLink</code>,<code>.forRoot()</code>, and <code>.forChild()</code></td>
 </tr>

 <tr>
   <td><code>HttpClientModule</code></td>
   <td><code>@angular/common/http</code></td>
-   <td>When you want to talk to a server</td>
+   <td>When you to talk to a server</td>
 </tr>

 </table>
--- a/aio/content/guide/glossary.md
+++ b/aio/content/guide/glossary.md
@ -28,11 +28,6 @@ By compiling your application using the `ngc` command-line tool, you can bootstr

 Compare [just-in-time (JIT) compilation](guide/glossary#jit).

-## Angular element
-
-An Angular [component](guide/glossary#component) that has been packaged as a [custom element](guide/glossary#custom-element). 
-
-Learn more in the [_Angular Elements_](guide/elements) guide.

 ## Annotation

@ -439,7 +434,7 @@ Observables can deliver single or multiple values of any type to subscribers, ei

 Angular uses a third-party library called [Reactive Extensions (RxJS)](http://reactivex.io/rxjs/). 

-To learn more, see the [Observables](guide/observables) guide.
+To learn more, see the [Observables](guide/glossary#observable) guide.


 {@a observer}
--- a/aio/content/guide/http.md
+++ b/aio/content/guide/http.md
@ -450,7 +450,7 @@ Here is a `searchHeroes` method that queries for heroes whose names contain the

 If there is a search term, the code constructs an options object with an HTML URL-encoded search parameter. If the term were "foo", the GET request URL would be `api/heroes/?name=foo`.

-The `HttpParams` are immutable so you'll have to use the `set()` method to update the options.
+The `HttpParms` are immutable so you'll have to use the `set()` method to update the options.

 ### Debouncing requests

@ -1030,18 +1030,10 @@ you are responsible for flushing and verifying them.

 You should test the app's defenses against HTTP requests that fail.

-Call `request.flush()` with an error message, as seen in the following example.
+Call `request.error()` with an `ErrorEvent` instead of `request.flush()`, as in this example.

 <code-example 
  path="http/src/testing/http-client.spec.ts"
-  region="network-error"
-  linenums="false">
-</code-example>
-
-Alternatively, you can call `request.error()` with an `ErrorEvent`.
-
-<code-example
-  path="http/src/testing/http-client.spec.ts"
-  region="network-error"
+  region="404" 
  linenums="false">
 </code-example>
--- a/aio/content/guide/i18n.md
+++ b/aio/content/guide/i18n.md
@ -42,10 +42,11 @@ locale id to find the correct corresponding locale data.

 By default, Angular uses the locale `en-US`, which is English as spoken in the United States of America.

-To set your app's locale to another value, use the CLI parameter `--configuration` with the value of the locale id that you want to use:
+To set your app's locale to another value, use the CLI parameter `--locale` with the value
+of the locale id that you want to use:

 <code-example language="sh" class="code-shell">
-  ng serve --configuration=fr
+  ng serve --aot --locale fr
 </code-example>

 If you use JIT, you also need to define the `LOCALE_ID` provider in your main module:
@ -85,7 +86,7 @@ and `PercentPipe` use locale data to format data based on the `LOCALE_ID`.

 By default, Angular only contains locale data for `en-US`. If you set the value of
 `LOCALE_ID` to another locale, you must import locale data for that new locale.
-The CLI imports the locale data for you when you use the parameter `--configuration` with `ng serve` and
+The CLI imports the locale data for you when you use the parameter `--locale` with `ng serve` and
 `ng build`.

 If you want to import locale data for other languages, you can do it manually:
@ -423,9 +424,9 @@ You can specify the translation format explicitly with the `--i18nFormat` flag a
 these example commands:

 <code-example language="sh" class="code-shell">
-ng xi18n  --i18n-format=xlf
-ng xi18n  --i18n-format=xlf2
-ng xi18n  --i18n-format=xmb
+ng xi18n  --i18nFormat=xlf
+ng xi18n  --i18nFormat=xlf2
+ng xi18n  --i18nFormat=xmb
 </code-example>

 The sample in this guide uses the default XLIFF 1.2 format.
@ -441,11 +442,11 @@ The sample in this guide uses the default XLIFF 1.2 format.
 ### Other options

 You can specify the output path used by the CLI to extract your translation source file with
-the parameter `--output-path`:
+the parameter `--outputPath`:

 <code-example language="sh" class="code-shell">

-  ng xi18n --output-path locale
+  ng xi18n --outputPath src/locale

 </code-example>

@ -454,15 +455,15 @@ the parameter `--outFile`:

 <code-example language="sh" class="code-shell">

-  ng xi18n --out-file source.xlf
+  ng xi18n --outFile source.xlf

 </code-example>

-You can specify the base locale of your app with the parameter `--i18n-locale`:
+You can specify the base locale of your app with the parameter `--locale`:

 <code-example language="sh" class="code-shell">

-  ng xi18n --i18n-locale fr
+  ng xi18n --locale fr

 </code-example>

@ -662,7 +663,7 @@ format that Angular understands, such as `.xtb`.
 How you provide this information depends upon whether you compile with
 the JIT compiler or the AOT compiler.

-  * With [AOT](guide/i18n#merge-aot), you pass the information as a configuration
+  * With [AOT](guide/i18n#merge-aot), you pass the information as a CLI parameter.
  * With [JIT](guide/i18n#merge-jit), you provide the information at bootstrap time.


@ -676,70 +677,18 @@ When you internationalize with the AOT compiler, you must pre-build a separate a
 package for each language and serve the appropriate package based on either server-side language
 detection or url parameters.

-You also need to instruct the AOT compiler to use your translation configuration. To do so, you configure the translation with three options in your `angular.json` file.
+You also need to instruct the AOT compiler to use your translation file. To do so, you use three
+options with the `ng serve` or `ng build` commands:

-* `i18nFile`: the path to the translation file.
-* `i18nFormat`: the format of the translation file.
-* `i18nLocale`: the locale id.
+* `--i18nFile`: the path to the translation file.
+* `--i18nFormat`: the format of the translation file.
+* `--locale`: the locale id.

-```
-"configurations": {
-  ...
-  "fr": {
-    "aot": true,
-    "outputPath": "dist/my-project-fr/",
-    "i18nFile": "src/locale/messages.fr.xlf",
-    "i18nFormat": "xlf",
-    "i18nLocale": "fr",
-    ...
-  }
-}
-```
-
-You then pass the configuration with the `ng serve` or `ng build` commands. 
-The example below shows how to serve the French language file created in previous 
-sections of this guide:
+The example below shows how to serve the French language file created in previous sections of this
+guide:

 <code-example language="sh" class="code-shell">
-  ng serve --configuration=fr
-</code-example>
-
-For production builds, you define a separate `production-fr` build configuration in 
-your `angular.json`.
-
-```
-"configurations": {
-  ...
-  "production-fr": {
-    "fileReplacements": [
-      {
-        "replace": "src/environments/environment.ts",
-        "with": "src/environments/environment.prod.ts"
-      }
-    ],
-    "optimization": true,
-    "outputHashing": "all",
-    "sourceMap": false,
-    "extractCss": true,
-    "namedChunks": false,
-    "aot": true,
-    "extractLicenses": true,
-    "vendorChunk": false,
-    "buildOptimizer": true,
-    "outputPath": "dist/my-project-fr/",
-    "i18nFile": "src/locale/messages.fr.xlf",
-    "i18nFormat": "xlf",
-    "i18nLocale": "fr",
-    "i18nMissingTranslation": "error"
-  },
-  ...
-}
-```
-
-The same configuration options can also be provided through the CLI with your existing `production` configuration.
-
-<code-example language="sh" class="code-shell">
-  ng build --prod --i18n-file src/locale/messages.fr.xlf --i18n-format xlf --i18n-locale fr
+  ng serve --aot --i18nFile=src/locale/messages.fr.xlf --i18nFormat=xlf --locale=fr
 </code-example>

 {@a merge-jit}
@ -782,17 +731,12 @@ compilation, the app will fail to load.
 * Warning (default): show a 'Missing translation' warning in the console or shell.
 * Ignore: do nothing.

-You specify the warning level in the `configurations` section your Angular CLI build configuration. The example below shows how to set the warning level to error:
+If you use the AOT compiler, specify the warning level by using the CLI parameter
+`--missingTranslation`. The example below shows how to set the warning level to error:

-```
-"configurations": {
-  ...
-  "fr": {
-    ...
-    "i18nMissingTranslation": "error"
-  }
-}
-```
+<code-example language="sh" class="code-shell">
+  ng serve --aot --missingTranslation=error
+</code-example>

 If you use the JIT compiler, specify the warning level in the compiler config at bootstrap by adding
 the 'MissingTranslationStrategy' property. The example below shows how to set the warning level to
--- a/aio/content/guide/language-service.md
+++ b/aio/content/guide/language-service.md
@ -1,33 +1,33 @@
 # Angular Language Service

-The Angular Language Service is a way to get completions, errors,
-hints, and navigation inside your Angular templates whether they
-are external in an HTML file or embedded in annotations/decorators
-in a string. The Angular Language Service autodetects that you are
-opening an Angular file, reads your `tsconfig.json` file, finds all the
-templates you have in your application, and then provides language
+The Angular Language Service is a way to get completions, errors, 
+hints, and navigation inside your Angular templates whether they 
+are external in an HTML file or embedded in annotations/decorators 
+in a string. The Angular Language Service autodetects that you are 
+opening an Angular file, reads your `tsconfig.json` file, finds all the 
+templates you have in your application, and then provides language 
 services for any templates that you open.


 ## Autocompletion

-Autocompletion can speed up your development time by providing you with
-contextual possibilities and hints as you type. This example shows
-autocomplete in an interpolation. As you type it out,
+Autocompletion can speed up your development time by providing you with 
+contextual possibilities and hints as you type. This example shows 
+autocomplete in an interpolation. As you type it out, 
 you can hit tab to complete.

 <figure>
  <img src="generated/images/guide/language-service/language-completion.gif" alt="autocompletion">
 </figure>

-There are also completions within
-elements. Any elements you have as a component selector will
+There are also completions within 
+elements. Any elements you have as a component selector will 
 show up in the completion list.

 ## Error checking

-The Angular Language Service can also forewarn you of mistakes in your code.
-In this example, Angular doesn't know what `orders` is or where it comes from.
+The Angular Language Service can also forewarn you of mistakes in your code. 
+In this example, Angular doesn't know what `orders` is or where it comes from. 

 <figure>
  <img src="generated/images/guide/language-service/language-error.gif" alt="error checking">
@ -35,8 +35,8 @@ In this example, Angular doesn't know what `orders` is or where it comes from.

 ## Navigation

-Navigation allows you to hover to
-see where a component, directive, module, etc. is from and then
+Navigation allows you to hover to 
+see where a component, directive, module, etc. is from and then 
 click and press F12 to go directly to its definition.

 <figure>
@ -46,52 +46,53 @@ click and press F12 to go directly to its definition.

 ## Angular Language Service in your editor

-Angular Language Service is currently available for [Visual Studio Code](https://code.visualstudio.com/) and
-[WebStorm](https://www.jetbrains.com/webstorm).
+Angular Language Service is currently available for [Visual Studio Code](https://code.visualstudio.com/) and 
+[WebStorm](https://www.jetbrains.com/webstorm). 

 ### Visual Studio Code

-In Visual Studio Code, install Angular Language Service from the store,
-which is accessible from the bottom icon on the left menu pane.
-You can also use the VS Quick Open (⌘+P) to search for the extension. When you've opened it,
-enter the following command:
+In Visual Studio Code, install Angular Language Service from the store, 
+which is accessible from the bottom icon on the left menu pane. 
+You can also use the VS Quick Open (⌘+P) to search for the extension. When you've opened it, 
+enter the following command: 

 ```sh
 ext install Angular.ng-template
 ```

-Then click the install button to install the Angular Language Service.
+Then click the install button to install the Angular Language Service. 


 ### WebStorm

-In webstorm, you have to install the language service as a dev dependency.
-When Angular sees this dev dependency, it provides the
-language service inside of WebStorm. Webstorm then gives you
+In webstorm, you have to install the language service as a dev dependency. 
+When Angular sees this dev dependency, it provides the 
+language service inside of WebStorm. Webstorm then gives you 
 colorization inside the template and autocomplete in addition to the Angular Language Service.

-Here's the dev dependency
+Here's the dev dependency 
 you need to have in `package.json`:

 ```json
+
 devDependencies {
-  "@angular/language-service": "^6.0.0"
+	"@angular/language-service": "^4.0.0"
 }
 ```

-Then in the terminal window at the root of your project,
-install the `devDependencies` with `npm` or `yarn`:
+Then in the terminal window at the root of your project, 
+install the `devDependencies` with `npm` or `yarn`: 

 ```sh
-npm install
+npm install 
 ```
-*OR*
+*OR* 

 ```sh
 yarn
 ```

-*OR*
+*OR* 

 ```sh
 yarn install
@ -100,7 +101,7 @@ yarn install

 ### Sublime Text

-In [Sublime Text](https://www.sublimetext.com/), you first need an extension to allow Typescript.
+In [Sublime Text](https://www.sublimetext.com/), you first need an extension to allow Typescript. 
 Install the latest version of typescript in a local `node_modules` directory:

 ```sh
@ -112,7 +113,7 @@ Then install the Angular Language Service in the same location:
 npm install --save-dev @angular/language-service
 ```

-Starting with TypeScript 2.3, TypeScript has a language service plugin model that the language service can use.
+Starting with TypeScript 2.3, TypeScript has a language service plugin model that the language service can use. 

 Next, in your user preferences (`Cmd+,` or `Ctrl+,`), add:

@ -123,13 +124,13 @@ Next, in your user preferences (`Cmd+,` or `Ctrl+,`), add:

 ## Installing in your project

-You can also install Angular Language Service in your project with the
+You can also install Angular Language Service in your project with the 
 following `npm` command:

 ```sh
 npm install --save-dev @angular/language-service
 ```
-Additionally, add the following to the `"compilerOptions"` section of
+Additionally, add the following to the `"compilerOptions"` section of 
 your project's `tsconfig.json`.

 ```json
@ -137,25 +138,25 @@ your project's `tsconfig.json`.
      {"name": "@angular/language-service"}
  ]
 ```
-Note that this only provides diagnostics and completions in `.ts`
-files. You need a custom sublime plugin (or modifications to the current plugin)
+Note that this only provides diagnostics and completions in `.ts` 
+files. You need a custom sublime plugin (or modifications to the current plugin) 
 for completions in HTML files.


 ## How the Language Service works

-When you use an editor with a language service, there's an
-editor process which starts a separate language process/service
-to which it speaks through an [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call).
-Any time you type inside of the editor, it sends information to the other process to
-track the state of your project. When you trigger a completion list within a template, the editor process first parses the template into an HTML AST, or [abstract syntax tree](https://en.wikipedia.org/wiki/Abstract_syntax_tree). Then the Angular compiler interprets
-what module the template is part of, the scope you're in, and the component selector. Then it figures out where in the template AST your cursor is. When it determines the
+When you use an editor with a language service, there's an 
+editor process which starts a separate language process/service 
+to which it speaks through an [RPC](https://en.wikipedia.org/wiki/Remote_procedure_call). 
+Any time you type inside of the editor, it sends information to the other process to 
+track the state of your project. When you trigger a completion list within a template, the editor process first parses the template into an HTML AST, or [abstract syntax tree](https://en.wikipedia.org/wiki/Abstract_syntax_tree). Then the Angular compiler interprets 
+what module the template is part of, the scope you're in, and the component selector. Then it figures out where in the template AST your cursor is. When it determines the 
 context, it can then determine what the children can be.

 It's a little more involved if you are in an interpolation. If you have an interpolation of `{{data.---}}` inside a `div` and need the completion list after `data.---`, the compiler can't use the HTML AST to find the answer. The HTML AST can only tell the compiler that there is some text with the characters "`{{data.---}}`". That's when the template parser produces an expression AST, which resides within the template AST. The Angular Language Services then looks at `data.---` within its context and asks the TypeScript Language Service what the members of data are. TypeScript then returns the list of possibilities.


-For more in-depth information, see the
+For more in-depth information, see the 
 [Angular Language Service API](https://github.com/angular/angular/blob/master/packages/language-service/src/types.ts)


@ -169,7 +170,7 @@ For more in-depth information, see the

 ## More on Information

-For more information, see [Chuck Jazdzewski's presentation](https://www.youtube.com/watch?v=ez3R0Gi4z5A&t=368s) on the Angular Language
+For more information, see [Chuck Jazdzewski's presentation](https://www.youtube.com/watch?v=ez3R0Gi4z5A&t=368s) on the Angular Language 
 Service from [ng-conf](https://www.ng-conf.org/) 2017.


--- a/aio/content/guide/lifecycle-hooks.md
+++ b/aio/content/guide/lifecycle-hooks.md
@ -561,7 +561,7 @@ the `AfterContentComponent`'s parent. Here's the parent's template:

 <code-example path="lifecycle-hooks/src/app/after-content.component.ts" region="parent-template" title="AfterContentParentComponent (template excerpt)" linenums="false"></code-example>

-Notice that the `<app-child>` tag is tucked between the `<after-content>` tags.
+Notice that the `<my-child>` tag is tucked between the `<after-content>` tags.
 Never put content between a component's element tags *unless you intend to project that content
 into the component*.

@ -571,7 +571,7 @@ Now look at the component's template:

 The `<ng-content>` tag is a *placeholder* for the external content.
 It tells Angular where to insert that content.
-In this case, the projected content is the `<app-child>` from the parent.
+In this case, the projected content is the `<my-child>` from the parent.

 <figure>
  <img src='generated/images/guide/lifecycle-hooks/projected-child-view.png' alt="Projected Content">
--- a/aio/content/guide/npm-packages.md
+++ b/aio/content/guide/npm-packages.md
@ -2,7 +2,7 @@

 The [**Angular CLI**](https://cli.angular.io/), Angular applications, and Angular itself depend upon features and functionality provided by libraries that are available as [**npm**](https://docs.npmjs.com/) packages.

-You can download and install these npm packages with the [**npm client**](https://docs.npmjs.com/cli/install), which runs as a Node.js® application.
+You can download and install these npm packages with the [**npm client**](https://docs.npmjs.com/cli/install), which runs as a node.js application.

 The [**yarn client**](https://yarnpkg.com/en/) is a popular alternative for downloading and installing npm packages.
 The Angular CLI uses `yarn` by default to install npm packages when you create a new project.
@ -14,19 +14,19 @@ Node.js and npm are essential to Angular development.
 [Get them now](https://docs.npmjs.com/getting-started/installing-node "Installing Node.js and updating npm")
 if they're not already installed on your machine.

-**Verify that you are running Node.js `v8.x` or higher and npm `5.x` or higher**
+**Verify that you are running node `v4.x.x` or higher and npm `3.x.x` or higher**
 by running the commands `node -v` and `npm -v` in a terminal/console window.
 Older versions produce errors.

 Consider using [nvm](https://github.com/creationix/nvm) for managing multiple
-versions of Node.js and npm. You may need [nvm](https://github.com/creationix/nvm) if
-you already have projects running on your machine that use other versions of Node.js and npm.
+versions of node and npm. You may need [nvm](https://github.com/creationix/nvm) if
+you already have projects running on your machine that use other versions of node and npm.

 </div>

 ## _package.json_

-Both `npm` and `yarn` install packages that are identified in a [**package.json**](https://docs.npmjs.com/files/package.json) file.
+Both `npm` and `yarn` install packages identified in a [**package.json**](https://docs.npmjs.com/files/package.json) file.

 The CLI `ng new` command creates a default `package.json` file for your project.
 This `package.json` specifies _a starter set of packages_ that work well together and 
@ -129,7 +129,7 @@ You don't deploy them with the production application although there is no harm
 For example, see the [Angular language service extension for VS Code](https://marketplace.visualstudio.com/items?itemName=Angular.ng-template)


-**@types/... **: TypeScript definition files for 3rd party libraries such as Jasmine and Node.js.
+**@types/... **: TypeScript definition files for 3rd party libraries such as Jasmine and node.


 **[codelyzer](https://www.npmjs.com/package/codelyzer)**: A linter for Angular apps whose rules conform to the Angular [style guide](guide/styleguide).
@ -145,7 +145,7 @@ For example, see the [Angular language service extension for VS Code](https://ma
 Built on top of [WebDriverJS](https://github.com/SeleniumHQ/selenium/wiki/WebDriverJs).


-**[ts-node](https://www.npmjs.com/package/ts-node)**: TypeScript execution environment and REPL for Node.js.
+**[ts-node](https://www.npmjs.com/package/ts-node)**: TypeScript execution environment and REPL for node.


 **[tslint](https://www.npmjs.com/package/tslint)**: a static analysis tool that checks TypeScript code for readability, maintainability, and functionality errors.
--- a/aio/content/guide/quickstart.md
+++ b/aio/content/guide/quickstart.md
@ -32,7 +32,7 @@ if they are not already on your machine.



-**Verify that you are running at least Node.js version `8.x` or greater and npm version `5.x` or greater**
+**Verify that you are running at least node `6.9.x` and npm `3.x.x`**
 by running `node -v` and `npm -v` in a terminal/console window.
 Older versions produce errors, but newer versions are fine.

--- a/aio/content/guide/reactive-forms.md
+++ b/aio/content/guide/reactive-forms.md
@ -1068,7 +1068,7 @@ Replace the address `FormGroup` definition with a `secretLairs`  `FormArray` def

 </code-example>

-In `hero-detail.component.html` change `formGroupName="address"` to `formArrayName="secretLairs"`.
+In `hero-detail.component.html` change `formArrayName="address"` to `formArrayName="secretLairs"`.

 <code-example path="reactive-forms/src/app/hero-detail/hero-detail-8.component.html" region="form-array-name" title="src/app/hero-detail/hero-detail.component.ts" linenums="false">

--- a/aio/content/guide/releases.md
+++ b/aio/content/guide/releases.md
@ -1,168 +0,0 @@
-# Angular versioning and releases
-
-We recognize that you need stability from the Angular framework. Stability ensures that reusable components and libraries, tutorials, tools, and learned practices don't become obsolete unexpectedly. Stability is essential for the ecosystem around Angular to thrive.
-
-We also share with you the desire for Angular to keep evolving. We strive to ensure that the foundation on top of which you are building is continuously improving and enabling you to stay up-to-date with the rest of the web ecosystem and your user needs.
-
-This document contains the practices that we follow to provide you with a leading-edge app development platform, balanced with stability. We strive to ensure that future changes are always introduced in a predictable way. We want everyone who depends on Angular to know when and how new features are added, and to be well-prepared when obsolete ones are removed.
-
-See [Updating your projects](guide/updating "Updating your projects") for information about how to update your apps and libraries to the latest version of Angular.
-
-<div class="l-sub-section">
-
-The practices described in this document apply to Angular 2.0 and later. If you are currently using AngularJS, see [Upgrading from AngularJS](guide/upgrade "Upgrading from Angular JS"). _AngularJS_ is the name for all v1.x versions of Angular.
-
-</div>
-
-
-{@a angular-versioning}
-## Angular versioning
-
-Angular version numbers indicate the level of changes that are introduced by the release. This use of [semantic versioning](https://semver.org/ "Semantic Versioning Specification") helps you understand the potential impact of updating to a new version. 
-
-Angular version numbers have three parts: `major.minor.patch`. For example, version 5.2.9 indicates major version 5, minor version 2, and patch version 9. 
-
-The version number is incremented based on the level of change included in the release. 
-
-* Major releases contain significant new features, some but minimal developer assistance is expected during the update. When updating to a new major release, you may need to run update scripts, refactor code, run additional tests, and learn new APIs. 
-
-* Minor releases contain new smaller features. Minor releases are fully backward-compatible; no developer assistance is expected during update, but you can optionally modify your apps and libraries to begin using new APIs, features, and capabilities that were added in the release. We update peer dependencies in minor versions by expanding the supported versions, but we do not require projects to update these dependencies. 
-
-* Patch releases are low risk, bug fix releases. No developer assistance is expected during update.
-
-If you are updating within the same major version, then you can skip any intermediate versions and update directly to the targeted version. For example, if you want to update from 5.0.0 to 5.2.9, then you can update directly; you do not need to update from 5.0.0 to 5.1.0 before updating to 5.2.9. 
-
-If you are updating from one major version to another, then we recommend that you don't skip major versions. Follow the instructions to incrementally update to the next major version, testing and validating at each step. For example, if you want to update from version 4.x.x to version 6.x.x, we recommend that you update to the latest 5.x.x release first. After successfully updating to 5.x.x, you can then update to 6.x.x. 
-
-Pre-release previews&mdash;such as Beta and Release Candidate versions&mdash;are indicated by appending a dash and a beta or rc identifier, such as version 5.2.9-rc.3.
-
-{@a frequency}
-## Release frequency
-
-We work toward a regular schedule of releases, so that you can plan and coordinate your updates with the continuing evolution of Angular.
-
-In general, you can expect the following release cycle:
-
-* A major release every 6 months
-
-* 1-3 minor releases for each major release
-
-* A patch release almost every week
-
-We bake quality into our releases&mdash;and let you preview what's coming next&mdash;by providing Beta releases and release candidates (RCs) for each major and minor release.
-
-This cadence of releases gives you access to new beta features as soon as they are ready, while maintaining the stability and reliability of the platform for production users.
-
-
-{@a schedule}
-## Release schedule
-
-<div class="l-sub-section">
-
-Disclaimer: The dates are offered as general guidance and may be adjusted by us when necessary to ensure delivery of a high-quality platform. 
-
-</div>
-
-The following table contains our current target release dates for the next two major versions of Angular: 
-
- Date                   | Stable Release | Compatibility
- ---------------------- | -------------- | ----------------
- September/October 2018 | 7.0.0          | ^6.0.0
- March/April 2019       | 8.0.0          | ^7.0.0
-
- Compatiblity note: The primary goal of the backwards compatibility promise is to ensure that changes in the core framework and tooling don't break the existing ecosystem of components and applications and don't put undue upgrade/migration burden on Angular application and component authors.
-
-
-{@a lts}
-{@a support}
-## Support policy
-
-All of our major releases are supported for 18 months. 
-
-* 6 months of active support, during which regularly-scheduled updates and patches are released, as described above in [Release frequency](#frequency "Release frequency").
-
-* 12 months of long-term support (LTS). During the LTS period, only critical fixes and security patches will be released.
-
-The following table provides the support status and key dates for Angular version 4.0.0 and higher. 
-
-<style>
-
-    td, th {vertical-align: top}
-
-</style>
-
-<table>
-
-    <tr>
-        <th>Version</th>
-        <th>Status</th>
-        <th>Release Date</th>
-        <th>LTS Start Date</th>
-        <th>LTS End Date</th>
-    </tr>
-
-    <tr>
-        <td>^4.0.0</td>
-        <td>LTS</td>
-        <td>March 23, 2017</td>
-        <td>September 23, 2017</td>
-        <td>September 23, 2018</td>
-    </tr>
-
-    <tr>
-        <td>^5.0.0</td>
-        <td>LTS</td>
-        <td>November 1, 2017</td>
-        <td>May 1, 2018</td>
-        <td>May 1, 2019</td>
-    </tr>
-
-    <tr>
-        <td>^6.0.0</td>
-        <td>Active</td>
-        <td>May 3, 2018</td>
-        <td>November 3, 2018</td>
-        <td>November 3, 2019</td>
-    </tr>
-
-</table>
-
-
-
-{@a deprecation}
-## Deprecation practices
-
-Sometimes &quot;breaking changes&quot;, such as the removal of support for select APIs and features, are necessary to innovate and stay current with new best practices, changing dependencies, or changes in the (web) platform itself. 
-
-To make these transitions as easy as possible, we make two commitments to you:
-
-* We work hard to minimize the number of breaking changes and to provide migration tools when possible. 
-
-* We follow the deprecation policy described here, so you have time to update your apps to the latest APIs and best practices.
-
-To help ensure that you have sufficient time and a clear path to update, this is our deprecation policy:
-
-* We announce deprecated features in the [change log](https://github.com/angular/angular/blob/master/CHANGELOG.md "Angular change log").
-
-* When we announce a deprecation, we also announce a recommended update path.
-
-* We support existing use of a stable API during the deprecation period, so  your code will keep working during that period. 
-
-* We support each deprecated API for at least two subsequent major releases, which means at least 12 months after deprecation.
-
-* We only make peer dependency updates that require changes to your apps in a major release. In minor releases, we update peer dependencies by expanding the supported versions, but we do not require projects to update these dependencies until a future major version. 
-
-
-{@a public-api}
-## Public API surface
-
-Angular is a collection of many packages, sub-projects, and tools. To prevent accidental use of private APIs&mdash;and so that you can clearly understand what is covered by the practices described here&mdash;we document what is and is not considered our public API surface. For details, see [Supported Public API Surface of Angular](https://github.com/angular/angular/blob/master/docs/PUBLIC_API.md "Supported Public API Surface of Angular").
-
-Any changes to the public API surface will be done using the versioning, support, and depreciation policies describe above.
-
-{@a labs}
-## Angular Labs
-
-Angular Labs is an initiative to cultivate new features and iterate on them quickly. Angular Labs provides a safe place for exploration and experimentation by the Angular team.
-
-Angular Labs projects are not ready for production use, and no commitment is made to bring them to production. The policies and practices that are described in this document do not apply to Angular Labs projects.
--- a/aio/content/guide/router.md
+++ b/aio/content/guide/router.md
@ -3656,7 +3656,7 @@ Lazy loading has multiple benefits.
 * You can speed up load time for users that only visit certain areas of the application.
 * You can continue expanding lazy loaded feature areas without increasing the size of the initial load bundle.

-You're already part of the way there.
+You're already made part way there.
 By organizing the application into modules&mdash;`AppModule`,
 `HeroesModule`, `AdminModule` and `CrisisCenterModule`&mdash;you
 have natural candidates for lazy loading.
--- a/aio/content/guide/service-worker-config.md
+++ b/aio/content/guide/service-worker-config.md
@ -70,7 +70,6 @@ interface AssetGroup {
  updateMode?: 'prefetch' | 'lazy';
  resources: {
    files?: string[];
-    /** @deprecated As of v6 `versionedFiles` and `files` options have the same behavior. Use `files` instead. */
    versionedFiles?: string[];
    urls?: string[];
  };
@ -103,7 +102,7 @@ This section describes the resources to cache, broken up into three groups.

 * `files` lists patterns that match files in the distribution directory. These can be single files or glob-like patterns that match a number of files.

-* `versionedFiles` has been deprecated. As of v6 `versionedFiles` and `files` options have the same behavior. Use `files` instead.
+* `versionedFiles` is like `files` but should be used for build artifacts that already include a hash in the filename, which is used for cache busting. The Angular service worker can optimize some aspects of its operation if it can assume file contents are immutable.

 * `urls` includes both URLs and URL patterns that will be matched at runtime. These resources are not fetched directly and do not have content hashes, but they will be cached according to their HTTP headers. This is most useful for CDNs such as the Google Fonts service.<br>
  _(Negative glob patterns are not supported.)_
--- a/aio/content/guide/service-worker-getting-started.md
+++ b/aio/content/guide/service-worker-getting-started.md
@ -23,14 +23,10 @@ ng add  @angular/pwa --project *project-name*

 The above command completes the following actions:

-1. Adds the `@angular/service-worker` package to your project. 
+1. Adds the `@angular/service-worker` package. 
 2. Enables service worker build support in the CLI.
 3. Imports and registers the service worker in the app module.
-4. Updates the `index.html` file:
-    * Includes a link to add the `manifest.json` file.
-    * Adds meta tags for `theme-color`.
-5. Installs icon files to support the installed Progressive Web App (PWA).
-6. Creates the service worker configuration file called [`ngsw-config.json`](/guide/service-worker-config), which specifies the caching behaviors and other settings. 
+4. Creates the service worker configuration file called `ngsw-config.json` which specifies the caching behaviors and other settings. 


 Now, build the project: 
--- a/aio/content/guide/setup.md
+++ b/aio/content/guide/setup.md
@ -10,7 +10,7 @@ Setting up a new project on your machine is quick and easy with the **QuickStart
 maintained [on github](https://github.com/angular/quickstart "Install the github QuickStart repo").


-Make sure you have [Node.js® and npm installed](guide/setup#install-prerequisites "What if you don't have Node.js and npm?").
+Make sure you have [node and npm installed](guide/setup#install-prerequisites "What if you don't have node and npm?").

 {@a clone}

@ -301,22 +301,23 @@ If you're new to Angular, we recommend you follow the [tutorial](tutorial "Tour



-## Appendix: Node.js and npm
+## Appendix: node and npm


-[Node.js](https://nodejs.org/en/) and the [npm](https://www.npmjs.com/) package manager are essential to modern web development with Angular and other platforms.
-Node.js powers client development and build tools.
-The _npm_ package manager, which is itself a _Node.js_ application, installs JavaScript libraries.
+Node.js and npm are essential to modern web development with Angular and other platforms.
+Node powers client development and build tools.
+The _npm_ package manager, itself a _node_ application, installs JavaScript libraries.

 <a href="https://docs.npmjs.com/getting-started/installing-node" target="_blank" title="Installing Node.js and updating npm">
 Get them now</a> if they're not already installed on your machine.

-**Verify that you are running Node.js `v8.x` or higher and npm `5.x` or higher**
+**Verify that you are running node `v4.x.x` or higher and npm `3.x.x` or higher**
 by running the commands `node -v` and `npm -v` in a terminal/console window.
 Older versions produce errors.

-We recommend [nvm](https://github.com/creationix/nvm) for managing multiple versions of Node.js and npm.
-You may need [nvm](https://github.com/creationix/nvm) if you already have projects running on your machine that use other versions of Node.js and npm.
+We recommend [nvm](https://github.com/creationix/nvm) for managing multiple versions of node and npm.
+You may need [nvm](https://github.com/creationix/nvm) if you already have projects running on your machine that
+use other versions of node and npm.


 {@a why-locally}
--- a/aio/content/guide/styleguide.md
+++ b/aio/content/guide/styleguide.md
@ -933,18 +933,29 @@ As always, strive for consistency.

 <a href="#toc">Back to top</a>

-{@a 05-02}
+{@a 02-06}

-### Component selectors
+### Directive selectors

-#### Style 05-02
+#### Style 02-06


 <div class="s-rule do">



-**Do** use _dashed-case_ or _kebab-case_ for naming the element selectors of components.
+**Do** Use lower camel case for naming the selectors of directives.
+
+
+</div>
+
+
+
+<div class="s-why">
+
+
+
+**Why?** Keeps the names of the properties defined in the directives that are bound to the view consistent with the attribute names.


 </div>
@ -955,40 +966,16 @@ As always, strive for consistency.



-**Why?** Keeps the element names consistent with the specification for [Custom Elements](https://www.w3.org/TR/custom-elements/).
+**Why?** The Angular HTML parser is case sensitive and recognizes lower camel case.


 </div>

-
-
-<code-example path="styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
-
-</code-example>
-
-
-
-
-
-<code-tabs>
-
-  <code-pane title="app/heroes/shared/hero-button/hero-button.component.ts" path="styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.ts" region="example">
-
-  </code-pane>
-
-  <code-pane title="app/app.component.html" path="styleguide/src/05-02/app/app.component.html">
-
-  </code-pane>
-
-</code-tabs>
-
-
-
 <a href="#toc">Back to top</a>

 {@a 02-07}

-### Component custom prefix
+### Custom prefix for components

 #### Style 02-07

@ -1091,51 +1078,11 @@ For example, the prefix `toh` represents from **T**our **o**f **H**eroes and the



-<a href="#toc">Back to top</a>

-{@a 02-06}
-
-### Directive selectors
-
-#### Style 02-06
-
-
-<div class="s-rule do">
-
-
-
-**Do** Use lower camel case for naming the selectors of directives.
-
-
-</div>
-
-
-
-<div class="s-why">
-
-
-
-**Why?** Keeps the names of the properties defined in the directives that are bound to the view consistent with the attribute names.
-
-
-</div>
-
-
-
-<div class="s-why-last">
-
-
-
-**Why?** The Angular HTML parser is case sensitive and recognizes lower camel case.
-
-
-</div>
-
-<a href="#toc">Back to top</a>

 {@a 02-08}

-### Directive custom prefix
+### Custom prefix for directives

 #### Style 02-08

@ -3109,9 +3056,9 @@ module are referenced across the entire application.



-**Consider** _not_ providing services in shared modules. Services are usually
+**Avoid** providing services in shared modules. Services are usually
 singletons that are provided once for the entire application or
-in a particular feature module. There are exceptions, however. For example, in the sample code that follows, notice that the `SharedModule` provides `FilterTextService`. This is acceptable here because the service is stateless;that is, the consumers of the service aren't impacted by new instances.
+in a particular feature module.


 </div>
@ -3763,6 +3710,59 @@ A typical *lazy loaded folder* contains a *routing component*, its child compone

 ## Components

+{@a 05-02}
+
+### Component selector names
+
+#### Style 05-02
+
+
+<div class="s-rule do">
+
+
+
+**Do** use _dashed-case_ or _kebab-case_ for naming the element selectors of components.
+
+
+</div>
+
+
+
+<div class="s-why-last">
+
+
+
+**Why?** Keeps the element names consistent with the specification for [Custom Elements](https://www.w3.org/TR/custom-elements/).
+
+
+</div>
+
+
+
+<code-example path="styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.avoid.ts" region="example" title="app/heroes/shared/hero-button/hero-button.component.ts">
+
+</code-example>
+
+
+
+
+
+<code-tabs>
+
+  <code-pane title="app/heroes/shared/hero-button/hero-button.component.ts" path="styleguide/src/05-02/app/heroes/shared/hero-button/hero-button.component.ts" region="example">
+
+  </code-pane>
+
+  <code-pane title="app/app.component.html" path="styleguide/src/05-02/app/app.component.html">
+
+  </code-pane>
+
+</code-tabs>
+
+
+
+<a href="#toc">Back to top</a>
+
 {@a 05-03}

 ### Components as elements
--- a/aio/content/guide/testing-observables.md
+++ b/aio/content/guide/testing-observables.md
@ -0,0 +1,3 @@
+# Testing
+
+TBD. Original content [here](https://docs.google.com/document/d/1gGP5sqWNCHAWWV_GLdZQ1XyMO4K-CHksUxux0BFtVxk/edit#heading=h.ohqykkhzdhb2).
--- a/aio/content/guide/testing.md
+++ b/aio/content/guide/testing.md
@ -57,11 +57,11 @@ The tests run again, the browser refreshes, and the new test results appear.

 The CLI takes care of Jasmine and karma configuration for you.

-You can fine-tune many options by editing the `karma.conf.js` and
-the `test.ts` files in the `src/` folder.
+You can fine-tune many options by editing the `karma.conf.js` file in the project root folder and
+the `test.ts` file in the `src/` folder.

 The `karma.conf.js` file is a partial karma configuration file.
-The CLI constructs the full runtime configuration in memory,based on application structure specified in the `angular.json` file, supplemented by `karma.conf.js`.
+The CLI constructs the full runtime configuration in memory,based on application structure specified in the `.angular-cli.json` file, supplemented by `karma.conf.js`.

 Search the web for more details about Jasmine and karma configuration.

@ -204,7 +204,8 @@ The test consumes that spy in the same way it did earlier.
 Most test suites in this guide call `beforeEach()` to set the preconditions for each `it()` test
 and rely on the `TestBed` to create classes and inject services.

-There's another school of testing that never calls `beforeEach()` and prefers to create classes explicitly rather than use the `TestBed`.
+There's another school of testing that never calls `beforeEach()` and
+and prefers to create classes explicitly rather than use the `TestBed`.

 Here's how you might rewrite one of the `MasterService` tests in that style.

@ -346,7 +347,7 @@ It appears within the template of a parent component,
 which binds a _hero_ to the `@Input` property and
 listens for an event raised through the _selected_ `@Output` property.

-You can test that the class code works without creating the `DashboardHeroComponent`
+You can test that the class code works without creating the the `DashboardHeroComponent`
 or its parent component.

 <code-example 
@ -398,7 +399,7 @@ But a component is more than just its class.
 A component interacts with the DOM and with other components.
 The _class-only_ tests can tell you about class behavior.
 They cannot tell you if the component is going to render properly,
-respond to user input and gestures, or integrate with its parent and child components.
+respond to user input and gestures, or integrate with its parent and and child components.

 None of the _class-only_ tests above can answer key questions about how the
 components actually behave on screen.
@ -2366,9 +2367,9 @@ The [override metadata object](#metadata-override-object) is a generic defined a

 <code-example format="." language="javascript">
  type MetadataOverride<T> = {
-    add?: Partial<T>;
-    remove?: Partial<T>;
-    set?: Partial<T>;
+    add?: T;
+    remove?: T;
+    set?: T;
  };
 </code-example>

@ -2724,9 +2725,9 @@ appropriate to the method, that is, the parameter of an `@NgModule`,

 <code-example format="." language="javascript">
  type MetadataOverride<T> = {
-    add?: Partial<T>;
-    remove?: Partial<T>;
-    set?: Partial<T>;
+    add?: T;
+    remove?: T;
+    set?: T;
  };
 </code-example>

@ -3378,11 +3379,11 @@ next to their corresponding helper files.
 {@a q-e2e}
 #### Why not rely on E2E tests of DOM integration?

-The component DOM tests described in this guide often require extensive setup and 
-advanced techniques whereas the [unit tests](#component-class-testing)
-are comparatively simple.
+The component DOM tests describe in this guide often require extensive setup and 
+advanced techniques where as the [class-only test](#component-class-testing)
+were comparatively simple.

-#### Why not defer DOM integration tests to end-to-end (E2E) testing?
+Why not defer DOM integration tests to end-to-end (E2E) testing?

 E2E tests are great for high-level validation of the entire system.
 But they can't give you the comprehensive test coverage that you'd expect from unit tests.
@ -3399,4 +3400,4 @@ accidental corruption of remote resources.
 It can even be hard to navigate to the component you want to test.

 Because of these many obstacles, you should test DOM interaction
-with unit testing techniques as much as possible.
+with unit testing techniques as much as possible.
--- a/aio/content/guide/typescript-configuration.md
+++ b/aio/content/guide/typescript-configuration.md
@ -131,8 +131,8 @@ QuickStart identifies two *typings*, or `d.ts`, files:

 * [jasmine](http://jasmine.github.io/) typings for the Jasmine test framework.

-* [node](https://www.npmjs.com/package/@types/node) for code that references objects in the *Node.js®* environment;
-
+* [node](https://www.npmjs.com/package/@types/node) for code that references objects in the *nodejs* environment;
+you can view an example in the [webpack](guide/webpack) page.

 QuickStart doesn't require these typings but many of the samples do.

--- a/aio/content/guide/universal.md
+++ b/aio/content/guide/universal.md
@ -16,7 +16,7 @@ Meanwhile, the browser downloads the full client version and switches to it auto
 <div class="l-sub-section">

 [Download the finished sample code](generated/zips/universal/universal.zip),
-which runs in a [Node.js® Express](https://expressjs.com/) server.
+which runs in a [node express](https://expressjs.com/) server.

 </div>

@ -123,7 +123,7 @@ You'll add more files to support building and serving with Universal.

 In this example, the Angular CLI compiles and bundles the Universal version of the app with the
 [AOT (Ahead-of-Time) compiler](guide/aot-compiler).
-A Node.js® Express web server turns client requests into the HTML pages rendered by Universal.
+A node/express web server turns client requests into the HTML pages rendered by Universal.

 You will create:

@ -180,7 +180,7 @@ npm install --save @angular/platform-server @nguniversal/module-map-ngfactory-lo

 {@a transition}

-## Modify the client app
+### Modify the client app

 A Universal app can act as a dynamic, content-rich "splash screen" that engages the user.
 It gives the appearance of a near-instant application.
@ -190,9 +190,7 @@ Once loaded, Angular transitions from the static server-rendered page to the dyn

 You must make a few changes to your application code to support both server-side rendering and the transition to the client app.

-{@a root-app-module}
-
-### The root `AppModule`
+#### The root `AppModule`

 Open file `src/app/app.module.ts` and find the `BrowserModule` import in the `NgModule` metadata.
 Replace that import with this one:
@ -208,29 +206,9 @@ You can get runtime information about the current platform and the `appId` by in
 <code-example path="universal/src/app/app.module.ts" region="platform-detection" title="src/app/app.module.ts (platform detection)">
 </code-example>

-{@a cli-output}
-
-### Build Destination
-
-A Universal app is distributed in two parts: the server-side code that serves up the initial application, and the client-side code that's loaded in dynamically. 
-
-The Angular CLI outputs the client-side code in the `dist` directory by default, so you modify the `outputPath` for the __build__ target in the `angular.json` to keep the client-side build outputs separate from the server-side code. The client-side build output will be served by the Express server.
-
-```
-...
-"build": {
-  "builder": "@angular-devkit/build-angular:browser",
-  "options": {
-    "outputPath": "dist/browser",
-    ...
-  } 
-}
-...
-```
-
 {@a http-urls}

-### Absolute HTTP URLs
+#### Absolute HTTP URLs

 The tutorial's `HeroService` and `HeroSearchService` delegate to the Angular `HttpClient` module to fetch application data.
 These services send requests to _relative_ URLs such as `api/heroes`.
@ -284,19 +262,6 @@ The `ModuleMapLoaderModule` is a server-side module that allows lazy-loading of

 This is also the place to register providers that are specific to running your app under Universal.

-{@a app-server-entry-point}
-
-### App server entry point
-
-The `Angular CLI` uses the `AppServerModule` to build the server-side bundle. 
-
-Create a `main.server.ts` file in the `src/` directory that exports the `AppServerModule`:
-
-<code-example path="universal/src/main.server.ts" title="src/main.server.ts">
-</code-example>
-
-The `main.server.ts` will be referenced later to add a `server` target to the `Angular CLI` configuration.
-
 {@a web-server}

 ### Universal web server
@ -456,8 +421,6 @@ This config extends from the root's `tsconfig.json` file. Certain settings are n
 * The `angularCompilerOptions` section guides the AOT compiler:
  * `entryModule` - the root module of the server application, expressed as `path/to/file#ClassName`.

-{@a universal-webpack-configuration}
-
 ### Universal Webpack configuration

 Universal applications doesn't need any extra Webpack configuration, the CLI takes care of that for you,
@ -470,47 +433,22 @@ Create a `webpack.server.config.js` file in the project root directory with the

 **Webpack configuration** is a rich topic beyond the scope of this guide.

-{@a universal-cli-configuration}
-
-### Angular CLI configuration
-
-The CLI provides builders for different types of __targets__. Commonly known targets such as `build` and `serve` already exist in the `angular.json` configuration. To target a server-side build, add a `server` target to the `architect` configuration object.
-
-* The `outputPath` tells where the resulting build will be created.
-* The `main` provides the main entry point to the previously created `main.server.ts`
-* The `tsConfig` uses the `tsconfig.server.json` as configuration for the TypeScript and AOT compilation.
-
-```
-"architect": {
-  ...
-  "server": {
-    "builder": "@angular-devkit/build-angular:server",
-    "options": {
-      "outputPath": "dist/server",
-      "main": "src/main.server.ts",
-      "tsConfig": "src/tsconfig.server.json"
-    }
-  }
-  ...
-}
-```
-
 ## Build and run with universal

-Now that you've created the TypeScript and Webpack config files and configured the Angular CLI, you can build and run the Universal application.
+Now that you've created the TypeScript and Webpack config files, you can build and run the Universal application.

 First add the _build_ and _serve_ commands to the `scripts` section of the `package.json`:

-```
+<code-example format="." language="ts">
 "scripts": {
    ...
-    "build:ssr": "npm run build:client-and-server-bundles && npm run webpack:server",
-    "serve:ssr": "node dist/server",
-    "build:client-and-server-bundles": "ng build --prod && ng run angular.io-example:server",
+    "build:universal": "npm run build:client-and-server-bundles && npm run webpack:server",
+    "serve:universal": "node dist/server.js",
+    "build:client-and-server-bundles": "ng build --prod && ng build --prod --app 1 --output-hashing=false",
    "webpack:server": "webpack --config webpack.server.config.js --progress --colors"
    ...
 }
-```
+</code-example>

 {@a build}

@ -519,7 +457,7 @@ First add the _build_ and _serve_ commands to the `scripts` section of the `pack
 From the command prompt, type

 <code-example format="." language="bash">
-npm run build:ssr
+npm run build:universal
 </code-example>

 The Angular CLI compiles and bundles the universal app into two different folders, `browser` and `server`.
@ -531,7 +469,7 @@ Webpack transpiles the `server.ts` file into Javascript.
 After building the application, start the server.

 <code-example format="." language="bash">
-npm run serve:ssr
+npm run serve:universal
 </code-example>

 The console window should say
--- a/aio/content/guide/updating.md
+++ b/aio/content/guide/updating.md
@ -1,69 +0,0 @@
-# Updating your Angular projects
-
-Just like Web and the entire web ecosystem, Angular is continuously improving. Angular balances continuous improvement with a strong focus on stability and making updates easy. Keeping your Angular app up-to-date enables you to take advantage of leading-edge new features, as well as optimizations and bug fixes. 
-
-This document contains information and resources to help you keep your Angular apps and libraries up-to-date. 
-
-For information about our versioning policy and practices&mdash;including 
-support and deprecation practices, as well as the release schedule&mdash;see [Angular versioning and releases](guide/releases "Angular versioning and releases"). 
-
-
-<div class="l-sub-section">
-
-If you are currently using AngularJS, see [Upgrading from AngularJS](guide/upgrade "Upgrading from Angular JS"). _AngularJS_ is the name for all v1.x versions of Angular.
-
-</div>
-
-
-{@a announce}
-## Getting notified of new releases
-
-To be notified when new releases are available, follow [@angular](https://twitter.com/angular "@angular on Twitter") on Twitter or subscribe to the [Angular blog](https://blog.angular.io "Angular blog"). 
-
-{@a learn}
-## Learning about new features
-
-What's new? What's changed? We share the most important things you need to know on the Angular blog in [release announcements]( https://blog.angular.io/tagged/release%20notes "Angular blog - release announcements"). 
-
-To review a complete list of changes, organized by version, see the [Angular change log](https://github.com/angular/angular/blob/master/CHANGELOG.md "Angular change log").
-
-
-{@a checking-version-app}
-## Checking your version of Angular
-
-To check your app's version of Angular: From within your project directory, use the `ng version` command. 
- 
-
-{@a checking-version-angular}
-## Finding the current version of Angular
-
-The most recent stable released version of Angular appears in the [Angular documentation](https://angular.io/docs "Angular documentation") at the bottom of the left side navigation. For example, `stable (v5.2.9)`.
-
-You can also find the most current version of Angular by using the [CLI command `ng update`](https://github.com/angular/angular-cli/wiki/update "Angular CLI update documentation"). By default, `ng update` (without additional arguments) lists the updates that are available to you.  
-
-
-{@a updating}
-## Updating your environment and apps
-
-To make updating easy, we provide complete instructions in the interactive [Angular Update Guide](https://update.angular.io/ "Angular Update Guide").
-
-The Angular Update Guide provides customized update instructions, based on the current and target versions that you specify. It includes basic and advanced update paths, to match the complexity of your applications. It also includes troubleshooting information and any recommended manual changes to help you get the most out of the new release. 
-
-For simple updates, the [CLI command `ng update`](https://github.com/angular/angular-cli/wiki/update "Angular CLI update documentation") is all you need. Without additional arguments, `ng update` lists the updates that are available to you and provides recommended steps to update your application to the most current version. 
-
-{@a resources}
-## Resource summary
-
-* Release announcements: [Angular blog - release announcements](https://blog.angular.io/tagged/release%20notes "Angular blog announcements about recent releases")
-
-* Release announcements (older): [Angular blog - announcements about releases prior to August 2017](https://blog.angularjs.org/search?q=available&by-date=true "Angular blog announcements about releases prior to August 2017")
-
-* Release details: [Angular change log](https://github.com/angular/angular/blob/master/CHANGELOG.md "Angular change log")
-
-* Update instructions: [Angular Update Guide](https://update.angular.io/ "Angular Update Guide")
-
-* Update command reference: [Angular CLI update documentation](https://github.com/angular/angular-cli/wiki/update "Angular CLI update documentation")
-
-* Versioning, release, support, and deprecation practices: [Angular versioning and releases](guide/releases "Angular versioning and releases")
-
-* Release schedule: [Angular versioning and releases](guide/releases#schedule "Angular versioning and releases")
--- a/aio/content/guide/upgrade.md
+++ b/aio/content/guide/upgrade.md
@ -1,4 +1,4 @@
-# Upgrading from AngularJS to Angular
+# Upgrading from AngularJS

 _Angular_ is the name for the Angular of today and tomorrow.
 _AngularJS_ is the name for all v1.x versions of Angular.
--- a/aio/content/guide/visual-studio-2015.md
+++ b/aio/content/guide/visual-studio-2015.md
@ -53,7 +53,7 @@ if they are not already on your machine.



-**Verify that you are running Node.js version `8.x` or greater, and npm `5.x` or greater**
+**Verify that you are running node version `4.6.x` or greater, and npm `3.x.x` or greater**
 by running `node -v` and `npm -v` in a terminal window.
 Older versions produce errors.

--- a/aio/content/guide/webpack.md
+++ b/aio/content/guide/webpack.md
@ -0,0 +1,801 @@
+# Webpack: An Introduction
+
+<style>
+  h4 {font-size: 17px !important; text-transform: none !important;}
+  .syntax { font-family: Consolas, 'Lucida Sans', Courier, sans-serif; color: black; font-size: 85%; }
+
+</style>
+
+
+
+[**Webpack**](https://webpack.github.io/) is a popular module bundler,
+a tool for bundling application source code in convenient _chunks_
+and for loading that code from a server into a browser.
+
+It's an excellent alternative to the *SystemJS* approach used elsewhere in the documentation.
+This guide offers a taste of Webpack and explains how to use it with Angular applications.
+
+
+{@a top}
+
+<!--
+
+
+# Contents
+
+* [What is Webpack?](guide/webpack#what-is-webpack)
+
+  * [Entries and outputs](guide/webpack#entries-outputs)
+  * [Multiple bundles](guide/webpack#multiple-bundles)
+  * [Loaders](guide/webpack#loaders)
+  * [Plugins](guide/webpack#plugins)
+
+* [Configuring Webpack](guide/webpack#configure-webpack)
+
+  * [Polyfills](guide/webpack#polyfills)
+  * [Common configuration](guide/webpack#common-configuration)
+  * [Inside `webpack.common.js`](guide/webpack#inside-webpack-commonjs)
+
+    * [entry](guide/webpack#common-entries)
+    * [resolve extension-less imports](guide/webpack#common-resolves)
+    * [`module.rules`](guide/webpack#common-rules)
+    * [Plugins](guide/webpack#plugins)
+    * [`CommonsChunkPlugin`](guide/webpack#commons-chunk-plugin)
+    * [`HtmlWebpackPlugin`](guide/webpack#html-webpack-plugin)
+
+  * [Environment specific configuration](guide/webpack#environment-configuration)
+  * [Development configuration](guide/webpack#development-configuration)
+  * [Production configuration](guide/webpack#production-configuration)
+  * [Test configuration](guide/webpack#test-configuration)
+
+* [Trying it out](guide/webpack#try)
+* [Highlights](guide/webpack#highlights)
+* [Conclusion](guide/webpack#conclusion)
+
+-->
+
+You can also <a href="generated/zips/webpack/webpack.zip" target="_blank">download the final result.</a>
+
+{@a what-is-webpack}
+
+## What is Webpack?
+
+Webpack is a powerful module bundler.
+A _bundle_ is a JavaScript file that incorporates _assets_ that *belong* together and
+should be served to the client in a response to a single file request.
+A bundle can include JavaScript, CSS styles, HTML, and almost any other kind of file.
+
+Webpack roams over your application source code,
+looking for `import` statements, building a dependency graph, and emitting one or more _bundles_.
+With plugins and rules, Webpack can preprocess and minify different non-JavaScript files such as TypeScript, SASS, and LESS files.
+
+You determine what Webpack does and how it does it with a JavaScript configuration file, `webpack.config.js`.
+
+
+{@a entries-outputs}
+
+
+
+### Entries and outputs
+
+You supply Webpack with one or more *entry* files and let it find and incorporate the dependencies that radiate from those entries.
+The one entry point file in this example is the application's root file, `src/main.ts`:
+
+
+<code-example path="webpack/config/webpack.common.js" region="one-entry" title="webpack.config.js (single entry)" linenums="false">
+
+</code-example>
+
+
+
+Webpack inspects that file and traverses its `import` dependencies recursively.
+
+
+<code-example path="webpack/src/app/app.component.ts" region="component" title="src/main.ts" linenums="false">
+
+</code-example>
+
+
+
+It sees that you're importing `@angular/core` so it adds that to its dependency list for potential inclusion in the bundle.
+It opens the `@angular/core` file and follows _its_ network of `import` statements until it has built the complete dependency graph from `main.ts` down.
+
+Then it **outputs** these files to the `app.js` _bundle file_ designated in configuration:
+
+<code-example name="webpack.config.js (single output)" language="javascript">
+  output: {
+    filename: 'app.js'
+  }
+
+</code-example>
+
+This `app.js` output bundle is a single JavaScript file that contains the application source and its dependencies.
+You'll load it later with a `<script>` tag in the `index.html`.
+
+
+{@a multiple-bundles}
+
+
+#### Multiple bundles
+You probably don't want one giant bundle of everything.
+It's preferable to separate the volatile application app code from comparatively stable vendor code modules.
+
+Change the configuration so that it has two entry points, `main.ts` and `vendor.ts`:
+
+
+<code-example language="javascript">
+  entry: {
+    app: 'src/app.ts',
+    vendor: 'src/vendor.ts'
+  },
+
+  output: {
+    filename: '[name].js'
+  }
+
+</code-example>
+
+
+Webpack constructs two separate dependency graphs
+and emits *two* bundle files, one called `app.js` containing only the application code and
+another called `vendor.js` with all the vendor dependencies.
+
+
+<div class="l-sub-section">
+
+
+
+The `[name]` in the output name is a *placeholder* that a Webpack plugin replaces with the entry names,
+`app` and `vendor`. Plugins are [covered later](guide/webpack#commons-chunk-plugin) in the guide.
+
+
+</div>
+
+
+
+To tell Webpack what belongs in the vendor bundle,
+add a `vendor.ts` file that only imports the application's third-party modules:
+
+<code-example path="webpack/src/vendor.ts" title="src/vendor.ts" linenums="false">
+
+</code-example>
+
+
+
+{@a loaders}
+
+
+
+### Loaders
+
+Webpack can bundle any kind of file: JavaScript, TypeScript, CSS, SASS, LESS, images, HTML, fonts, whatever.
+Webpack _itself_ only understands JavaScript files.
+Teach it to transform non-JavaScript file into their JavaScript equivalents with *loaders*.
+Configure loaders for TypeScript and CSS as follows.
+
+
+<code-example language="javascript">
+  rules: [
+    {
+      test: /\.ts$/,
+      loader: 'awesome-typescript-loader'
+    },
+    {
+      test: /\.css$/,
+      loaders: 'style-loader!css-loader'
+    }
+  ]
+
+</code-example>
+
+
+
+When Webpack encounters `import` statements like the following,
+it applies the `test` RegEx patterns.
+
+
+<code-example language="typescript">
+  import { AppComponent } from './app.component.ts';
+
+  import 'uiframework/dist/uiframework.css';
+
+</code-example>
+
+
+
+When a pattern matches the filename, Webpack processes the file with the associated loader.
+
+The first `import` file matches the `.ts` pattern so Webpack processes it with the `awesome-typescript-loader`.
+The imported file doesn't match the second pattern so its loader is ignored.
+
+The second `import` matches the second `.css` pattern for which you have *two* loaders chained by the (!) character.
+Webpack applies chained loaders *right to left*. So it applies
+the `css` loader first to flatten CSS `@import` and `url(...)` statements.
+Then it applies the `style` loader to append the css inside `<style>` elements on the page.
+
+
+{@a plugins}
+
+
+
+### Plugins
+
+Webpack has a build pipeline with well-defined phases.
+Tap into that pipeline with plugins such as the `uglify` minification plugin:
+
+<code-example language="javascript">
+  plugins: [
+    new webpack.optimize.UglifyJsPlugin()
+  ]
+
+</code-example>
+
+
+
+{@a configure-webpack}
+
+
+
+## Configuring Webpack
+
+After that brief orientation, you are ready to build your own Webpack configuration for Angular apps.
+
+Begin by setting up the development environment.
+
+Create a new project folder.
+
+<code-example language="sh" class="code-shell">
+  mkdir angular-webpack
+  cd    angular-webpack
+
+</code-example>
+
+
+
+Add these files:
+
+
+<code-tabs>
+
+  <code-pane title="package.json" path="webpack/package.webpack.json">
+
+  </code-pane>
+
+  <code-pane title="src/tsconfig.json" path="webpack/src/tsconfig.1.json">
+
+  </code-pane>
+
+  <code-pane title="webpack.config.js" path="webpack/webpack.config.js">
+
+  </code-pane>
+
+  <code-pane title="karma.conf.js" path="webpack/karma.webpack.conf.js">
+
+  </code-pane>
+
+  <code-pane title="config/helpers.js" path="webpack/config/helpers.js">
+
+  </code-pane>
+
+</code-tabs>
+
+
+
+<div class="l-sub-section">
+
+
+
+Many of these files should be familiar from other Angular documentation guides,
+especially the [Typescript configuration](guide/typescript-configuration) and
+[npm packages](guide/npm-packages) guides.
+
+Webpack, the plugins, and the loaders are also installed as packages.
+They are listed in the updated `packages.json`.
+
+
+</div>
+
+
+
+Open a terminal window and install the npm packages.
+
+<code-example language="sh" class="code-shell">
+  npm install
+
+</code-example>
+
+
+
+{@a polyfills}
+
+
+
+### Polyfills
+
+You'll need polyfills to run an Angular application in most browsers as explained
+in the [Browser Support](guide/browser-support) guide.
+
+Polyfills should be bundled separately from the application and vendor bundles.
+Add a `polyfills.ts` like this one to the `src/` folder.
+
+
+<code-example path="webpack/src/polyfills.ts" title="src/polyfills.ts" linenums="false">
+
+</code-example>
+
+
+
+<div class="callout is-critical">
+
+
+
+<header>
+  Loading polyfills
+</header>
+
+
+
+Load `zone.js` early within `polyfills.ts`, immediately after the other ES6 and metadata shims.
+
+
+</div>
+
+
+
+Because this bundle file will load first, `polyfills.ts` is also a good place to configure the browser environment
+for production or development.
+
+
+{@a common-configuration}
+
+
+
+### Common configuration
+
+Developers typically have separate configurations for development, production, and test environments.
+All three have a lot of configuration in common.
+
+Gather the common configuration in a file called `webpack.common.js`.
+
+
+<code-example path="webpack/config/webpack.common.js" title="config/webpack.common.js" linenums="false">
+
+</code-example>
+
+
+
+{@a inside-webpack-commonjs}
+
+
+### Inside _webpack.common.js_
+Webpack is a NodeJS-based tool that reads configuration from a JavaScript commonjs module file.
+
+The configuration imports dependencies with `require` statements
+and exports several objects as properties of a `module.exports` object.
+
+* [`entry`](guide/webpack#common-entries)&mdash;the entry-point files that define the bundles.
+* [`resolve`](guide/webpack#common-resolves)&mdash;how to resolve file names when they lack extensions.
+* [`module.rules`](guide/webpack#common-rules)&mdash; `module` is an object with `rules` for deciding how files are loaded.
+* [`plugins`](guide/webpack#common-plugins)&mdash;creates instances of the plugins.
+
+
+{@a common-entries}
+
+
+#### _entry_
+
+The first export is the `entry` object:
+
+
+<code-example path="webpack/config/webpack.common.js" region="entries" title="config/webpack.common.js" linenums="false">
+
+</code-example>
+
+
+
+This `entry` object defines the three bundles:
+
+* `polyfills`&mdash;the polyfills needed to run Angular applications in most modern browsers.
+* `vendor`&mdash;the third-party dependencies such as Angular, lodash, and bootstrap.css.
+* `app`&mdash;the application code.
+
+
+{@a common-resolves}
+
+
+#### _resolve_ extension-less imports
+
+The app will `import` dozens if not hundreds of JavaScript and TypeScript files.
+You could write `import` statements with explicit extensions like this example:
+
+<code-example language="typescript">
+  import { AppComponent } from './app.component.ts';
+
+</code-example>
+
+
+But most `import` statements don't mention the extension at all.
+Tell Webpack to resolve extension-less file requests by looking for matching files with
+`.ts` extension or `.js` extension (for regular JavaScript files and pre-compiled TypeScript files).
+
+
+<code-example path="webpack/config/webpack.common.js" region="resolve" title="config/webpack.common.js" linenums="false">
+
+</code-example>
+
+
+
+<div class="l-sub-section">
+
+
+
+If Webpack should resolve extension-less files for styles and HTML,
+add `.css` and `.html` to the list.
+
+
+</div>
+
+
+
+{@a common-rules}
+
+
+
+
+#### _module.rules_
+Rules tell Webpack which loaders to use for each file, or module:
+
+
+<code-example path="webpack/config/webpack.common.js" region="loaders" title="config/webpack.common.js" linenums="false">
+
+</code-example>
+
+
+
+* `awesome-typescript-loader`&mdash;a loader to transpile the Typescript code to ES5, guided by the `tsconfig.json` file.
+* `angular2-template-loader`&mdash;loads angular components' template and styles.
+* `html-loader`&mdash;for component templates.
+* images/fonts&mdash;Images and fonts are bundled as well.
+* CSS&mdash;the first pattern matches application-wide styles; the second handles
+component-scoped styles (the ones specified in a component's `styleUrls` metadata property).
+
+<div class="l-sub-section">
+
+
+
+The first pattern is for the application-wide styles. It excludes `.css` files within the `src/app` directory
+where the component-scoped styles sit. The `ExtractTextPlugin` (described below) applies the `style` and `css`
+loaders to these files.
+
+The second pattern filters for component-scoped styles and loads them as strings via the `raw-loader`,
+which is what Angular expects to do with styles specified in a `styleUrls` metadata property.
+
+
+</div>
+
+
+
+<div class="l-sub-section">
+
+
+
+Multiple loaders can be chained using the array notation.
+
+
+</div>
+
+
+
+{@a common-plugins}
+
+
+
+
+#### _plugins_
+Finally, create instances of three plugins:
+
+
+<code-example path="webpack/config/webpack.common.js" region="plugins" title="config/webpack.common.js" linenums="false">
+
+</code-example>
+
+
+
+{@a commons-chunk-plugin}
+
+
+#### *CommonsChunkPlugin*
+
+The `app.js` bundle should contain only application code. All vendor code belongs in the `vendor.js` bundle.
+
+Of course the application code imports vendor code.
+On its own, Webpack is not smart enough to keep the vendor code out of the `app.js` bundle.
+The `CommonsChunkPlugin` does that job.
+
+<div class="l-sub-section">
+
+
+
+The `CommonsChunkPlugin` identifies the hierarchy among three _chunks_: `app` -> `vendor` -> `polyfills`.
+Where Webpack finds that `app` has shared dependencies with `vendor`, it removes them from `app`.
+It would remove `polyfills` from `vendor` if they shared dependencies, which they don't.
+
+
+</div>
+
+
+
+{@a html-webpack-plugin}
+
+
+#### _HtmlWebpackPlugin_
+
+Webpack generates a number of js and CSS files.
+You _could_ insert them into the `index.html` _manually_. That would be tedious and error-prone.
+Webpack can inject those scripts and links for you with the `HtmlWebpackPlugin`.
+
+
+{@a environment-configuration}
+
+
+
+### Environment-specific configuration
+
+The `webpack.common.js` configuration file does most of the heavy lifting.
+Create separate, environment-specific configuration files that build on `webpack.common`
+by merging into it the peculiarities particular to the target environments.
+
+These files tend to be short and simple.
+
+
+{@a development-configuration}
+
+
+
+### Development configuration
+
+Here is the `webpack.dev.js` development configuration file.
+
+
+<code-example path="webpack/config/webpack.dev.js" title="config/webpack.dev.js" linenums="false">
+
+</code-example>
+
+
+
+The development build relies on the Webpack development server, configured near the bottom of the file.
+
+Although you tell Webpack to put output bundles in the `dist` folder,
+the dev server keeps all bundles in memory; it doesn't write them to disk.
+You won't find any files in the `dist` folder, at least not any generated from *this development build*.
+
+
+The `HtmlWebpackPlugin`, added in `webpack.common.js`, uses the `publicPath` and the `filename` settings to generate
+appropriate `<script>` and `<link>` tags into the `index.html`.
+
+The CSS styles are buried inside the Javascript bundles by default. The `ExtractTextPlugin` extracts them into
+external `.css` files that the `HtmlWebpackPlugin` inscribes as `<link>` tags into the `index.html`.
+
+Refer to the [Webpack documentation](https://webpack.github.io/docs/) for details on these and
+other configuration options in this file.
+
+Grab the app code at the end of this guide and try:
+
+
+<code-example language="sh" class="code-shell">
+  npm start
+
+</code-example>
+
+
+
+{@a production-configuration}
+
+
+
+### Production configuration
+
+Configuration of a *production* build resembles *development* configuration with a few key changes.
+
+
+<code-example path="webpack/config/webpack.prod.js" title="config/webpack.prod.js" linenums="false">
+
+</code-example>
+
+
+
+You'll deploy the application and its dependencies to a real production server.
+You won't deploy the artifacts needed only in development.
+
+Put the production output bundle files in the `dist` folder.
+
+Webpack generates file names with cache-busting hash.
+Thanks to the `HtmlWebpackPlugin`, you don't have to update the `index.html` file when the hash changes.
+
+There are additional plugins:
+
+* *`NoEmitOnErrorsPlugin`&mdash;stops the build if there is an error.
+* *`UglifyJsPlugin`&mdash;minifies the bundles.
+* *`ExtractTextPlugin`&mdash;extracts embedded css as external files, adding cache-busting hash to the filename.
+* *`DefinePlugin`&mdash;use to define environment variables that you can reference within the application.
+* *`LoaderOptionsPlugins`&mdash;to override options of certain loaders.
+
+Thanks to the `DefinePlugin` and the `ENV` variable defined at top, you can enable Angular production mode like this:
+
+
+<code-example path="webpack/src/main.ts" region="enable-prod" title="src/main.ts" linenums="false">
+
+</code-example>
+
+
+
+Grab the app code at the end of this guide and try:
+
+
+<code-example language="sh" class="code-shell">
+  npm run build
+
+</code-example>
+
+
+
+{@a test-configuration}
+
+
+
+### Test configuration
+
+You don't need much configuration to run unit tests.
+You don't need the loaders and plugins that you declared for your development and production builds.
+You probably don't need to load and process the application-wide styles files for unit tests and doing so would slow you down;
+you'll use the `null` loader for those CSS files.
+
+You could merge the test configuration into the `webpack.common` configuration and override the parts you don't want or need.
+But it might be simpler to start over with a completely fresh configuration.
+
+
+<code-example path="webpack/config/webpack.test.js" title="config/webpack.test.js" linenums="false">
+
+</code-example>
+
+
+
+Reconfigure [Karma](https://karma-runner.github.io/1.0/index.html) to use Webpack to run the tests:
+
+
+<code-example path="webpack/config/karma.conf.js" title="config/karma.conf.js" linenums="false">
+
+</code-example>
+
+
+
+You don't precompile the TypeScript; Webpack transpiles the Typescript files on the fly, in memory, and feeds the emitted JS directly to Karma.
+There are no temporary files on disk.
+
+The `karma-test-shim` tells Karma what files to pre-load and
+primes the Angular test framework with test versions of the providers that every app expects to be pre-loaded.
+
+
+<code-example path="webpack/config/karma-test-shim.js" title="config/karma-test-shim.js" linenums="false">
+
+</code-example>
+
+
+
+Notice that you do _not_ load the application code explicitly.
+You tell Webpack to find and load the test files (the files ending in `.spec.ts`).
+Each spec file imports all&mdash;and only&mdash;the application source code that it tests.
+Webpack loads just _those_ specific application files and ignores the other files that you aren't testing.
+
+
+Grab the app code at the end of this guide and try:
+
+
+<code-example language="sh" class="code-shell">
+  npm test
+
+</code-example>
+
+{@a try}
+
+## Trying it out
+
+Here is the source code for a small application that bundles with the
+Webpack techniques covered in this guide.
+
+
+<code-tabs>
+
+  <code-pane title="src/index.html" path="webpack/src/index.html">
+
+  </code-pane>
+
+  <code-pane title="src/main.ts" path="webpack/src/main.ts">
+
+  </code-pane>
+
+  <code-pane title="src/assets/css/styles.css" path="webpack/src/assets/css/styles.css">
+
+  </code-pane>
+
+</code-tabs>
+
+
+
+<code-tabs>
+
+  <code-pane title="src/app/app.component.ts" path="webpack/src/app/app.component.ts">
+
+  </code-pane>
+
+  <code-pane title="src/app/app.component.html" path="webpack/src/app/app.component.html">
+
+  </code-pane>
+
+  <code-pane title="src/app/app.component.css" path="webpack/src/app/app.component.css">
+
+  </code-pane>
+
+  <code-pane title="src/app/app.component.spec.ts" path="webpack/src/app/app.component.spec.ts">
+
+  </code-pane>
+
+  <code-pane title="src/app/app.module.ts" path="webpack/src/app/app.module.ts">
+
+  </code-pane>
+
+</code-tabs>
+
+
+
+The <code>app.component.html</code> displays this downloadable Angular logo
+<a href="assets/images/logos/angular/angular.png">
+<img src="assets/images/logos/angular/angular.png" height="40px" title="download Angular logo"></a>.
+Create a folder called `images` under the project's `assets` folder, then right-click (Cmd+click on Mac)
+on the image and download it to that folder.
+
+
+{@a bundle-ts}
+
+
+Here again are the TypeScript entry-point files that define the `polyfills` and `vendor` bundles.
+
+<code-tabs>
+
+  <code-pane title="src/polyfills.ts" path="webpack/src/polyfills.ts">
+
+  </code-pane>
+
+  <code-pane title="src/vendor.ts" path="webpack/src/vendor.ts">
+
+  </code-pane>
+
+</code-tabs>
+
+{@a highlights}
+
+<h3 class="no-toc">Highlights</h3>
+
+* There are no `<script>` or `<link>` tags in the `index.html`.
+The `HtmlWebpackPlugin` inserts them dynamically at runtime.
+
+* The `AppComponent` in `app.component.ts` imports the application-wide css with a simple `import` statement.
+
+* The `AppComponent` itself has its own html template and css file. WebPack loads them with calls to `require()`.
+Webpack stashes those component-scoped files in the `app.js` bundle too.
+You don't see those calls in the source code;
+they're added behind the scenes by the `angular2-template-loader` plug-in.
+
+* The `vendor.ts` consists of vendor dependency `import` statements that drive the `vendor.js` bundle.
+The application imports these modules too; they'd be duplicated in the `app.js` bundle
+if the `CommonsChunkPlugin` hadn't detected the overlap and removed them from `app.js`.
+{@a conclusion}
+
+## Conclusion
+
+You've learned just enough Webpack to configurate development, test and production builds
+for a small Angular application.
+
+_You could always do more_. Search the web for expert advice and expand your Webpack knowledge.
+
+[Back to top](guide/webpack#top)
--- a/aio/content/images/bios/alainchautard.png
+++ b/aio/content/images/bios/alainchautard.png
--- a/aio/content/images/bios/cory-rylan.jpg
+++ b/aio/content/images/bios/cory-rylan.jpg
--- a/aio/content/images/bios/juristr.jpg
+++ b/aio/content/images/bios/juristr.jpg
--- a/aio/content/images/bios/kimmaida.jpg
+++ b/aio/content/images/bios/kimmaida.jpg
--- a/aio/content/images/bios/mashhood.jpg
+++ b/aio/content/images/bios/mashhood.jpg
--- a/aio/content/images/bios/mhartington.png
+++ b/aio/content/images/bios/mhartington.png
--- a/aio/content/marketing/announcements.json
+++ b/aio/content/marketing/announcements.json
@ -12,19 +12,5 @@
    "message": "Watch ng-conf live stream <br/>Apr 18th-20th, 2018",
    "imageUrl": "generated/images/marketing/home/ng-conf.png",
    "linkUrl": "https://www.ng-conf.org/livestream/"
-  },
-  {
-    "startDate": "2018-06-01",
-    "endDate": "2018-08-15",
-    "message": "Join us for Angular Mix<br/>October 10th-12th, 2018",
-    "imageUrl": "generated/images/marketing/home/angular-mix.png",
-    "linkUrl": "https://angularmix.com/"
-  },
-  {
-    "startDate": "2018-08-15",
-    "endDate": "2018-11-06",
-    "message": "Join us for Angular Connect<br/>November 6th-7th, 2018",
-    "imageUrl": "generated/images/marketing/home/angular-connect.png",
-    "linkUrl": "https://angularconnect.com/"
  }
 ]
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@ -226,7 +226,7 @@
     "picture": "wardbell.jpg",
     "website": "https://github.com/wardbell",
     "twitter": "wardbell",
-     "bio": "Ward is an all-around developer with JavaScript, Node.js®, and .net chops. He's a frequent conference speaker and podcaster, trainer, Google Developer Expert for Angular, Microsoft MVP, and PluralSight author. He is also president of IdeaBlade, an enterprise software consulting firm and the makers of breeze.js. He would like to get more sleep and spend more time in the mountains.",
+     "bio": "Ward is an all-around developer with JavaScript, node, and .net chops. He's a frequent conference speaker and podcaster, trainer, Google Developer Expert for Angular, Microsoft MVP, and PluralSight author. He is also president of IdeaBlade, an enterprise software consulting firm and the makers of breeze.js. He would like to get more sleep and spend more time in the mountains.",
     "group": "Angular"
 },

@ -591,59 +591,5 @@
    "website": "http://ngnir.life/",
    "bio": "Nir is a Principal Frontend Consultant & Head of the Angular department at 500Tech, Google Developer Expert and community leader. He organizes the largest Angular meetup group in Israel (Angular-IL), talks and teaches about front-end technologies around the world. He is also the author of two books about Angular and the founder of the 'Frontend Band'.",
    "group": "GDE"
-  },
-
-  "achautard": {
-    "name": "Alain Chautard",
-    "picture": "alainchautard.png",
-    "twitter": "AlainChautard",
-    "website": "http://www.angulartraining.com",
-    "bio": "Alain Chautard is a Google Developer Expert in Web Technologies / Angular. He started working with Angular JS in 2011. Since then he has worked with all Angular versions on a daily basis, both as a developer and as a technical trainer. He is the organizer of the Sacramento Angular Meetup group, co-organizer of the Google Developer Group chapter in Sacramento, California, and published author of the Packt video course 'Getting Started with Angular'",
-    "group": "GDE"
-  },
-
-  "coryrylan": {
-    "name": "Cory Rylan",
-    "picture": "cory-rylan.jpg",
-    "twitter": "coryrylan",
-    "website": "https://coryrylan.com",
-    "bio": "Cory is a full time front end web developer. He works full time building responsive web applications and progressive web apps. When not building web apps he is busy teaching Angular and other web technologies in workshops and conferences. He loves the web and is optimistic of the places it can take us.",
-    "group": "GDE"
-  },
-
-  "mhartington": {
-    "name": "Mike Hartington",
-    "picture": "mhartington.png",
-    "twitter": "mhartington",
-    "website": "https://mhartington.io",
-    "bio": "Mike is a Developer Advocate for the Ionic Framework and a GDE in Angular. He spends most of his time making fast PWAs and exploring emerging web standards. When not behind a keyboard, you'll probably find him with a guitar and beer.",
-    "group": "GDE"
-  },
-
-  "juristr": {
-    "name": "Juri Strumpflohner",
-    "picture": "juristr.jpg",
-    "twitter": "juristr",
-    "website": "https://juristr.com",
-    "bio": "Juri is a software engineer and freelance trainer and consultant currently mostly focusing on the frontend side using JavaScript, TypeScript and Angular. He has a passion for teaching and sharing his knowledge and experiences with others. This mostly happens by writing tech articles for his personal blog, by creating video courses for Egghead.io, during on-site workshops at companies or by speaking at conferences. In his free time he enjoys practicing Yoseikan Budo, a martial art where he currently owns the 3rd DAN black belt.",
-    "group": "GDE"
-  },
-
-  "mashhoodr": {
-    "name": "Mashhood Rastgar",
-    "picture": "mashhood.jpg",
-    "twitter": "mashhoodr",
-    "website": "http://imars.info/",
-    "bio": "Mashhood is the principal technical consultant at Recurship and a Google Developer Expert. He  works with different startups in US and EU to helps them crawl through the technical maze and quickly build amazing products focused around the problems they are trying to solve. He specializes in using the latest web technologies available to execute the best possible solutions.",
-    "group": "GDE"
-  },
-
-  "kimmaida": {
-    "name": "Kim Maida",
-    "picture": "kimmaida.jpg",
-    "twitter": "KimMaida",
-    "website": "https://kmaida.io/",
-    "bio": "Kim is an an Angular consultant, developer, speaker, writer, and Google Developer Expert. She is passionate about learning from and sharing knowledge with other developers through blogging, speaking, workshops, and open source.",
-    "group": "GDE"
  }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Igor Minar	4008e36e80	release: cut the v6.0.0-rc.6 release	2018-04-27 10:47:56 -07:00
Igor Minar	e47bb52084	Revert "refactor(core): tree-shake application_module providers (#23477 )" This reverts commit `ac2b530f4b`. The change is breaking targets in g3 see cl/194336387.	2018-04-27 07:13:56 -07:00
Matias Niemelä	ac2b530f4b	refactor(core): tree-shake application_module providers (#23477 ) PR Close #23477	2018-04-25 15:54:41 -07:00
Judy Bogart	64bf6edf00	docs: update glossary architectural terms (#23045 ) PR Close #23045	2018-04-25 13:21:52 -07:00
Noah Medling	adf6235479	docs: corrected spelling of "ambient".	2018-04-24 15:05:31 -07:00
Vani	04c18ac1aa	docs: fix typo (#23514 ) PR Close #23514	2018-04-24 14:43:34 -07:00
Paul Freedman	1b26dd8cdb	docs(benchpress): fix typo in README (#23471 ) (#23488 ) PR Close #23488	2018-04-24 14:37:03 -07:00
Victor Berchet	f721b06bde	style: format code	2018-04-24 14:36:30 -07:00
Martin Probst	0bc8443e12	fix(compiler): avoid a crash in ngc-wrapped. (#23468 ) `ng.performCompilation` can return an `undefined` program, which is not handled by ngc-wrapped. Avoid crashing by checking for the error return and returning the diagnostics. PR Close #23468	2018-04-24 13:57:04 -07:00
George Kalpakas	db17231597	ci(aio): fix `deploy-to-firebase` script (#23470 ) Temporary workaround for angular/angular-cli#10398. The behavior of `yarn build` remains the same, but building for a specific deployment env (e.g. archive, next) requires `yarn build-for $deployEnv`. PR Close #23470	2018-04-24 11:15:35 -07:00
Olivier Combe	540626a3a6	build(common): mark locales files as side-effect-full (#23509 ) Fixes https://github.com/angular/angular-cli/issues/10322 PR Close #23509	2018-04-24 11:14:52 -07:00
Sam Julien	391bfcede5	docs(aio): Add UpgradingAngularJS to education resources (#23169 ) PR Close #23169	2018-04-23 13:36:48 -07:00
Steven Liekens	d8de6488dd	fix(router): cache route handle if found (#22475 ) When asking the route reuse strategy to retrieve a detached route handle, store the return value in a local variable for further processing instead of asking again later. resolves #22474 PR Close #22475	2018-04-23 13:35:59 -07:00
Alex Rickabaugh	151fb66848	ci: add alxhub as owner to a few packages (#23510 ) PR Close #23510	2018-04-23 10:08:25 -07:00
Victor Berchet	02424ff0d0	Revert "style(compiler): fix lint issues (#23480 )" This reverts commit `f0925d9705`.	2018-04-22 12:21:24 -07:00
Victor Berchet	f0925d9705	style(compiler): fix lint issues (#23480 ) PR Close #23480	2018-04-22 11:55:33 -07:00
Victor Berchet	212b806eda	build: make commit validation accept typical Revert messages (#23480 ) fixes #23479 PR Close #23480	2018-04-22 11:49:49 -07:00
Alex Rickabaugh	b9431e88fb	fix(compiler): handle undefined annotation metadata (#23349 ) In certain cases seen in production, simplify() can returned undefined when simplifying decorator metadata. This has proven tricky to reproduce in an isolated test, but the fix is simple and low-risk: don't attempt to spread an undefined set of annotations in the first place. PR Close #23349	2018-04-19 18:57:22 -07:00
Victor Berchet	7790cfa0d0	Revert "fix(compiler): Pretty print object instead of [Object object] (#22689 )" (#23442 ) This reverts commit `8555a3a3cd`. Reverted because of https://github.com/angular/angular/issues/23440 PR Close #23442	2018-04-19 14:52:49 -07:00
Igor Minar	41b5149509	docs(aio): add front page campaign for the ng-conf live stream (#23391 ) PR Close #23391	2018-04-17 14:13:43 -07:00
Brandon Roberts	06f865640d	docs(aio): Cleanup examples with edits from Igor/George (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	824f74f27b	build(aio): turn on webpack's stats.json generation for debugging purposes (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	5301c43eed	build(aio): add @angular/language-service (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Brandon Roberts	f280d1aef1	docs(aio): Bump shared yarn.lock file for examples (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Brandon Roberts	5e741d42a6	docs(aio): Bump shared dependencies to RC5 (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Brandon Roberts	0035d41030	docs(aio): Fix failing upgrade-module tests (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Brandon Roberts	08f447ceec	docs(aio): Fix failing boilerplate tests (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Brandon Roberts	8953f123e3	docs(aio): Upgrade examples to Angular 6 (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
George Kalpakas	6274007e3b	test(aio): fix failing tests (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
George Kalpakas	ee76be7783	docs(aio): update `yarn test` command in README.md (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	a8c720bc3a	build(aio): update to @angular/material@6.0.0-rc.11 (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	ac47a3cd93	test(aio): move reflect-metadata polyfills to test.ts (#23234 ) This resolves https://github.com/angular/angular-cli/issues/10333 and nicely cleans up the code. PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	041458a3d2	build(aio): update to angular/core@6.0.0-rc.5 (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	2cb74b748f	style(aio): lint fixes for examples (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
George Kalpakas	cb0bfe7a43	test(aio): fix tests and update testing infra (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	8ee11aeaa6	build(aio): update tslint and codelyzer (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
George Kalpakas	bf89fcb361	build(aio): fix deployment script (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
George Kalpakas	4f70c5b6f7	build(aio): upgrade `@angular/cli` to `6.0.0-rc.4` (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
George Kalpakas	ad3ebec2a5	build(aio): upgrade `@angular/*` to `6.0.0-rc.4` (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
George Kalpakas	3f5d61f2dd	build(aio): remove redundant flags from cli commands (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
George Kalpakas	11ada7f78b	build(aio): switch to `webpack-cli` for IE polyfills (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
George Kalpakas	0b96bc7456	build(aio): upgrade `rxjs` to `6.0.0-turbo-rc.4` (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	fefadadff3	ci: chown bazel-built packages when running integration tests (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	946057ae29	build: update to rxjs@6.0.0-uncanny-rc.7 (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	d4293aaaaa	build: remove a postinstall-patch to fix rxjs (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	e3dcc227f6	build(aio): reorder entries in package.json (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	c9230dd90e	build: fix angular.json that was missing keys due to cli bugs (#23234 ) https://github.com/angular/angular-cli/issues/10225 https://github.com/angular/angular-cli/issues/10226 PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	234af9ba59	build(aio): update to @angular/material@6.0.0-rc.1 (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	7204028d3e	build(aio): update to @angular/material@5.2.4 (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	f7c55952bf	build: update to rxjs@6.0.0-tactical-rc.1 (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	e38e3bd135	test: simplify config for cli-hello-world (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	cd20c01ba1	test: update cli-hello-world to cli@6.0.0-rc.2 (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	12a191ef3f	build(aio): update to @angular/cli@6.0.0-rc.2 + project layout update (#23234 ) project layout was updated using: yarn ng update @angular/cli --migrate-only --from=1.7.3 PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	65e67b3c3a	build(aio): upgrade to @angular/*@6.0.0-rc.3 (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
Igor Minar	32e57f6197	build(aio): upgrade to @angular/*@6.0.0-rc.2 (#23234 ) PR Close #23234	2018-04-17 14:09:04 -07:00
George Kalpakas	7de69ba29b	ci(aio): fix `aio-monitoring` tests (#23390 ) Previously, we were running the e2e tests from master against `https://angular.io` (deployed from the stable branch). Often the e2e tests from master do not apply to the stable branch, since the app has deviated slightly. This commit fixes this by stop running the full e2e tests against the deployed versions, but a smaller set of "smoke tests", which check basic functionality that is less likely to change between versions. PR Close #23390	2018-04-17 13:45:38 -07:00
George Kalpakas	44193c0b94	refactor(aio): rename directory (tests/deployment-config --> tests/deployment) (#23390 ) PR Close #23390	2018-04-17 13:45:38 -07:00
George Kalpakas	6db8241ffa	refactor(aio): rename spec file (#23390 ) PR Close #23390	2018-04-17 13:45:38 -07:00
George Kalpakas	33c594516c	refactor(aio): rename yarn script (deployment-config-test --> redirects-test) (#23390 ) PR Close #23390	2018-04-17 13:45:38 -07:00