release: cut the v8.0.0-rc.4 release

- They are to be removed before the end of RC

PR Close #30467

.bazelrc

@@ -116,16 +116,21 @@ build --define=compile=legacy
 #  --config=remote
 ###############################
 
-# Load default settings for Remote Build Execution
-# When updating, the URLs of bazel_toolchains in packages/bazel/package.bzl
-# may also need to be updated (see https://github.com/angular/angular/pull/27935)
-import %workspace%/third_party/github.com/bazelbuild/bazel-toolchains/bazelrc/bazel-0.24.0.bazelrc
+# Load default settings for Remote Build Execution.
+import %workspace%/third_party/github.com/bazelbuild/bazel-toolchains/bazelrc/.bazelrc.notoolchain
 
 # Increase the default number of jobs by 50% because our build has lots of
 # parallelism
 build:remote --jobs=150
 
-# Point to our custom execution platform; see tools/BUILD.bazel
+# Toolchain and platform related flags
+build:remote --host_javabase=@rbe_ubuntu1604_angular//java:jdk
+build:remote --javabase=@rbe_ubuntu1604_angular//java:jdk
+build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
+build:remote --crosstool_top=@rbe_ubuntu1604_angular//cc:toolchain
+build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
+build:remote --extra_toolchains=@rbe_ubuntu1604_angular//config:cc-toolchain
 build:remote --extra_execution_platforms=//tools:rbe_ubuntu1604-angular
 build:remote --host_platform=//tools:rbe_ubuntu1604-angular
 build:remote --platforms=//tools:rbe_ubuntu1604-angular

.circleci/config.yml

@@ -167,7 +167,8 @@ jobs:
       - *attach_workspace
       - *init_environment
       - *setup_circleci_bazel_config
-
+      # Enable remote/sibling docker which is needed by auto-selection of toolchain configs for RBE.
+      - setup_remote_docker
       # Setup remote execution and run RBE-compatible tests.
       - *setup_bazel_remote_execution
       - run: yarn bazel test //... --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only
@@ -180,6 +181,8 @@ jobs:
       - *attach_workspace
       - *init_environment
       - *setup_circleci_bazel_config
+      # Enable remote/sibling docker which is needed by auto-selection of toolchain configs for RBE.
+      - setup_remote_docker
       - *setup_bazel_remote_execution
 
         # We need to explicitly specify the --symlink_prefix option because otherwise we would
@@ -269,7 +272,7 @@ jobs:
       - *attach_workspace
       - *init_environment
         # Deploy angular.io to production (if necessary)
-      - run: setPublicVar CI_STABLE_BRANCH "$(npm info @angular/core dist-tags.latest | sed -r 's/^\s*([0-9]+\.[0-9]+)\.[0-9]+.*$/\1.x/')"
+      - run: setPublicVar_CI_STABLE_BRANCH
       - run: yarn --cwd aio deploy-production
 
   test_aio_local:
@@ -292,11 +295,21 @@ jobs:
 
   test_aio_local_ivy:
     <<: *job_defaults
+    docker:
+      # Needed because the AIO tests and the PWA score test depend on Chrome being available.
+      - image: *browsers_docker_image
     steps:
       - *attach_workspace
       - *init_environment
         # Build aio with Ivy (using local Angular packages)
       - run: yarn --cwd aio build-with-ivy --progress=false
+        # Run PWA-score tests
+        # (Run before unit and e2e tests, which destroy the `dist/` directory.)
+      - run: yarn --cwd aio test-pwa-score-localhost $CI_AIO_MIN_PWA_SCORE
+        # Run unit tests
+      - run: yarn --cwd aio test --progress=false --watch=false
+        # Run e2e tests
+      - run: yarn --cwd aio e2e --configuration=ci
 
   test_aio_tools:
     <<: *job_defaults
@@ -399,6 +412,8 @@ jobs:
       - *attach_workspace
       - *init_environment
       - *setup_circleci_bazel_config
+      # Enable remote/sibling docker which is needed by auto-selection of toolchain configs for RBE.
+      - setup_remote_docker
       - *setup_bazel_remote_execution
 
       - run: scripts/build-packages-dist.sh
@@ -425,6 +440,8 @@ jobs:
       - *attach_workspace
       - *init_environment
       - *setup_circleci_bazel_config
+      # Enable remote/sibling docker which is needed by auto-selection of toolchain configs for RBE.
+      - setup_remote_docker
       - *setup_bazel_remote_execution
 
       - run: scripts/build-ivy-npm-packages.sh
@@ -486,20 +503,43 @@ jobs:
           command: 'openssl aes-256-cbc -d -in .circleci/github_token -k "${KEY}" -out ~/.git_credentials'
       - run: ./scripts/ci/publish-build-artifacts.sh
 
-  aio_monitoring:
+  aio_monitoring_stable:
     <<: *job_defaults
     docker:
       # This job needs Chrome to be globally installed because the tests run with Protractor
       # which does not load the browser through the Bazel webtesting rules.
       - image: *browsers_docker_image
     steps:
-      - checkout
-      - *post_checkout
-      - *restore_cache
+      - *attach_workspace
+      - *init_environment
+      - run: setPublicVar_CI_STABLE_BRANCH
+      - run:
+          name: Check out `aio/` from the stable branch
+          command: |
+            git fetch origin $CI_STABLE_BRANCH
+            git checkout --force origin/$CI_STABLE_BRANCH -- aio/
+      - run:
+          name: Run tests against https://angular.io/
+          command: ./aio/scripts/test-production.sh https://angular.io/ $CI_AIO_MIN_PWA_SCORE
+      - run:
+          name: Notify caretaker about failure
+          # `$SLACK_CARETAKER_WEBHOOK_URL` is a secret env var defined in CircleCI project settings.
+          # The URL comes from https://angular-team.slack.com/apps/A0F7VRE7N-circleci.
+          command: 'curl --request POST --header "Content-Type: application/json" --data "{\"text\":\":x: \`$CIRCLE_JOB\` job failed on build $CIRCLE_BUILD_NUM: $CIRCLE_BUILD_URL :scream:\"}" $SLACK_CARETAKER_WEBHOOK_URL'
+          when: on_fail
+
+  aio_monitoring_next:
+    <<: *job_defaults
+    docker:
+      # This job needs Chrome to be globally installed because the tests run with Protractor
+      # which does not load the browser through the Bazel webtesting rules.
+      - image: *browsers_docker_image
+    steps:
+      - *attach_workspace
       - *init_environment
       - run:
-          name: Run tests against the deployed apps
-          command: ./aio/scripts/test-production.sh $CI_AIO_MIN_PWA_SCORE
+          name: Run tests against https://next.angular.io/
+          command: ./aio/scripts/test-production.sh https://next.angular.io/ $CI_AIO_MIN_PWA_SCORE
       - run:
           name: Notify caretaker about failure
           # `$SLACK_CARETAKER_WEBHOOK_URL` is a secret env var defined in CircleCI project settings.
@@ -689,19 +729,23 @@ workflows:
           cron: "0 * * * *"
           filters: *publish_branches_filter
 
-# This job is currently disabled due to a version skew problem.
-# More info is available here: https://github.com/angular/angular/issues/30101
-#  aio_monitoring:
-#    jobs:
-#      - aio_monitoring
-#    triggers:
-#      - schedule:
-#          # Runs AIO monitoring job at 00:00AM every day.
-#          cron: "0 0 * * *"
-#          filters:
-#            branches:
-#              only:
-#                - master
+  aio_monitoring:
+    jobs:
+      - setup
+      - aio_monitoring_stable:
+          requires:
+            - setup
+      - aio_monitoring_next:
+          requires:
+            - setup
+    triggers:
+      - schedule:
+          # Runs AIO monitoring jobs at 10:00AM every day.
+          cron: "0 10 * * *"
+          filters:
+            branches:
+              only:
+                - master
 
 # TODO:
 # - don't build the g3 branch

.circleci/env-helpers.inc.sh

@@ -36,3 +36,38 @@ function setSecretVar() {
   # Restore original shell options.
   eval "$originalShellOptions";
 }
+
+
+# Create a function to set an environment variable, when called.
+#
+# Use this function for creating setter for public environment variables that require expensive or
+# time-consuming computaions and may not be needed. When needed, you can call this function to set
+# the environment variable (which will be available through `$BASH_ENV` from that point onwards).
+#
+# Arguments:
+# - `<name>`: The name of the environment variable. The generated setter function will be
+#   `setPublicVar_<name>`.
+# - `<code>`: The code to run to compute the value for the variable. Since this code should be
+#   executed lazily, it must be properly escaped. For example:
+#   ```sh
+#   # DO NOT do this:
+#   createPublicVarSetter MY_VAR "$(whoami)";  # `whoami` will be evaluated eagerly
+#
+#   # DO this isntead:
+#   createPublicVarSetter MY_VAR "\$(whoami)";  # `whoami` will NOT be evaluated eagerly
+#   ```
+#
+# Usage: `createPublicVarSetter <name> <code>`
+#
+# Example:
+# ```sh
+# createPublicVarSetter MY_VAR 'echo "FOO"';
+# echo $MY_VAR;  # Not defined
+#
+# setPublicVar_MY_VAR;
+# source $BASH_ENV;
+# echo $MY_VAR;  # FOO
+# ```
+function createPublicVarSetter() {
+  echo "setPublicVar_$1() { setPublicVar $1 \"$2\"; }" >> $BASH_ENV;
+}

.circleci/env.sh

@@ -34,6 +34,13 @@ setPublicVar CI_REPO_NAME "$CIRCLE_PROJECT_REPONAME";
 setPublicVar CI_REPO_OWNER "$CIRCLE_PROJECT_USERNAME";
 
 
+####################################################################################################
+# Define "lazy" PUBLIC environment variables for CircleCI.
+# (I.e. functions to set an environment variable when called.)
+####################################################################################################
+createPublicVarSetter CI_STABLE_BRANCH "\$(npm info @angular/core dist-tags.latest | sed -r 's/^\\s*([0-9]+\\.[0-9]+)\\.[0-9]+.*$/\\1.x/')";
+
+
 ####################################################################################################
 # Define SECRET environment variables for CircleCI.
 ####################################################################################################

.codefresh/codefresh.yml

@@ -20,5 +20,7 @@ steps:
     # Add Bazel CI config
     - copy .codefresh\bazel.rc %ProgramData%\bazel.bazelrc
     # Run tests
-    - yarn bazel test //tools/ts-api-guardian:all
+    - yarn bazel test //tools/ts-api-guardian:all //packages/language-service/test //packages/compiler/test //packages/compiler-cli/test:ngc //packages/compiler-cli/test/ngtsc:ngtsc
     - yarn test-ivy-aot //packages/animations/test //packages/common/test //packages/forms/test //packages/http/test //packages/platform-browser/test //packages/platform-browser-dynamic/test //packages/router/test
+    - yarn bazel test //tools/public_api_guard/...
+    - yarn bazel test //packages/compiler-cli/integrationtest:integrationtest //packages/compiler-cli/test/compliance:compliance

.gitattributes

@@ -5,5 +5,8 @@
 *.js eol=lf
 *.ts eol=lf
 
+# API guardian patch must always use LF for tests to work
+*.patch eol=lf
+
 # Must keep Windows line ending to be parsed correctly
 scripts/windows/packages.txt eol=crlf

.github/CODEOWNERS

@@ -218,6 +218,7 @@
 #
 #   - gkalpak
 #   - petebacondarwin
+#   - jasonaden
 
 
 # ===========================================================
@@ -657,6 +658,7 @@
 # ================================================
 
 /packages/upgrade/**                                            @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
+/packages/common/upgrade/**                                     @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /packages/examples/upgrade/**                                   @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/guide/upgrade.md                                   @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes
 /aio/content/examples/upgrade-module/**                         @angular/fw-upgrade @angular/framework-global-approvers @angular/framework-global-approvers-for-docs-only-changes

.gitignore

@@ -11,6 +11,7 @@ tools/gulp-tasks/cldr/cldr-data/
 pubspec.lock
 .c9
 .idea/
+.devcontainer
 .settings/
 .vscode/launch.json
 .vscode/settings.json

CHANGELOG.md

@@ -1,3 +1,67 @@
+<a name="8.0.0-rc.4"></a>
+# [8.0.0-rc.4](https://github.com/angular/angular/compare/8.0.0-rc.3...8.0.0-rc.4) (2019-05-15)
+
+
+### Bug Fixes
+
+* **bazel:** Directly spawn native Bazel binary ([#30306](https://github.com/angular/angular/issues/30306)) ([d1fcc2b](https://github.com/angular/angular/commit/d1fcc2b))
+* **bazel:** pass correct arguments to http_server in Windows ([#30346](https://github.com/angular/angular/issues/30346)) ([71eba45](https://github.com/angular/angular/commit/71eba45)), closes [#29785](https://github.com/angular/angular/issues/29785)
+* **bazel:** Use existing npm/yarn lock files ([#30438](https://github.com/angular/angular/issues/30438)) ([3136d9f](https://github.com/angular/angular/commit/3136d9f))
+* **compiler:** ensure strict mode when evaluating in JIT ([#30122](https://github.com/angular/angular/issues/30122)) ([192f108](https://github.com/angular/angular/commit/192f108))
+* **core:** migrations not always migrating all files ([#30269](https://github.com/angular/angular/issues/30269)) ([e8ceae1](https://github.com/angular/angular/commit/e8ceae1))
+* **core:** static-query migration errors not printed properly ([#30458](https://github.com/angular/angular/issues/30458)) ([fde3f46](https://github.com/angular/angular/commit/fde3f46))
+* **core:** static-query migration fails with default parameter values ([#30269](https://github.com/angular/angular/issues/30269)) ([c3246e6](https://github.com/angular/angular/commit/c3246e6))
+* **core:** static-query migration should gracefully exit if AOT compiler throws ([#30269](https://github.com/angular/angular/issues/30269)) ([a71d8a8](https://github.com/angular/angular/commit/a71d8a8))
+* **core:** static-query migration should handle queries on accessors ([#30327](https://github.com/angular/angular/issues/30327)) ([dd299f9](https://github.com/angular/angular/commit/dd299f9))
+* **core:** static-query migration should not fallback to test strategy ([#30458](https://github.com/angular/angular/issues/30458)) ([0fa48e8](https://github.com/angular/angular/commit/0fa48e8))
+* **core:** static-query migration should not prompt if no queries are used ([#30254](https://github.com/angular/angular/issues/30254)) ([12fb639](https://github.com/angular/angular/commit/12fb639))
+* **core:** static-query usage migration strategy should detect ambiguous query usage ([#30215](https://github.com/angular/angular/issues/30215)) ([e295c6a](https://github.com/angular/angular/commit/e295c6a))
+* **router:** ensure navigations start with the current URL value incase redirect is skipped ([#30344](https://github.com/angular/angular/issues/30344)) ([9b88920](https://github.com/angular/angular/commit/9b88920)), closes [#30340](https://github.com/angular/angular/issues/30340) [#30160](https://github.com/angular/angular/issues/30160)
+* **router:** IE 11 bug can break URL unification when comparing objects ([#30393](https://github.com/angular/angular/issues/30393)) ([c383491](https://github.com/angular/angular/commit/c383491))
+
+
+### Features
+
+* **bazel:** use rbe_autoconfig() and new container. ([#29336](https://github.com/angular/angular/issues/29336)) ([e562acc](https://github.com/angular/angular/commit/e562acc))
+
+
+
+<a name="8.0.0-rc.3"></a>
+# [8.0.0-rc.3](https://github.com/angular/angular/compare/8.0.0-rc.2...8.0.0-rc.3) (2019-05-07)
+
+
+### Bug Fixes
+
+* **bazel:** Bump ibazel to 0.10.1 for windows fixes ([#30196](https://github.com/angular/angular/issues/30196)) ([9f68c35](https://github.com/angular/angular/commit/9f68c35))
+* **compiler-cli:** log ngcc skipping messages as debug instead of info ([#30232](https://github.com/angular/angular/issues/30232)) ([548b003](https://github.com/angular/angular/commit/548b003))
+* **core:** fix interpolate identifier in AOT ([#30243](https://github.com/angular/angular/issues/30243)) ([3fe3a84](https://github.com/angular/angular/commit/3fe3a84))
+* **router:** ensure `history.state` is set in `eager` update mode ([#30154](https://github.com/angular/angular/issues/30154)) ([9720227](https://github.com/angular/angular/commit/9720227))
+* **router:** fix a problem with router not responding to back button ([#30160](https://github.com/angular/angular/issues/30160)) ([132f01c](https://github.com/angular/angular/commit/132f01c))
+
+
+
+<a name="8.0.0-rc.2"></a>
+# [8.0.0-rc.2](https://github.com/angular/angular/compare/8.0.0-rc.1...8.0.0-rc.2) (2019-04-29)
+
+
+### Bug Fixes
+
+* **language-service:** Remove tsserverlibrary from rollup globals ([#30123](https://github.com/angular/angular/issues/30123)) ([b706800](https://github.com/angular/angular/commit/b706800))
+* disable injectable-pipe migration ([#30180](https://github.com/angular/angular/issues/30180)) ([4b2fcfd](https://github.com/angular/angular/commit/4b2fcfd))
+
+
+
+<a name="8.0.0-rc.1"></a>
+# [8.0.0-rc.1](https://github.com/angular/angular/compare/8.0.0-rc.0...8.0.0-rc.1) (2019-04-26)
+
+
+### Bug Fixes
+
+* **bazel:** Exclude common/upgrade* in metadata.tsconfig.json ([#30133](https://github.com/angular/angular/issues/30133)) ([6711f22](https://github.com/angular/angular/commit/6711f22))
+* **bazel:** update peerDep ranges ([#30155](https://github.com/angular/angular/issues/30155)) ([6067583](https://github.com/angular/angular/commit/6067583))
+
+
+
 <a name="8.0.0-rc.0"></a>
 # [8.0.0-rc.0](https://github.com/angular/angular/compare/8.0.0-beta.14...8.0.0-rc.0) (2019-04-25)
 

WORKSPACE

@@ -114,3 +114,23 @@ sass_repositories()
 load("@io_bazel_skydoc//skylark:skylark.bzl", "skydoc_repositories")
 
 skydoc_repositories()
+
+load("@bazel_toolchains//rules:environments.bzl", "clang_env")
+load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
+
+rbe_autoconfig(
+    name = "rbe_ubuntu1604_angular",
+    # The sha256 of marketplace.gcr.io/google/rbe-ubuntu16-04 container that is
+    # used by rbe_autoconfig() to pair toolchain configs in the @bazel_toolchains repo.
+    base_container_digest = "sha256:677c1317f14c6fd5eba2fd8ec645bfdc5119f64b3e5e944e13c89e0525cc8ad1",
+    # Note that if you change the `digest`, you might also need to update the
+    # `base_container_digest` to make sure marketplace.gcr.io/google/rbe-ubuntu16-04-webtest:<digest>
+    # and marketplace.gcr.io/google/rbe-ubuntu16-04:<base_container_digest> have
+    # the same Clang and JDK installed.
+    # Clang is needed because of the dependency on @com_google_protobuf.
+    # Java is needed for the Bazel's test executor Java tool.
+    digest = "sha256:74a8e9dca4781d5f277a7bd8e7ea7ed0f5906c79c9cd996205b6d32f090c62f3",
+    env = clang_env(),
+    registry = "marketplace.gcr.io",
+    repository = "google/rbe-ubuntu16-04-webtest",
+)

aio/content/cli/index.md

@@ -1,4 +1,4 @@
-<h1 class="no-toc">CLI Command Reference</h1>
+# CLI Overview and Command Reference
 
 The Angular CLI is a command-line interface tool that you use to initialize, develop, scaffold, and maintain Angular applications. You can use the tool directly in a command shell, or indirectly through an interactive UI such as [Angular Console](https://angularconsole.com).
 

aio/content/examples/tslint.json

@@ -41,7 +41,6 @@
     "no-switch-case-fall-through": true,
     "no-trailing-whitespace": true,
     "no-unused-expression": true,
-    "no-use-before-declare": false,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
     "one-line": [

aio/content/getting-started/index.md

@@ -149,8 +149,8 @@ Learn more: See the [Template Syntax guide](guide/template-syntax "Template Synt
 {@a components}
 ## Components
 
-*Components* are the building blocks of Angular apps. 
-You've already been working with the product list component. 
+*Components* define areas of responsibility in your UI that let you reuse these sets of UI functionality. 
+You've already built one with the product list component. 
 
 A component is comprised of three things: 
 * **A component class,** which handles data and functionality. In the previous section, the product data and the `share()` method were defined for you in the component class. 

aio/content/guide/architecture-components.md

@@ -75,7 +75,7 @@ Notice how custom components like this mix seamlessly with native HTML in the sa
 
 ### Data binding
 
-Without a framework, you would be responsible for pushing data values into the HTML controls and turning user responses into actions and value updates. Writing such push and pull logic by hand is tedious, error-prone, and a nightmare to read, as any experienced jQuery programmer can attest.
+Without a framework, you would be responsible for pushing data values into the HTML controls and turning user responses into actions and value updates. Writing such push and pull logic by hand is tedious, error-prone, and a nightmare to read, as any experienced front-end JavaScript programmer can attest.
 
 Angular supports *two-way data binding*, a mechanism for coordinating the parts of a template with the parts of a component. Add binding markup to the template HTML to tell Angular how to connect both sides.
 

aio/content/guide/creating-libraries.md

@@ -87,6 +87,8 @@ If that form will need additional customization by the user, it might work best
 However, if the forms will always be the same and not need much customization by developers, then you could create a dynamic component that takes the configuration and generates the form.
 In general, the more complex the customization, the more useful the schematic approach.
 
+{@a integrating-with-the-cli}
+
 ## Integrating with the CLI
 
 A library can include [schematics](guide/glossary#schematic) that allow it to integrate with the Angular CLI.

aio/content/guide/deployment.md

@@ -437,7 +437,6 @@ The `browserslist` looks like this:
 > 0.5%
 last 2 versions
 Firefox ESR
-Chrome 41 # Support for Googlebot
 not dead
 not IE 9-11 # For IE 9-11 support, remove 'not'.
 ```
@@ -470,7 +469,7 @@ The `tsconfig.json` looks like this:
 }
 ```
 
-By default, legacy browsers such as IE 9-11 are ignored, Chrome 41 is included for search engine optimization (SEO) support, and the compilation target is ES2015. As a result, this produces two builds, and differential loading is enabled. If you ignore browsers without ES2015 support, a single build is produced. To see the build result for differential loading based on different configurations, refer to the table below. 
+By default, legacy browsers such as IE 9-11 are ignored, and the compilation target is ES2015. As a result, this produces two builds, and differential loading is enabled. If you ignore browsers without ES2015 support, a single build is produced. To see the build result for differential loading based on different configurations, refer to the table below. 
 
 <div class="alert is-important">
 

aio/content/guide/deprecations.md

@@ -1,11 +1,11 @@
 # Deprecated APIs and Features
 
-Angular strives to balance innovation and stability. 
-Sometimes, APIs and features become obsolete and need to be removed or replaced so that Angular can stay current with new best practices, changing dependencies, or changes in the (web) platform itself. 
+Angular strives to balance innovation and stability.
+Sometimes, APIs and features become obsolete and need to be removed or replaced so that Angular can stay current with new best practices, changing dependencies, or changes in the (web) platform itself.
 
 To make these transitions as easy as possible, we deprecate APIs and features for a period of time before removing them. This gives you time to update your apps to the latest APIs and best practices.
 
-This guide contains a summary of all Angular APIs and features that are currently deprecated. 
+This guide contains a summary of all Angular APIs and features that are currently deprecated.
 
 
 <div class="alert is-helpful">
@@ -13,7 +13,7 @@ This guide contains a summary of all Angular APIs and features that are currentl
 
 Features and APIs that were deprecated in v6 or earlier are candidates for removal in version 9 or any later major version. For information about Angular's deprecation and removal practices, see [Angular Release Practices](guide/releases#deprecation-practices "Angular Release Practices: Deprecation practices").
 
-For step-by-step instructions on how to update to the latest Angular release, use the interactive update guide at [update.angular.io](https://update.angular.io). 
+For step-by-step instructions on how to update to the latest Angular release, use the interactive update guide at [update.angular.io](https://update.angular.io).
 
 </div>
 
@@ -21,7 +21,7 @@ For step-by-step instructions on how to update to the latest Angular release, us
 
 ## Deprecated APIs
 
-This section contains a complete list all of the currently-deprecated APIs, with details to help you plan your migration to a replacement. 
+This section contains a complete list all of the currently-deprecated APIs, with details to help you plan your migration to a replacement.
 
 
 <div class="alert is-helpful">
@@ -49,16 +49,16 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
-| [`CollectionChangeRecord`](api/core/CollectionChangeRecord) | [`IterableChangeRecord`](api/core/IterableChangeRecord) | v4 | none | 
+| [`CollectionChangeRecord`](api/core/CollectionChangeRecord) | [`IterableChangeRecord`](api/core/IterableChangeRecord) | v4 | none |
 | [`DefaultIterableDiffer`](api/core/DefaultIterableDiffer) | n/a | v4 | Not part of public API. |
-| [`defineInjectable`](api/core/defineInjectable) | `ɵɵdefineInjectable` | v8 | Used only in generated code. No source code should depend on this API. |
-| [`inject`](api/core/inject) | `ɵɵinject` | v8 | Used only in generated code. No source code should depend on this API. |
-| [`ReflectiveInjector`](api/core/ReflectiveInjector) | [`Injector.create`](api/core/Injector#create)  | v5 | See [`ReflectiveInjector`](#reflectiveinjector) | 
+| [`defineInjectable`](api/core/defineInjectable) | `ΔdefineInjectable` | v8 | Used only in generated code. No source code should depend on this API. |
+| [`inject`](api/core/inject) | `Δinject` | v8 | Used only in generated code. No source code should depend on this API. |
+| [`ReflectiveInjector`](api/core/ReflectiveInjector) | [`Injector.create`](api/core/Injector#create)  | v5 | See [`ReflectiveInjector`](#reflectiveinjector) |
 | [`ReflectiveKey`](api/core/ReflectiveKey) | none | v5 | none |
-| [`RenderComponentType`](api/core/RenderComponentType) | [`RendererType2`](api/core/RendererType2) and  [`Renderer2`](api/core/Renderer2) | v4 | none | 
-| [`Renderer`](api/core/Renderer) | [`Renderer2`](api/core/Renderer2) | v4 | none |  
-| [`RootRenderer`](api/core/RootRenderer) | [`RendererFactory2`](api/core/RendererFactory2) | v4 | none | 
-| [`ViewEncapsulation.Native`](api/core/ViewEncapsulation#Native) | [`ViewEncapsulation.ShadowDom`](api/core/ViewEncapsulation#ShadowDom) | v6 | Use the native encapsulation mechanism of the renderer. See [view.ts](https://github.com/angular/angular/blob/3e992e18ebf51d6036818f26c3d77b52d3ec48eb/packages/core/src/metadata/view.ts#L32). 
+| [`RenderComponentType`](api/core/RenderComponentType) | [`RendererType2`](api/core/RendererType2) and  [`Renderer2`](api/core/Renderer2) | v4 | none |
+| [`Renderer`](api/core/Renderer) | [`Renderer2`](api/core/Renderer2) | v4 | none |
+| [`RootRenderer`](api/core/RootRenderer) | [`RendererFactory2`](api/core/RendererFactory2) | v4 | none |
+| [`ViewEncapsulation.Native`](api/core/ViewEncapsulation#Native) | [`ViewEncapsulation.ShadowDom`](api/core/ViewEncapsulation#ShadowDom) | v6 | Use the native encapsulation mechanism of the renderer. See [view.ts](https://github.com/angular/angular/blob/3e992e18ebf51d6036818f26c3d77b52d3ec48eb/packages/core/src/metadata/view.ts#L32).
 
 #### @angular/core/testing
 
@@ -72,7 +72,7 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
-| [`NgFormSelectorWarning`](api/forms/NgFormSelectorWarning) | n/a | v6 | See [ngForm](#ngform). | 
+| [`NgFormSelectorWarning`](api/forms/NgFormSelectorWarning) | n/a | v6 | See [ngForm](#ngform). |
 
 
 #### @angular/router
@@ -93,15 +93,15 @@ Tip: In the [API reference section](api) of this doc site, deprecated APIs are i
 
 | API | Replacement | Deprecation announced | Notes |
 | --- | ----------- | --------------------- | ----- |
-| [`getAngularLib`](api/upgrade/static/getAngularLib) | [`getAngularJSGlobal`](api/upgrade/static/getAngularJSGlobal) | v5 | See [Upgrading from AngularJS](guide/upgrade). | 
-[`setAngularLib`](api/upgrade/static/setAngularLib) | [`setAngularJSGlobal`](api/upgrade/static/setAngularJSGlobal) | v5 | See [Upgrading from AngularJS](guide/upgrade). | 
+| [`getAngularLib`](api/upgrade/static/getAngularLib) | [`getAngularJSGlobal`](api/upgrade/static/getAngularJSGlobal) | v5 | See [Upgrading from AngularJS](guide/upgrade). |
+[`setAngularLib`](api/upgrade/static/setAngularLib) | [`setAngularJSGlobal`](api/upgrade/static/setAngularJSGlobal) | v5 | See [Upgrading from AngularJS](guide/upgrade). |
 
 
 
 {@a deprecated-features}
 ## Deprecated features
 
-This section lists all of the currently-deprecated features, which includes template syntax, configuration options, and any other deprecations not listed in the [Deprecated APIs](#deprecated-apis) section above. It also includes deprecated API usage scenarios or API combinations, to augment the information above. 
+This section lists all of the currently-deprecated features, which includes template syntax, configuration options, and any other deprecations not listed in the [Deprecated APIs](#deprecated-apis) section above. It also includes deprecated API usage scenarios or API combinations, to augment the information above.
 
 
 
@@ -111,20 +111,20 @@ This section lists all of the currently-deprecated features, which includes temp
 The shadow-piercing descendant combinator is deprecated and support is being removed from major browsers and tools. As such, in v4 we deprecated support in Angular for all 3 of `/deep/`, `>>>` and `::ng-deep`. Until removal, `::ng-deep` is preferred for broader compatibility with the tools.
 
 For more information, see [/deep/, >>>, and ::ng-deep](guide/component-styles#deprecated-deep--and-ng-deep "Component Styles guide, Deprecated deep and ngdeep")
- in the Component Styles guide. 
+ in the Component Styles guide.
 
 
 {@a template-tag}
 ### &lt;template&gt; tag
 
-The `<template>` tag was deprecated in v4 to avoid colliding with the DOM's element of the same name (such as when using web components). Use `<ng-template>` instead. For more information, see the [Ahead-of-Time Compilation](guide/aot-compiler#enablelegacytemplate) guide. 
+The `<template>` tag was deprecated in v4 to avoid colliding with the DOM's element of the same name (such as when using web components). Use `<ng-template>` instead. For more information, see the [Ahead-of-Time Compilation](guide/aot-compiler#enablelegacytemplate) guide.
 
 
 
 {@a ngform}
 ### ngForm element selector
 
-Support for using `ngForm` element selector was deprecated in v6. 
+Support for using `ngForm` element selector was deprecated in v6.
 It has been deprecated to be consistent with other core Angular selectors, which are typically written in kebab-case.
 
 Deprecated:
@@ -133,13 +133,13 @@ Deprecated:
 <ngForm #myForm="ngForm">
 ```
 
-Replacement: 
+Replacement:
 
 ```
 <ng-form #myForm="ngForm">
 ```
 
-The [`NgFormSelectorWarning`](api/forms/NgFormSelectorWarning) directive is solely used to display warnings when the deprecated `ngForm` selector is used. 
+The [`NgFormSelectorWarning`](api/forms/NgFormSelectorWarning) directive is solely used to display warnings when the deprecated `ngForm` selector is used.
 
 
 {@a ngmodel-reactive}
@@ -147,23 +147,23 @@ The [`NgFormSelectorWarning`](api/forms/NgFormSelectorWarning) directive is sole
 
 Support for using the `ngModel` input property and `ngModelChange` event with reactive form directives was deprecated in version 6.
 
-For more information, see the usage notes for [`FormControlDirective`](api/forms/FormControlDirective#use-with-ngmodel) and [`FormControlName`](api/forms/FormControlName#use-with-ngmodel). 
+For more information, see the usage notes for [`FormControlDirective`](api/forms/FormControlDirective#use-with-ngmodel) and [`FormControlName`](api/forms/FormControlName#use-with-ngmodel).
 
 
 {@a sw-versionedfiles}
 ### Service worker versionedFiles
 
-In the service worker configuration file `ngsw-config.json`, `versionedFiles` and `files` have the same behavior. As of v6, `versionedFiles` is deprecated; use `files` instead. 
+In the service worker configuration file `ngsw-config.json`, `versionedFiles` and `files` have the same behavior. As of v6, `versionedFiles` is deprecated; use `files` instead.
 
-For more information, see [Service Worker Configuration](guide/service-worker-config#assetgroups). 
+For more information, see [Service Worker Configuration](guide/service-worker-config#assetgroups).
 
 
 {@a reflectiveinjector}
 ### ReflectiveInjector
 
-In v5, Angular replaced the `ReflectiveInjector` with the `StaticInjector`. The injector no longer requires the Reflect polyfill, reducing application size for most developers. 
+In v5, Angular replaced the `ReflectiveInjector` with the `StaticInjector`. The injector no longer requires the Reflect polyfill, reducing application size for most developers.
 
-Before: 
+Before:
 
 ```
 ReflectiveInjector.resolveAndCreate(providers);
@@ -178,18 +178,18 @@ Injector.create({providers});
 {@a i18n-pipes}
 ### Pipes using Intl API
 
-<!-- 
+<!--
 From https://blog.angular.io/version-5-0-0-of-angular-now-available-37e414935ced
 -->
 
 Angular used to rely on the browser to provide number, date, and currency formatting using browser i18n APIs. This practice meant that most apps needed to use a polyfill, users were seeing inconsistent results across browsers, and common formats (such as the currency pipe) didn’t match developer expectations out of the box.
 
-In version 4.3, Angular introduced new number, date, and currency pipes that increase standardization across browsers and eliminate the need for i18n polyfills. These pipes use the Unicode Common Locale Data Repository (CLDR) instead of the JS Intl API to provide extensive locale support. 
+In version 4.3, Angular introduced new number, date, and currency pipes that increase standardization across browsers and eliminate the need for i18n polyfills. These pipes use the Unicode Common Locale Data Repository (CLDR) instead of the JS Intl API to provide extensive locale support.
 
-In version 5.0.0, Angular updated its standard pipes to use the CLRD implementation. 
-At that time, Angular also added [`DeprecatedI18NPipesModule`](api/common/DeprecatedI18NPipesModule) and related APIs to provide limited-time access to the old behavior. If you need to use these `Deprecated*` pipes, see [Angular change log](https://github.com/angular/angular/blob/master/CHANGELOG.md#i18n-pipes) and the [Date Formats mappings](https://docs.google.com/spreadsheets/d/12iygt-_cakNP1VO7MV9g4lq9NsxVWG4tSfc98HpHb0k/edit#gid=0 "Date Formats Google sheet"). 
+In version 5.0.0, Angular updated its standard pipes to use the CLRD implementation.
+At that time, Angular also added [`DeprecatedI18NPipesModule`](api/common/DeprecatedI18NPipesModule) and related APIs to provide limited-time access to the old behavior. If you need to use these `Deprecated*` pipes, see [Angular change log](https://github.com/angular/angular/blob/master/CHANGELOG.md#i18n-pipes) and the [Date Formats mappings](https://docs.google.com/spreadsheets/d/12iygt-_cakNP1VO7MV9g4lq9NsxVWG4tSfc98HpHb0k/edit#gid=0 "Date Formats Google sheet").
 
-Reminder: If you use these `Deprecated*` pipes, you should migrate to the current APIs listed above as soon as possible. These deprecated APIs are candidates for removal in the next major release. 
+Reminder: If you use these `Deprecated*` pipes, you should migrate to the current APIs listed above as soon as possible. These deprecated APIs are candidates for removal in the next major release.
 
 
 {@a loadChildren}
@@ -199,7 +199,7 @@ When Angular first introduced lazy routes, there wasn't browser support for dyna
 
 In v8, the string syntax for the [`loadChildren`](api/router/LoadChildren) route specification was deprecated, in favor of new syntax that uses `import()` syntax.
 
-Before: 
+Before:
 
 ```
 const routes: Routes = [{
@@ -209,12 +209,12 @@ const routes: Routes = [{
 }];
 ```
 
-After: 
+After:
 
 ```
 const routes: Routes = [{
   path: 'lazy',
-  // The new import() syntax 
+  // The new import() syntax
   loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)
 }];
 ```
@@ -223,9 +223,7 @@ const routes: Routes = [{
 <div class="alert is-helpful">
 
 
-**v8 update**: When you update to version 8, the [`ng update`](cli/update) command performs the transformation automatically. Prior to version 7, the `import()` syntax works in JIT mode (with view engine). 
-
-**Ivy:** If you are using Ivy, you must update your lazy routes to the new dynamic import syntax. See the [Ivy guide](guide/ivy) for more information.
+**v8 update**: When you update to version 8, the [`ng update`](cli/update) command performs the transformation automatically. Prior to version 7, the `import()` syntax only works in JIT mode (with view engine).
 
 
 </div>
@@ -242,13 +240,13 @@ const routes: Routes = [{
 | `params` | `paramMap` |
 | `queryParams` | `queryParamMap` |
 
-For more information see the [Router guide](guide/router#activated-route). 
+For more information see the [Router guide](guide/router#activated-route).
 
 
 {@a removed}
 ## Removed APIs
 
-The following APIs have been removed starting with version 8.0.0: 
+The following APIs have been removed starting with version 8.0.0:
 
 | Package | API            | Replacement | Notes |
 | ------- | -------------- | ----------- | ----- |
@@ -262,24 +260,24 @@ The following APIs have been removed starting with version 8.0.0:
 {@a http}
 ### @angular/http
 
-<!-- 
-Deprecation announced in version 5 
-https://blog.angular.io/version-5-0-0-of-angular-now-available-37e414935ced) 
+<!--
+Deprecation announced in version 5
+https://blog.angular.io/version-5-0-0-of-angular-now-available-37e414935ced)
 -->
 
 
-The entire [`@angular/http`](http://v7.angular.io/api/http) package has been removed. Use [`@angular/common/http`](api/common/http) instead.  
+The entire [`@angular/http`](http://v7.angular.io/api/http) package has been removed. Use [`@angular/common/http`](api/common/http) instead.
 
-The new API is a smaller, easier, and more powerful way to make HTTP requests in Angular. 
-The new API simplifies the default ergonomics: There is no need to map by invoking the `.json()` method. 
-It also supports typed return values and interceptors. 
+The new API is a smaller, easier, and more powerful way to make HTTP requests in Angular.
+The new API simplifies the default ergonomics: There is no need to map by invoking the `.json()` method.
+It also supports typed return values and interceptors.
 
 To update your apps:
 * Replace `HttpModule` with [`HttpClientModule`](api/common/http/HttpClientModule) (from [`@angular/common/http`](api/common/http)) in each of your modules.
 * Replace the `Http` service with the [`HttpClient`](api/common/http/HttpClient) service.
-* Remove any `map(res => res.json())` calls. They are no longer needed. 
+* Remove any `map(res => res.json())` calls. They are no longer needed.
 
-For more information about using `@angular/common/http`, see the [HttpClient guide](guide/http "HTTP Client guide"). 
+For more information about using `@angular/common/http`, see the [HttpClient guide](guide/http "HTTP Client guide").
 
 
 | `@angular/http` | Closest replacement in `@angular/common/http` |

aio/content/guide/glossary.md

@@ -8,9 +8,9 @@ This glossary lists the most prominent terms
 and a few less familiar ones with unusual or
 unexpected definitions.
 
-[A](guide/glossary#A) [B](guide/glossary#B) [C](guide/glossary#C) [D](guide/glossary#D) [E](guide/glossary#E) [F](guide/glossary#F) [G](guide/glossary#G) [H](guide/glossary#H) [I](guide/glossary#I)
-[J](guide/glossary#J) [K](guide/glossary#K) [L](guide/glossary#L) [M](guide/glossary#M) [N](guide/glossary#N) [O](guide/glossary#O) [P](guide/glossary#P) [Q](guide/glossary#Q) [R](guide/glossary#R)
-[S](guide/glossary#S) [T](guide/glossary#T) [U](guide/glossary#U) [V](guide/glossary#V) [W](guide/glossary#W) [X](guide/glossary#X) [Y](guide/glossary#Y) [Z](guide/glossary#Z)
+[A](#A) [B](#B) [C](#C) [D](#D) [E](#E) [F](#F) [G](#G) [H](#H) [I](#I)
+[J](#J) [K](#K) [L](#L) [M](#M) [N](#N) [O](#O) [P](#P) [Q](#Q) [R](#R)
+[S](#S) [T](#T) [U](#U) [V](#V) [W](#W) [X](#X) [Y](#Y) [Z](#Z)
 
 
 {@a A}
@@ -22,7 +22,7 @@ unexpected definitions.
 The Angular ahead-of-time (AOT) compiler converts Angular HTML and TypeScript code
 into efficient JavaScript code during the build phase, before the browser downloads
 and runs that code.
-This is the best compilation mode for production environments, with decreased load time and increased performance compared to [just-in-time (JIT) compilation](guide/glossary#jit).
+This is the best compilation mode for production environments, with decreased load time and increased performance compared to [just-in-time (JIT) compilation](#jit).
 
 By compiling your application using the `ngc` command-line tool, you can bootstrap directly to a module factory, so you don't need to include the Angular compiler in your JavaScript bundle.
 
@@ -30,7 +30,7 @@ By compiling your application using the `ngc` command-line tool, you can bootstr
 
 ## Angular element
 
-An Angular [component](guide/glossary#component) packaged as a [custom element](guide/glossary#custom-element).
+An Angular [component](#component) packaged as a [custom element](#custom-element).
 
 Learn more in [Angular Elements Overview](guide/elements).
 
@@ -38,7 +38,7 @@ Learn more in [Angular Elements Overview](guide/elements).
 
 ## annotation
 
-A structure that provides metadata for a class. See [decorator](guide/glossary#decorator).
+A structure that provides metadata for a class. See [decorator](#decorator).
 
 {@a app-shell}
 
@@ -53,6 +53,19 @@ You can use the Angular CLI to [generate](cli/generate#appshell) an app shell.
 This can improve the user experience by quickly launching a static rendered page (a skeleton common to all pages) while the browser downloads the full client version and switches to it automatically after the code loads.
 
 See also [Service Worker and PWA](guide/service-worker-intro).
+{@a architect}
+
+## Architect
+
+The tool that the CLI uses to perform complex tasks such as compilation and test running, according to a provided configuration.
+Architect is a shell that runs a [builder](#builder) (defined in an [npm package](#npm-package)) with a given [target configuration](#target).
+
+In the [workspace configuration file](guide/workspace-config#project-tool-configuration-options), an "architect" section provides configuration options for Architect builders.
+
+For example, a built-in builder for linting is defined in the package `@angular-devkit/build_angular:tslint`, which uses the [TSLint](https://palantir.github.io/tslint/) tool to perform linting, with a configuration specified in a `tslint.json` file.
+
+Use the [CLI command `ng run`](cli/run) to invoke a builder by specifying a [target configuration](#target) associated with that builder.
+Integrators can add builders to enable tools and workflows to run through the Angular CLI. For example, a custom builder can replace the third-party tools used by the built-in implementations for CLI commands such as `ng build` or `ng test`.
 
 {@a attribute-directive}
 
@@ -62,7 +75,7 @@ See also [Service Worker and PWA](guide/service-worker-intro).
 
 ## attribute directives
 
-A category of [directive](guide/glossary#directive) that can listen to and modify the behavior of
+A category of [directive](#directive) that can listen to and modify the behavior of
 other HTML elements, attributes, properties, and components. They are usually represented
 as HTML attributes, hence the name.
 
@@ -76,11 +89,11 @@ Learn more in [Attribute Directives](guide/attribute-directives).
 ## binding
 
 Generally, the practice of setting a variable or property to a data value.
-Within Angular, typically refers to [data binding](guide/glossary#data-binding),
+Within Angular, typically refers to [data binding](#data-binding),
 which coordinates DOM object properties with data object properties.
 
-Sometimes refers to a [dependency-injection](guide/glossary#dependency-injection) binding
-between a [token](guide/glossary#token) and a dependency [provider](guide/glossary#provider).
+Sometimes refers to a [dependency-injection](#dependency-injection) binding
+between a [token](#token) and a dependency [provider](#provider).
 
 {@a bootstrap}
 
@@ -88,12 +101,24 @@ between a [token](guide/glossary#token) and a dependency [provider](guide/glossa
 
 A way to initialize and launch an app or system.
 
-In Angular, an app's root NgModule (`AppModule`) has a `bootstrap` property that identifies the app's top-level [components](guide/glossary#component).
+In Angular, an app's root NgModule (`AppModule`) has a `bootstrap` property that identifies the app's top-level [components](#component).
 During the bootstrap process, Angular creates and inserts these components into the `index.html` host web page.
 You can bootstrap multiple apps in the same `index.html`. Each app contains its own components.
 
 Learn more in [Bootstrapping](guide/bootstrapping).
 
+{@a builder}
+
+## builder
+
+A function that uses the [Architect](#architect) API to perform a complex process such as "build" or "test".
+The builder code is defined in an [npm package](#npm-package).
+
+For example, [BrowserBuilder](https://github.com/angular/angular-cli/tree/master/packages/angular_devkit/build_angular/src/browser) runs a [webpack](https://webpack.js.org/) build for a browser target and [KarmaBuilder](https://github.com/angular/angular-cli/tree/master/packages/angular_devkit/build_angular/src/karma) starts the Karma server and runs a webpack build for unit tests.
+
+The [CLI command `ng run`](cli/run) invokes a builder with a specific [target configuration](#target).
+The [workspace configuration](guide/workspace-config) file, `angular.json`, contains default configurations for built-in builders.
+
 {@a C}
 
 {@a case-conventions}
@@ -123,7 +148,7 @@ Upper snake case uses words in all capital letters connected with underscores. F
 
 ## class decorator
 
-A [decorator](guide/glossary#decorator) that appears immediately before a class definition, which declares the class to be of the given type, and provides metadata suitable to the type.
+A [decorator](#decorator) that appears immediately before a class definition, which declares the class to be of the given type, and provides metadata suitable to the type.
 
 The following decorators can declare Angular class types:
 * `@Component()`
@@ -137,7 +162,7 @@ The following decorators can declare Angular class types:
 
 ## class field decorator
 
-A [decorator](guide/glossary#decorator) statement immediately before a field in a class definition that declares the type of that field. Some examples are `@Input` and `@Output`.
+A [decorator](#decorator) statement immediately before a field in a class definition that declares the type of that field. Some examples are `@Input` and `@Output`.
 
 {@a collection}
 
@@ -149,7 +174,7 @@ In Angular, a set of related [schematics](#schematic) collected in an [npm packa
 
 ## command-line interface (CLI)
 
-The [Angular CLI](cli) is a command-line tool for managing the Angular development cycle. Use it to create the initial filesystem scaffolding for a [workspace](guide/glossary#workspace) or [project](guide/glossary#project), and to run [schematics](guide/glossary#schematic) that add and modify code for initial generic versions of various elements. The CLI supports all stages of the development cycle, including building, testing, bundling, and deployment.
+The [Angular CLI](cli) is a command-line tool for managing the Angular development cycle. Use it to create the initial filesystem scaffolding for a [workspace](#workspace) or [project](#project), and to run [schematics](#schematic) that add and modify code for initial generic versions of various elements. The CLI supports all stages of the development cycle, including building, testing, bundling, and deployment.
 
 * To begin using the CLI for a new project, see [Getting Started](guide/quickstart).
 * To learn more about the full capabilities of the CLI, see the [CLI command reference](cli).
@@ -160,14 +185,19 @@ See also [Schematics CLI](#schematics-cli).
 
 ## component
 
-A class with the `@Component()` [decorator](guide/glossary#decorator) that associates it with a companion [template](guide/glossary#template). Together, the component and template define a [view](guide/glossary#view).
-A component is a special type of [directive](guide/glossary#directive).
+A class with the `@Component()` [decorator](#decorator) that associates it with a companion [template](#template). Together, the component and template define a [view](#view).
+A component is a special type of [directive](#directive).
 The `@Component()` decorator extends the `@Directive()` decorator with template-oriented features.
 
-An Angular component class is responsible for exposing data and handling most of the view's display and user-interaction logic through [data binding](guide/glossary#data-binding).
+An Angular component class is responsible for exposing data and handling most of the view's display and user-interaction logic through [data binding](#data-binding).
 
 Read more about components, templates, and views in [Architecture Overview](guide/architecture).
 
+## configuration
+
+See  [workspace configuration](#cli-config)
+
+
 {@a custom-element}
 
 ## custom element
@@ -178,7 +208,9 @@ The custom element feature extends HTML by allowing you to define a tag whose co
 
 You can use the API to transform an Angular component so that it can be registered with the browser and used in any HTML that you add directly to the DOM within an Angular app. The custom element tag inserts the component's view, with change-detection and data-binding functionality, into content that would otherwise be displayed without Angular processing.
 
-See also [dynamic component loading](guide/glossary#dynamic-components).
+See [Angular element](#angular-element).
+
+See also [dynamic component loading](#dynamic-components).
 
 
 {@a D}
@@ -210,8 +242,8 @@ Read about the following forms of binding in [Template Syntax](guide/template-sy
 
 ## declarable
 
-A class type that you can add to the `declarations` list of an [NgModule](guide/glossary#ngmodule).
-You can declare [components](guide/glossary#component), [directives](guide/glossary#directive), and [pipes](guide/glossary#pipe).
+A class type that you can add to the `declarations` list of an [NgModule](#ngmodule).
+You can declare [components](#component), [directives](#directive), and [pipes](#pipe).
 
 Don't declare the following:
 * A class that's already declared in another NgModule
@@ -233,7 +265,7 @@ TypeScript adds support for decorators.
 Angular defines decorators that attach metadata to classes or properties
 so that it knows what those classes or properties mean and how they should work.
 
-See [class decorator](guide/glossary#class-decorator), [class field decorator](guide/glossary#class-field-decorator).
+See [class decorator](#class-decorator), [class field decorator](#class-field-decorator).
 
 {@a di}
 
@@ -244,7 +276,7 @@ See [class decorator](guide/glossary#class-decorator), [class field decorator](g
 A design pattern and mechanism for creating and delivering some parts of an application (dependencies) to other parts of an application that require them.
 
 In Angular, dependencies are typically services, but they also can be values, such as strings or functions.
-An [injector](guide/glossary#injector) for an app (created automatically during bootstrap) instantiates dependencies when needed, using a configured [provider](guide/glossary#provider) of the service or value.
+An [injector](#injector) for an app (created automatically during bootstrap) instantiates dependencies when needed, using a configured [provider](#provider) of the service or value.
 
 Learn more in [Dependency Injection in Angular](guide/dependency-injection).
 
@@ -252,7 +284,7 @@ Learn more in [Dependency Injection in Angular](guide/dependency-injection).
 
 ## DI token
 
-A lookup token associated with a dependency [provider](guide/glossary#provider), for use with the [dependency injection](guide/glossary#di) system.
+A lookup token associated with a dependency [provider](#provider), for use with the [dependency injection](#di) system.
 
 
 {@a directive}
@@ -260,16 +292,16 @@ A lookup token associated with a dependency [provider](guide/glossary#provider),
 
 ## directive
 
-A class that can modify the structure of the DOM or modify attributes in the DOM and component data model. A directive class definition is immediately preceded by a `@Directive()` [decorator](guide/glossary#decorator) that supplies metadata.
+A class that can modify the structure of the DOM or modify attributes in the DOM and component data model. A directive class definition is immediately preceded by a `@Directive()` [decorator](#decorator) that supplies metadata.
 
-A directive class is usually associated with an HTML element or attribute, and that element or attribute is often referred to as the directive itself. When Angular finds a directive in an HTML [template](guide/glossary#template), it creates the matching directive class instance and gives the instance control over that portion of the browser DOM.
+A directive class is usually associated with an HTML element or attribute, and that element or attribute is often referred to as the directive itself. When Angular finds a directive in an HTML [template](#template), it creates the matching directive class instance and gives the instance control over that portion of the browser DOM.
 
 There are three categories of directive:
-* [Components](guide/glossary#component) use `@Component()` (an extension of `@Directive()`) to associate a template with a class.
+* [Components](#component) use `@Component()` (an extension of `@Directive()`) to associate a template with a class.
 
-* [Attribute directives](guide/glossary#attribute-directive) modify behavior and appearance of page elements.
+* [Attribute directives](#attribute-directive) modify behavior and appearance of page elements.
 
-* [Structural directives](guide/glossary#structural-directive) modify the structure of the DOM.
+* [Structural directives](#structural-directive) modify the structure of the DOM.
 
 Angular supplies a number of built-in directives that begin with the `ng` prefix.
 You can also create new directives to implement your own functionality.
@@ -288,7 +320,7 @@ Angular extends TypeScript with domain-specific languages for a number of domain
 
 A technique for adding a component to the DOM at run time. Requires that you exclude the component from compilation and then connect it to Angular's change-detection and event-handling framework when you add it to the DOM.
 
-See also [custom element](guide/glossary#custom-element), which provides an easier path with the same result.
+See also [custom element](#custom-element), which provides an easier path with the same result.
 
 
 {@a E}
@@ -299,7 +331,7 @@ See also [custom element](guide/glossary#custom-element), which provides an easi
 
 NgModules or components that are loaded on launch are called eager-loaded, to distinguish them from those
 that are loaded at run time (lazy-loaded).
-See [lazy loading](guide/glossary#lazy-load).
+See [lazy loading](#lazy-load).
 
 
 {@a ecma}
@@ -308,7 +340,7 @@ See [lazy loading](guide/glossary#lazy-load).
 
 The [official JavaScript language specification](https://en.wikipedia.org/wiki/ECMAScript).
 
-Not all browsers support the latest ECMAScript standard, but you can use a [transpiler](guide/glossary#transpile) (like [TypeScript](guide/glossary#typescript)) to write code using the latest features, which will then be transpiled to code that runs on versions that are supported by browsers.
+Not all browsers support the latest ECMAScript standard, but you can use a [transpiler](#transpile) (like [TypeScript](#typescript)) to write code using the latest features, which will then be transpiled to code that runs on versions that are supported by browsers.
 
 To learn more, see [Browser Support](guide/browser-support).
 
@@ -324,16 +356,16 @@ without reference to the native element.
 The documentation generally refers to *elements* (`ElementRef` instances), as distinct from  *DOM elements*
 (which can be accessed directly if necessary).
 
-Compare to [custom element](guide/glossary#custom-element).
+Compare to [custom element](#custom-element).
 
 {@a entry-point}
 
 ## entry point
 
 A JavaScript symbol that makes parts of an [npm package](guide/npm-packages) available for import by other code.
-The Angular [scoped packages](guide/glossary#scoped-package) each have an entry point named `index`.
+The Angular [scoped packages](#scoped-package) each have an entry point named `index`.
 
-Within Angular, use [NgModules](guide/glossary#ngmodule) to make public parts available for import by other NgModules.
+Within Angular, use [NgModules](#ngmodule) to make public parts available for import by other NgModules.
 
 
 {@a F}
@@ -350,7 +382,7 @@ Read more forms in the [Introduction to forms in Angular](guide/forms-overview).
 
 ## form model
 
-The "source of truth" for the value and validation status of a form input element at a given point in time. When using [reactive forms](guide/glossary#reactive-forms), the form model is created explicitly in the component class. When using [template-driven forms](guide/glossary#template-driven-forms), the form model is implicitly created by directives.
+The "source of truth" for the value and validation status of a form input element at a given point in time. When using [reactive forms](#reactive-forms), the form model is created explicitly in the component class. When using [template-driven forms](#template-driven-forms), the form model is implicitly created by directives.
 
 Learn more about reactive and template-driven forms in the [Introduction to forms in Angular](guide/forms-overview).
 
@@ -375,22 +407,22 @@ To learn more, see [Form Validation](guide/form-validation).
 
 ## immutability
 
-The ability to alter the state of a value after its creation. [Reactive forms](guide/glossary#reactive-forms) perform immutable changes in that
-each change to the data model produces a new data model rather than modifying the existing one. [Template-driven forms](guide/glossary#template-driven-forms) perform mutable changes with `NgModel` and [two-way data binding](guide/glossary#data-binding) to modify the existing data model in place.
+The ability to alter the state of a value after its creation. [Reactive forms](#reactive-forms) perform immutable changes in that
+each change to the data model produces a new data model rather than modifying the existing one. [Template-driven forms](#template-driven-forms) perform mutable changes with `NgModel` and [two-way data binding](#data-binding) to modify the existing data model in place.
 
 {@a injectable}
 
 ## injectable
 
-An Angular class or other definition that provides a dependency using the [dependency injection](guide/glossary#di) mechanism. An injectable [service](guide/glossary#service) class must be marked by the `@Injectable()` [decorator](guide/glossary#decorator). Other items, such as constant values, can also be injectable.
+An Angular class or other definition that provides a dependency using the [dependency injection](#di) mechanism. An injectable [service](#service) class must be marked by the `@Injectable()` [decorator](#decorator). Other items, such as constant values, can also be injectable.
 
 {@a injector}
 
 ## injector
 
-An object in the Angular [dependency-injection](guide/glossary#dependency-injection) system
+An object in the Angular [dependency-injection](#dependency-injection) system
 that can find a named dependency in its cache or create a dependency
-using a configured [provider](guide/glossary#provider).
+using a configured [provider](#provider).
 Injectors are created for NgModules automatically as part of the bootstrap process
 and are inherited through the component hierarchy.
 
@@ -406,10 +438,10 @@ Learn more about the injector hierarchy in [Hierarchical Dependency Injectors](g
 
 ## input
 
-When defining a [directive](guide/glossary#directive), the `@Input()` decorator on a directive property
+When defining a [directive](#directive), the `@Input()` decorator on a directive property
 makes that property available as a *target* of a [property binding](guide/template-syntax#property-binding).
 Data values flow into an input property from the data source identified
-in the [template expression](guide/glossary#template-expression) to the right of the equal sign.
+in the [template expression](#template-expression) to the right of the equal sign.
 
 To learn more, see [input and output properties](guide/template-syntax#inputs-outputs).
 
@@ -417,7 +449,7 @@ To learn more, see [input and output properties](guide/template-syntax#inputs-ou
 
 ## interpolation
 
-A form of property [data binding](guide/glossary#data-binding) in which a [template expression](guide/glossary#template-expression) between double-curly braces renders as text.
+A form of property [data binding](#data-binding) in which a [template expression](#template-expression) between double-curly braces renders as text.
 That text can be concatenated with neighboring text before it is assigned to an element property
 or displayed between element tags, as in this example.
 
@@ -436,7 +468,7 @@ Read more about [interpolation](guide/template-syntax#interpolation) in [Templat
 
 ## JavaScript
 
-See [ECMAScript](guide/glossary#ecma), [TypeScript](guide/glossary#typescript).
+See [ECMAScript](#ecma), [TypeScript](#typescript).
 
 
 {@a jit}
@@ -451,7 +483,7 @@ JIT compilation is the default (as opposed to AOT compilation) when you run Angu
 JIT mode is strongly discouraged for production use
 because it results in large application payloads that hinder the bootstrap performance.
 
-Compare to [ahead-of-time (AOT) compilation](guide/glossary#aot).
+Compare to [ahead-of-time (AOT) compilation](#aot).
 
 
 {@a K}
@@ -464,21 +496,22 @@ Compare to [ahead-of-time (AOT) compilation](guide/glossary#aot).
 ## lazy loading
 
 A process that speeds up application load time by splitting the application into multiple bundles and loading them on demand.
-For example, dependencies can be lazy loaded as needed—as opposed to [eager-loaded](guide/glossary#eager-loading) modules that are required by the root module and are thus loaded on launch.
+For example, dependencies can be lazy loaded as needed—as opposed to [eager-loaded](#eager-loading) modules that are required by the root module and are thus loaded on launch.
 
-The [router](guide/glossary#router) makes use of lazy loading to load child views only when the parent view is activated.
+The [router](#router) makes use of lazy loading to load child views only when the parent view is activated.
 Similarly, you can build custom elements that can be loaded into an Angular app when needed.
 
 {@a library}
 
 ## library
 
-In Angular, a [project](guide/glossary#project) that provides functionality that can be included in other Angular apps.
+In Angular, a [project](#project) that provides functionality that can be included in other Angular apps.
 A library isn't a complete Angular app and can't run independently.
+(To add re-usable Angular functionality to non-Angular web apps, you can use Angular [custom elements](#angular-element).)
 
-* Library developers can use the [Angular CLI](guide/glossary#cli) to `generate` scaffolding for a new library in an existing [workspace](guide/glossary#workspace), and can publish a library as an `npm` package.
+* Library developers can use the [Angular CLI](#cli) to `generate` scaffolding for a new library in an existing [workspace](#workspace), and can publish a library as an `npm` package.
 
-* Application developers can use the [Angular CLI](guide/glossary#cli) to `add` a published library for use with an application in the same [workspace](guide/glossary#workspace).
+* Application developers can use the [Angular CLI](#cli) to `add` a published library for use with an application in the same [workspace](#workspace).
 
 See also [schematic](#schematic).
 
@@ -486,14 +519,14 @@ See also [schematic](#schematic).
 
 ## lifecycle hook
 
-An interface that allows you to tap into the lifecycle of [directives](guide/glossary#directive) and [components](guide/glossary#component) as they are created, updated, and destroyed.
+An interface that allows you to tap into the lifecycle of [directives](#directive) and [components](#component) as they are created, updated, and destroyed.
 
 Each interface has a single hook method whose name is the interface name prefixed with `ng`.
 For example, the `OnInit` interface has a hook method named `ngOnInit`.
 
 Angular calls these hook methods in the following order:
 
-* `ngOnChanges`: When an [input](guide/glossary#input)/[output](guide/glossary#output) binding value changes.
+* `ngOnChanges`: When an [input](#input)/[output](#output) binding value changes.
 * `ngOnInit`: After the first `ngOnChanges`.
 * `ngDoCheck`: Developer's custom change detection.
 * `ngAfterContentInit`: After component content initialized.
@@ -517,7 +550,7 @@ In JavaScript (ECMAScript), each file is a module and all objects defined in the
 
 Angular ships as a collection of JavaScript modules (also called libraries). Each Angular library name begins with the `@angular` prefix. Install Angular libraries with the [npm package manager](https://docs.npmjs.com/getting-started/what-is-npm) and import parts of them with JavaScript `import` declarations.
 
-Compare to [NgModule](guide/glossary#ngmodule).
+Compare to [NgModule](#ngmodule).
 
 
 {@a N}
@@ -526,12 +559,12 @@ Compare to [NgModule](guide/glossary#ngmodule).
 
 ## NgModule
 
-A class definition preceded by the `@NgModule()` [decorator](guide/glossary#decorator), which declares and serves as a manifest for a block of code dedicated to an application domain, a workflow, or a closely related set of capabilities.
+A class definition preceded by the `@NgModule()` [decorator](#decorator), which declares and serves as a manifest for a block of code dedicated to an application domain, a workflow, or a closely related set of capabilities.
 
-Like a [JavaScript module](guide/glossary#module), an NgModule can export functionality for use by other NgModules and import public functionality from other NgModules.
-The metadata for an NgModule class collects components, directives, and pipes that the application uses along with the list of imports and exports. See also [declarable](guide/glossary#declarable).
+Like a [JavaScript module](#module), an NgModule can export functionality for use by other NgModules and import public functionality from other NgModules.
+The metadata for an NgModule class collects components, directives, and pipes that the application uses along with the list of imports and exports. See also [declarable](#declarable).
 
-NgModules are typically named after the file in which the exported thing is defined. For example, the Angular [DatePipe](api/common/DatePipe) class belongs to a feature module named `date_pipe` in the file `date_pipe.ts`. You import them from an Angular [scoped package](guide/glossary#scoped-package) such as `@angular/core`.
+NgModules are typically named after the file in which the exported thing is defined. For example, the Angular [DatePipe](api/common/DatePipe) class belongs to a feature module named `date_pipe` in the file `date_pipe.ts`. You import them from an Angular [scoped package](#scoped-package) such as `@angular/core`.
 
 Every Angular application has a root module. By convention, the class is called `AppModule` and resides in a file named `app.module.ts`.
 
@@ -551,7 +584,7 @@ Learn more about how Angular uses [Npm Packages](guide/npm-packages).
 
 ## observable
 
-A producer of multiple values, which it pushes to [subscribers](guide/glossary#subscriber). Used for asynchronous event handling throughout Angular. You execute an observable by subscribing to it with its `subscribe()` method, passing callbacks for notifications of new values, errors, or completion.
+A producer of multiple values, which it pushes to [subscribers](#subscriber). Used for asynchronous event handling throughout Angular. You execute an observable by subscribing to it with its `subscribe()` method, passing callbacks for notifications of new values, errors, or completion.
 
 Observables can deliver single or multiple values of any type to subscribers, either synchronously (as a function delivers a value to its caller) or on a schedule. A subscriber receives notification of new values as they are produced and notification of either normal completion or error completion.
 
@@ -564,16 +597,16 @@ To learn more, see [Observables](guide/observables).
 
 ## observer
 
-An object passed to the `subscribe()` method for an [observable](guide/glossary#observable). The object defines the callbacks for the [subscriber](guide/glossary#subscriber).
+An object passed to the `subscribe()` method for an [observable](#observable). The object defines the callbacks for the [subscriber](#subscriber).
 
 {@a output}
 
 ## output
 
-When defining a [directive](guide/glossary#directive), the `@Output{}` decorator on a directive property
+When defining a [directive](#directive), the `@Output{}` decorator on a directive property
 makes that property available as a *target* of [event binding](guide/template-syntax#event-binding).
 Events stream *out* of this property to the receiver identified
-in the [template expression](guide/glossary#template-expression) to the right of the equal sign.
+in the [template expression](#template-expression) to the right of the equal sign.
 
 To learn more, see [Input and Output Properties](guide/template-syntax#inputs-outputs).
 
@@ -584,7 +617,7 @@ To learn more, see [Input and Output Properties](guide/template-syntax#inputs-ou
 
 ## pipe
 
-A class which is preceded by the `@Pipe{}` decorator and which defines a function that transforms input values to output values for display in a [view](guide/glossary#view). Angular defines various pipes, and you can define new pipes.
+A class which is preceded by the `@Pipe{}` decorator and which defines a function that transforms input values to output values for display in a [view](#view). Angular defines various pipes, and you can define new pipes.
 
 To learn more, see [Pipes](guide/pipes).
 
@@ -599,22 +632,26 @@ See [Browser Support](guide/browser-support) for polyfills that support particul
 
 ## project
 
-In Angular, a folder within a [workspace](guide/glossary#workspace) that contains an Angular app or [library](guide/glossary#library).
-A workspace can contain multiple projects.
-All apps in a workspace can use libraries in the same workspace.
+In the Angular CLI, a standalone application or [library](#library) that can be created or modified by a CLI command.
+
+A project, as generated by the [`ng new`](cli/new), contains the set of source files, resources, and configuration files that you need to develop and test the application using the CLI. Projects can also be created with the `ng generate application` and `ng generate library` commands.
+
+For more information, see [Project File Structure](guide/file-structure).
+
+The [`angular.json`](guide/workspace-config) file configures all projects in a [workspace](#workspace).
 
 {@a provider}
 
 ## provider
 
-An object that implements one of the [`Provider`](api/core/Provider) interfaces. A provider object defines how to obtain an injectable dependency associated with a [DI token](guide/glossary#token).
-An [injector](guide/glossary#injector) uses the provider to create a new instance of a dependency
+An object that implements one of the [`Provider`](api/core/Provider) interfaces. A provider object defines how to obtain an injectable dependency associated with a [DI token](#token).
+An [injector](#injector) uses the provider to create a new instance of a dependency
 for a class that requires it.
 
 Angular registers its own providers with every injector, for services that Angular defines.
 You can register your own providers for services that your app needs.
 
-See also [service](guide/glossary#service), [dependency injection](guide/glossary#di).
+See also [service](#service), [dependency injection](#di).
 
 Learn more in [Dependency Injection](guide/dependency-injection).
 
@@ -628,7 +665,7 @@ Learn more in [Dependency Injection](guide/dependency-injection).
 ## reactive forms
 
 A framework for building Angular forms through code in a component.
-The alternative is a [template-driven form](guide/glossary#template-driven-forms).
+The alternative is a [template-driven form](#template-driven-forms).
 
 When using reactive forms:
 
@@ -645,11 +682,11 @@ The alternative is a template-driven form. For an introduction and comparison of
 
 ## router
 
-A tool that configures and implements navigation among states and [views](guide/glossary#view) within an Angular app.
+A tool that configures and implements navigation among states and [views](#view) within an Angular app.
 
-The `Router` module is an [NgModule](guide/glossary#ngmodule) that provides the necessary service providers and directives for navigating through application views. A [routing component](guide/glossary#routing-component) is one that imports the `Router` module and whose template contains a `RouterOutlet` element where it can display views produced by the router.
+The `Router` module is an [NgModule](#ngmodule) that provides the necessary service providers and directives for navigating through application views. A [routing component](#routing-component) is one that imports the `Router` module and whose template contains a `RouterOutlet` element where it can display views produced by the router.
 
-The router defines navigation among views on a single page, as opposed to navigation among pages. It interprets URL-like links to determine which views to create or destroy, and which components to load or unload. It allows you to take advantage of [lazy loading](guide/glossary#lazy-load) in your Angular apps.
+The router defines navigation among views on a single page, as opposed to navigation among pages. It interprets URL-like links to determine which views to create or destroy, and which components to load or unload. It allows you to take advantage of [lazy loading](#lazy-load) in your Angular apps.
 
 To learn more, see [Routing and Navigation](guide/router).
 
@@ -657,20 +694,21 @@ To learn more, see [Routing and Navigation](guide/router).
 
 ## router outlet
 
-A [directive](guide/glossary#directive) that acts as a placeholder in a routing component's template. Angular dynamically renders the template based on the current router state.
+A [directive](#directive) that acts as a placeholder in a routing component's template. Angular dynamically renders the template based on the current router state.
 
 {@a router-component}
 
 ## routing component
 
-An Angular [component](guide/glossary#component) with a `RouterOutlet` directive in its template that displays views based on router navigations.
+An Angular [component](#component) with a `RouterOutlet` directive in its template that displays views based on router navigations.
 
 For more information, see [Routing and Navigation](guide/router).
 
 {@a rule}
 
-In [schematics](#schematic), a function that operates on a [file tree](#file-tree) to create, delete, or modify files in a specific manner, and returns a new `Tree` object.
+## rule
 
+In [schematics](#schematic), a function that operates on a [file tree](#file-tree) to create, delete, or modify files in a specific manner.
 
 {@a S}
 
@@ -680,13 +718,15 @@ In [schematics](#schematic), a function that operates on a [file tree](#file-tre
 
 A scaffolding library that defines how to generate or transform a programming project by creating, modifying, refactoring, or moving files and code.
 A schematic defines [rules](#rule) that operate on a virtual file system called a [tree](#file-tree).
-The [Angular CLI](guide/glossary#cli) uses schematics to generate and modify [Angular projects](guide/glossary#project) and parts of projects.
+
+The [Angular CLI](#cli) uses schematics to generate and modify [Angular projects](#project) and parts of projects.
 
 * Angular provides a set of schematics for use with the CLI. See the [Angular CLI command reference](cli). The [`ng add`](cli/add) command runs schematics as part of adding a library to your project. The [`ng generate`](cli/generate) command runs schematics to create apps, libraries, and Angular code constructs.
 
-* [Library](#library) developers can use the [Schematics CLI](#schematics-cli) to create schematics that enable the Angular CLI to add and update their published libraries, and to generate artifacts the library defines.
+* [Library](#library) developers can create schematics that enable the Angular CLI to add and update their published libraries, and to generate artifacts the library defines.
+Add these schematics to the npm package that you use to publish and share your library.
 
-   For more information, see [devkit documentation](https://www.npmjs.com/package/@angular-devkit/schematics).
+For more information, see [Schematics](guide/schematics) and [Integrating Libraries with the CLI](guide/creating-libraries#integrating-with-the-cli).
 
 {@a schematics-cli}
 
@@ -699,7 +739,7 @@ Using Node 6.9 or above, install the Schematics CLI globally:
 npm install -g @angular-devkit/schematics-cli
 </code-example>
 
-This installs the `schematics` executable, which you can use to create a new project, add a new schematic to an existing project, or extend an existing schematic.
+This installs the `schematics` executable, which you can use to create a new schematics [collection](#collection) with an initial named schematic. The collection folder is a workspace for schematics. You can also use the `schematics` command to add a new schematic to an existing collection, or extend an existing schematic.
 
 {@a scoped-package}
 
@@ -724,19 +764,19 @@ It can also pre-generate pages as HTML files that you serve later.
 This technique can improve performance on mobile and low-powered devices and improve the user experience by showing a static first page quickly while the client-side app is loading.
 The static version can also make your app more visible to web crawlers.
 
-You can easily prepare an app for server-side rendering by using the [CLI](guide/glossary#cli) to run the [Angular Universal](#universal) tool, using the `@nguniversal/express-engine` [schematic](#schematic).
+You can easily prepare an app for server-side rendering by using the [CLI](#cli) to run the [Angular Universal](#universal) tool, using the `@nguniversal/express-engine` [schematic](#schematic).
 
 
 {@a service}
 
 ## service
 
-In Angular, a class with the [@Injectable()](guide/glossary#injectable) decorator that encapsulates non-UI logic and code that can be reused across an application.
+In Angular, a class with the [@Injectable()](#injectable) decorator that encapsulates non-UI logic and code that can be reused across an application.
 Angular distinguishes components from services to increase modularity and reusability.
 
-The `@Injectable()` metadata allows the service class to be used with the [dependency injection](guide/glossary#di) mechanism.
-The injectable class is instantiated by a [provider](guide/glossary#provider).
-[Injectors](guide/glossary#injector) maintain lists of providers and use them to provide service instances when they are required by components or other services.
+The `@Injectable()` metadata allows the service class to be used with the [dependency injection](#di) mechanism.
+The injectable class is instantiated by a [provider](#provider).
+[Injectors](#injector) maintain lists of providers and use them to provide service instances when they are required by components or other services.
 
 To learn more, see [Introduction to Services and Dependency Injection](guide/architecture-services).
 
@@ -745,7 +785,7 @@ To learn more, see [Introduction to Services and Dependency Injection](guide/arc
 
 ## structural directives
 
-A category of [directive](guide/glossary#directive) that is responsible for shaping HTML layout by modifying the DOM&mdashthat is, adding, removing, or manipulating elements and their children.
+A category of [directive](#directive) that is responsible for shaping HTML layout by modifying the DOM&mdashthat is, adding, removing, or manipulating elements and their children.
 
 To learn more, see [Structural Directives](guide/structural-directives).
 
@@ -753,42 +793,57 @@ To learn more, see [Structural Directives](guide/structural-directives).
 
 ## subscriber
 
-A function that defines how to obtain or generate values or messages to be published. This function is executed when a consumer calls the `subscribe()` method of an [observable](guide/glossary#observable).
+A function that defines how to obtain or generate values or messages to be published. This function is executed when a consumer calls the `subscribe()` method of an [observable](#observable).
 
 The act of subscribing to an observable triggers its execution, associates callbacks with it, and creates a `Subscription` object that lets you unsubscribe.
 
-The `subscribe()` method takes a JavaScript object (called an [observer](guide/glossary#observer)) with up to three callbacks, one for each type of notification that an observable can deliver:
+The `subscribe()` method takes a JavaScript object (called an [observer](#observer)) with up to three callbacks, one for each type of notification that an observable can deliver:
 
 * The `next` notification sends a value such as a number, a string, or an object.
 * The `error` notification sends a JavaScript Error or exception.
 * The `complete` notification doesn't send a value, but the handler is called when the call completes. Scheduled values can continue to be returned after the call completes.
 
 {@a T}
+
+{@a target}
+
+## target
+
+A buildable or runnable subset of a [project](#project), configured as an object in the [workspace configuration file](guide/workspace-config#project-tool-configuration-options), and executed by an [Architect](#architect) [builder](#builder).
+
+In the `angular.json` file, each project has an "architect" section that contains targets which configure builders. Some of these targets correspond to [CLI commands](#cli), such as `build`, `serve`, `test`, and `lint`.
+
+For example, the Architect builder invoked by the `ng build` command to compile a project uses a particular build tool, and has a default configuration whose values can be overridden on the command line. The `build` target also defines an alternate configuration for a "production" build, that can be invoked with the `--prod` flag on the `build` command.
+
+The Architect tool provides a set of builders. The [`ng new` command](cli/new) provides a set of targets for the initial application project. The [`ng generate application`](cli/generate#application) and [`ng generate library`](cli/generate#library) commands provide a set of targets for each new [project](#project). These targets, their options and configurations, can be customized to meet the needs of your project. For example, you may want to add a "staging" or "testing" configuration to a project's "build" target.
+
+You can also define a custom builder, and add a target to the project configuration that uses your custom builder. You can then run the target using the [`ng run`](cli/run) CLI command.
+
 {@a template}
 
 ## template
 
-Code associated with a component that defines how to render the component's [view](guide/glossary#view).
+Code associated with a component that defines how to render the component's [view](#view).
 
-A template combines straight HTML with Angular [data-binding](guide/glossary#data-binding) syntax, [directives](guide/glossary#directive),
-and [template expressions](guide/glossary#template-expression) (logical constructs).
+A template combines straight HTML with Angular [data-binding](#data-binding) syntax, [directives](#directive),
+and [template expressions](#template-expression) (logical constructs).
 The Angular elements insert or calculate values that modify the HTML elements before the page is displayed.
 
-A template is associated with a [component](guide/glossary#component) class through the `@Component()` [decorator](guide/glossary#decorator). The HTML can be provided inline, as the value of the `template` property, or in a separate HTML file linked through the `templateUrl` property.
+A template is associated with a [component](#component) class through the `@Component()` [decorator](#decorator). The HTML can be provided inline, as the value of the `template` property, or in a separate HTML file linked through the `templateUrl` property.
 
 Additional templates, represented by `TemplateRef` objects, can define alternative or *embedded* views, which can be referenced from multiple components.
 
-{@a template-drive-forms}
+{@a template-driven-forms}
 
 ## template-driven forms
 
 A format for building Angular forms using HTML forms and input elements in the view.
-The alternative format uses the [reactive forms](guide/glossary#reactive-forms) framework.
+The alternative format uses the [reactive forms](#reactive-forms) framework.
 
 When using template-driven forms:
 
 * The "source of truth" is the template. The validation is defined using attributes on the individual input elements.
-* [Two-way binding](guide/glossary#data-binding) with `ngModel` keeps the component model synchronized with the user's entry into the input elements.
+* [Two-way binding](#data-binding) with `ngModel` keeps the component model synchronized with the user's entry into the input elements.
 * Behind the scenes, Angular creates a new control for each input element, provided you have set up a `name` attribute and two-way binding for each input.
 * The associated Angular directives are prefixed with `ng` such as `ngForm`, `ngModel`, and `ngModelGroup`.
 
@@ -798,7 +853,7 @@ The alternative is a reactive form. For an introduction and comparison of both f
 
 ## template expression
 
-A TypeScript-like syntax that Angular evaluates within a [data binding](guide/glossary#data-binding).
+A TypeScript-like syntax that Angular evaluates within a [data binding](#data-binding).
 
 Read about how to write template expressions in  [Template expressions](guide/template-syntax#template-expressions).
 
@@ -806,7 +861,7 @@ Read about how to write template expressions in  [Template expressions](guide/te
 
 ## token
 
-An opaque identifier used for efficient table lookup. In Angular, a [DI token](guide/glossary#di-token) is used to find [providers](guide/glossary#provider) of dependencies in the [dependency injection](guide/glossary#di) system.
+An opaque identifier used for efficient table lookup. In Angular, a [DI token](#di-token) is used to find [providers](#provider) of dependencies in the [dependency injection](#di) system.
 
 {@a transpile}
 
@@ -853,18 +908,18 @@ To learn more, see [Angular Universal: server-side rendering](guide/universal).
 ## view
 
 The smallest grouping of display elements that can be created and destroyed together.
-Angular renders a view under the control of one or more [directives](guide/glossary#directive),
-especially [component](guide/glossary#component) directives and their companion [templates](guide/glossary#template).
+Angular renders a view under the control of one or more [directives](#directive),
+especially [component](#component) directives and their companion [templates](#template).
 
 A view is specifically represented by a `ViewRef` instance associated with the component.
 A view that belongs to a component is called a *host view*.
-Views are typically collected into [view hierarchies](guide/glossary#view-tree).
+Views are typically collected into [view hierarchies](#view-tree).
 
 Properties of elements in a view can change dynamically, in response to user actions;
 the structure (number and order) of elements in a view can't.
 You can change the structure of elements by inserting, moving, or removing nested views within their view containers.
 
-View hierarchies can be loaded and unloaded dynamically as the user navigates through the application, typically under the control of a [router](guide/glossary#router).
+View hierarchies can be loaded and unloaded dynamically as the user navigates through the application, typically under the control of a [router](#router).
 
 {@a view-tree}
 
@@ -879,16 +934,35 @@ The view hierarchy doesn't imply a component hierarchy. Views that are embedded
 
 ## web component
 
-See [custom element](guide/glossary#custom-element).
+See [custom element](#custom-element).
 
 {@a workspace}
 
 ## workspace
 
-In Angular, a folder that contains [projects](guide/glossary#project) (that is, apps and libraries).
-The [CLI](guide/glossary#cli) `ng new` command creates a workspace to contain projects.
+A collection of Angular [projects](#project) (that is, applications and libraries) powered by the [Angular CLI] (#cli) that are typically co-located in a single source-control repository (such as [git](https://git-scm.com/)).
+
+The [CLI](#cli) [`ng new` command](cli/new) creates a file system directory (the "workspace root").
+In the workspace root, it also creates the workspace [configuration file](#configuration) (`angular.json`) and, by default, an initial application project with the same name.
+
 Commands that create or operate on apps and libraries (such as `add` and `generate`) must be executed from within a workspace folder.
 
+For more information, see [Workspace Configuration](guide/workspace-config).
+
+{@a cli-config}
+
+{@a config}
+
+## workspace configuration
+
+A file named `angular.json` at the root level of an Angular [workspace](#workspace) provides workspace-wide and project-specific configuration defaults for build and development tools that are provided by or integrated with the [Angular CLI](#cli).
+
+For more information, see [Workspace Configuration](guide/workspace-config).
+
+Additional project-specific configuration files are used by tools, such as `package.json` for the [npm package manager](#npm-package), `tsconfig.json` for [TypeScript transpilation](#transpile), and `tslint.json` for [TSLint](https://palantir.github.io/tslint/).
+
+For more information, see [Workspace and Project File Structure](guide/file-structure).
+
 {@a X}
 
 
@@ -902,7 +976,7 @@ Commands that create or operate on apps and libraries (such as `add` and `genera
 
 An execution context for a set of asynchronous tasks. Useful for debugging, profiling, and testing apps that include asynchronous operations such as event processing, promises, and calls to remote servers.
 
-An Angular app runs in a zone where it can respond to asynchronous events by checking for data changes and updating the information it displays by resolving [data bindings](guide/glossary#data-binding).
+An Angular app runs in a zone where it can respond to asynchronous events by checking for data changes and updating the information it displays by resolving [data bindings](#data-binding).
 
 A zone client can take action before and after an async operation completes.
 

aio/content/guide/ivy.md

@@ -1,6 +1,12 @@
 # Opting into Angular Ivy
 
-Ivy is the code name for Angular's [next-generation compilation and rendering pipeline](https://blog.angular.io/a-plan-for-version-8-0-and-ivy-b3318dfc19f7). Starting with Angular version 8, you can choose to opt in to start using Ivy now, and help in its continuing develpment and tuning.
+Ivy is the code name for Angular's [next-generation compilation and rendering pipeline](https://blog.angular.io/a-plan-for-version-8-0-and-ivy-b3318dfc19f7). Starting with Angular version 8, you can choose to opt in to start using a preview version of Ivy and help in its continuing development and tuning.
+
+<div class="alert is-helpful">
+
+   To preview Ivy, use `@angular/core@next` version of Angular (8.1.x), rather than `@angular/core@latest` (8.0.x), as it contains all the latest bug fixes and improvements.
+
+</div>
 
 
 ## Using Ivy in a new project

aio/content/guide/lazy-loading-ngmodules.md

@@ -15,6 +15,9 @@ For the final sample app with two lazy loaded modules that this page describes,
 
 ## High level view
 
+By default, NgModules are eagerly loaded, which means that as soon as the app loads, so do all the NgModules, whether or not they are immediately necessary. For large apps with lots of routes, consider lazy loading—a design pattern that loads NgModules as needed. Lazy loading helps keep initial
+bundle sizes smaller, which in turn helps decrease load times.
+
 There are three main steps to setting up a lazy loaded feature module:
 
 1. Create the feature module.
@@ -67,9 +70,6 @@ ng generate component customers/customer-list
 This creates a folder inside of `customers` called `customer-list`
 with the four files that make up the component.
 
-<!-- For more information
-about components, see [Components](). -->
-
 Just like with the routing module, the CLI imports the
 `CustomerListComponent` into the `CustomersModule`.
 
@@ -217,7 +217,7 @@ knows that the route list is only responsible for providing additional routes an
 
 `forRoot()` contains injector configuration which is global; such as configuring the Router. `forChild()` has no injector configuration, only directives such as `RouterOutlet` and `RouterLink`.
 
-For more information, see the [`forRoot()` deep dive](guide/singleton-services#forRoot) section of the [Singleton Services](guide/singleton-services) guide.
+For more information, see the [`forRoot()` pattern](guide/singleton-services#forRoot) section of the [Singleton Services](guide/singleton-services) guide.
 
 <hr>
 

aio/content/guide/npm-packages.md

@@ -89,7 +89,7 @@ Package name                               | Description
 
 Many browsers lack native support for some features in the latest HTML standards,
 features that Angular requires.
-[_Polyfills_](https://en.wikipedia.org/wiki/Polyfill) can emulate the missing features.
+[_Polyfills_](https://en.wikipedia.org/wiki/Polyfill_(programming)) can emulate the missing features.
 The [Browser Support](guide/browser-support) guide explains which browsers need polyfills and 
 how you can add them.
 

aio/content/guide/providers.md

@@ -21,7 +21,7 @@ ng generate service User
 
 This command creates the following `UserService` skeleton:
 
-<code-example path="providers/src/app/user.service.0.ts"  header="src/app/user.service.0.ts" linenums="false"> </code-example>
+<code-example path="providers/src/app/user.service.0.ts"  header="src/app/user.service.ts" linenums="false"> </code-example>
 
 You can now inject `UserService` anywhere in your application.
 
@@ -38,7 +38,7 @@ You should always provide your service in the root injector unless there is a ca
 
 It's also possible to specify that a service should be provided in a particular `@NgModule`. For example, if you don't want `UserService` to be available to applications unless they import a `UserModule` you've created, you can specify that the service should be provided in the module:
 
-<code-example path="providers/src/app/user.service.1.ts"  header="src/app/user.service.1.ts" linenums="false">  </code-example>
+<code-example path="providers/src/app/user.service.1.ts"  header="src/app/user.service.ts" linenums="false">  </code-example>
 
 The example above shows the preferred way to provide a service in a module. This method is preferred because it enables tree-shaking of the service if nothing injects it. If it's not possible to specify in the service which module should provide it, you can also declare a provider for the service within the module:
 

aio/content/guide/router.md

@@ -2261,7 +2261,7 @@ For the `@routeAnimation` transitions to key off states, you'll need to provide
 
 </code-example>
 
-The `@routeAnimation` property is bound to the `getAnimationData` with the provided `routerOutlet` reference, so you'll need to define that function in the `AppComponent`. The `getAnimationData` function returns the animation property from the `data` provided through the `ActivatedRoute`. The `animation` property matches the `transition` names you used in the `slideDownAnimation` defined in `animations.ts`.
+The `@routeAnimation` property is bound to the `getAnimationData` with the provided `routerOutlet` reference, so you'll need to define that function in the `AppComponent`. The `getAnimationData` function returns the animation property from the `data` provided through the `ActivatedRoute`. The `animation` property matches the `transition` names you used in the `slideInAnimation` defined in `animations.ts`.
 
 <code-example path="router/src/app/app.component.2.ts" linenums="false" header="src/app/app.component.ts (router outlet)" region="function-binding">
 
@@ -2677,7 +2677,7 @@ display the `Crisis Center Home` and `Crisis Detail` route components.
 
 The `Crisis Detail` route is a child of the `Crisis List`. The router [reuses components](#reuse)
 by default, so the `Crisis Detail` component will be re-used as you select different crises.
-In contrast, back in the `Hero Detail` route, the component was recreated each time you selected a different hero.
+In contrast, back in the `Hero Detail` route, [the component was recreated](#snapshot-the-no-observable-alternative) each time you selected a different hero from the list of heroes.
 
 At the top level, paths that begin with `/` refer to the root of the application.
 But child routes *extend* the path of the parent route.

aio/content/guide/schematics-for-libraries.md

@@ -157,7 +157,7 @@ export class <%= classify(name) %>Service {
 
 </code-example>
 
-* The `classify` and `dasherize` methods are utility functions you schematic will use to transform your source template and filename.
+* The `classify` and `dasherize` methods are utility functions that your schematic will use to transform your source template and filename.
 
 * The `name` is provided as a property from your factory function. It is the same `name` you defined in the schema.
 

aio/content/guide/singleton-services.md

@@ -25,7 +25,7 @@ There are two ways to make a service a singleton in Angular:
 Beginning with Angular 6.0, the preferred way to create a singleton service is to set `providedIn` to `root` on the service's `@Injectable()` decorator. This tells Angular
 to provide the service in the application root.
 
-<code-example path="providers/src/app/user.service.0.ts"  header="src/app/user.service.0.ts" linenums="false"> </code-example>
+<code-example path="providers/src/app/user.service.0.ts"  header="src/app/user.service.ts" linenums="false"> </code-example>
 
 For more detailed information on services, see the [Services](tutorial/toh-pt4) chapter of the
 [Tour of Heroes tutorial](tutorial).

aio/content/guide/workspace-config.md

@@ -13,16 +13,17 @@ The following properties, at the top level of the file, configure the workspace.
 * `newProjectRoot`: Path where new projects are created. Absolute or relative to the workspace folder.
 * `defaultProject`: Default project name to use in commands, where not provided as an argument. When you use `ng new` to create a new app in a new workspace, that app is the default project for the workspace until you change it here.
 * `schematics` : A set of [schematics](guide/glossary#schematic) that customize the `ng generate` sub-command option defaults for this workspace. See [Generation schematics](#schematics) below.
-* `projects` : Contains a subsection for each project (library, app, e2e test app) in the workspace, with the per-project configuration options.
+* `projects` : Contains a subsection for each project (library or application) in the workspace, with the per-project configuration options.
 
-The initial app that you create with `ng new app_name` is listed under "projects", along with its corresponding end-to-end test app:
+The initial app that you create with `ng new app_name` is listed under "projects":
 
-<code-example format="." language="none" linenums="false">
-projects
-  app_name
-    ...
-  app_name-e2e
+<code-example format="." language="json" linenums="false">
+"projects": {
+  "app_name": {
     ...
+  }
+  ...
+}
 </code-example>
 
 Each additional app that you create with `ng generate application` has a corresponding end-to-end test project, with its own configuration section.
@@ -31,8 +32,8 @@ When you create a library project with `ng generate library`, the library projec
 <div class="alert is-helpful">
 
   Note that the `projects` section of the configuration file does not correspond exactly to the workspace file structure.
-  * The initial app created by `ng new` is at the top level of the workspace file structure, along with its e2e app.
-  * Additional apps, e2e apps, and libraries go into a `projects` folder in the workspace.
+  * The initial app created by `ng new` is at the top level of the workspace file structure.
+  * Additional applications and libraries go into a `projects` folder in the workspace.
 
   For more information, see [Workspace and project file structure](guide/file-structure).
 
@@ -57,7 +58,7 @@ The following top-level configuration properties are available for each project,
 | :-------------- | :---------------------------- |
 | `root`          | The root folder for this project's files, relative to the workspace folder. Empty for the initial app, which resides at the top level of the workspace. |
 | `sourceRoot`    | The root folder for this project's source files. |
-| `projectType`   | One of "application" or "library". An application can run independently in a browser, while a library cannot. Both an app and its e2e test app are of type "application".|
+| `projectType`   | One of "application" or "library". An application can run independently in a browser, while a library cannot.|
 | `prefix`        | A string that Angular prepends to generated selectors. Can be customized to identify an app or feature area. |
 | `schematics`    | A set of schematics that customize the `ng generate` sub-command option defaults for this project. See [Generation schematics](#schematics) below.  |
 | `architect`     | Configuration defaults for Architect builder targets for this project. |
@@ -179,7 +180,7 @@ Some additional options (listed below) can only be set through the configuration
 
 ## Project asset configuration
 
-Each `build` target configuration can include as `assets` array that lists files or folders you want to copy as-is when building your project.
+Each `build` target configuration can include an `assets` array that lists files or folders you want to copy as-is when building your project.
 By default, the `src/assets/` folder and `src/favicon.ico` are copied over.
 
 <code-example format="." language="json" linenums="false">

aio/content/marketing/resources.json

@@ -490,6 +490,12 @@
             "rev": true,
             "title": "Carbon Components Angular",
             "url": "https://angular.carbondesignsystem.com/"
+          },
+          "jigsaw": {
+            "desc": "Jigsaw provides a set of web components based on Angular. It is supporting the development of all applications of Big Data Product of ZTE (http://www.zte.com.cn).",
+            "rev": true,
+            "title": "Awade Jigsaw (Chinese)",
+            "url": "http://rdk.zte.com.cn/components"
           }
         }
       }

aio/firebase.json

@@ -54,9 +54,9 @@
       {"type": 301, "source": "/**/api/common/SelectControlValueAccessor-*", "destination": "/api/forms/SelectControlValueAccessor"},
       {"type": 301, "source": "/**/api/common/NgModel", "destination": "/api/forms/NgModel"},
 
-      // APIs under `http` package is deprecated and new APIs are available under `common/http` package
-      {"type": 301, "source": "/api/http/:rest*", "destination": "/guide/deprecation#http"},
-      {"type": 301, "source": "/api/http", "destination": "/guide/deprecation#http"},
+      // `@angular/http` package was removed, and new `HttpClient` APIs are available under `@angular/common/http` package
+      {"type": 301, "source": "/api/http/:rest*", "destination": "/guide/deprecations#http"},
+      {"type": 301, "source": "/api/http", "destination": "/guide/deprecations#http"},
 
       // Animations moves, renames and removals
       {"type": 301, "source": "/api/animate/:rest*", "destination": "/api/animations/:rest*"},

aio/package.json

@@ -19,7 +19,7 @@
     "build-local": "yarn ~~build",
     "prebuild-with-ivy": "yarn setup-local && node scripts/switch-to-ivy",
     "build-with-ivy": "yarn ~~build",
-    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js 73c53266f",
+    "extract-cli-command-docs": "node tools/transforms/cli-docs-package/extract-cli-commands.js d46eb367f",
     "lint": "yarn check-env && yarn docs-lint && ng lint && yarn example-lint && yarn tools-lint",
     "test": "yarn check-env && ng test",
     "pree2e": "yarn check-env && yarn update-webdriver",
@@ -76,28 +76,28 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^8.0.0-beta.14",
-    "@angular/cdk": "8.0.0-beta.2",
-    "@angular/common": "^8.0.0-beta.14",
-    "@angular/core": "^8.0.0-beta.14",
-    "@angular/elements": "^8.0.0-beta.14",
-    "@angular/forms": "^8.0.0-beta.14",
-    "@angular/material": "8.0.0-beta.2",
-    "@angular/platform-browser": "^8.0.0-beta.14",
-    "@angular/platform-browser-dynamic": "^8.0.0-beta.14",
-    "@angular/router": "^8.0.0-beta.14",
-    "@angular/service-worker": "^8.0.0-beta.14",
+    "@angular/animations": "^8.0.0-rc.2",
+    "@angular/cdk": "8.0.0-rc.0",
+    "@angular/common": "^8.0.0-rc.2",
+    "@angular/core": "^8.0.0-rc.2",
+    "@angular/elements": "^8.0.0-rc.2",
+    "@angular/forms": "^8.0.0-rc.2",
+    "@angular/material": "8.0.0-rc.0",
+    "@angular/platform-browser": "^8.0.0-rc.2",
+    "@angular/platform-browser-dynamic": "^8.0.0-rc.2",
+    "@angular/router": "^8.0.0-rc.2",
+    "@angular/service-worker": "^8.0.0-rc.2",
     "@types/lunr": "^2.3.2",
     "@webcomponents/custom-elements": "^1.2.0",
     "rxjs": "^6.5.1",
-    "zone.js": "^0.9.0"
+    "zone.js": "^0.9.1"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "0.800.0-beta.18",
-    "@angular/cli": "8.0.0-beta.18",
-    "@angular/compiler": "^8.0.0-beta.14",
-    "@angular/compiler-cli": "^8.0.0-beta.14",
-    "@angular/language-service": "^8.0.0-beta.14",
+    "@angular-devkit/build-angular": "0.800.0-rc.2",
+    "@angular/cli": "8.0.0-rc.2",
+    "@angular/compiler": "^8.0.0-rc.2",
+    "@angular/compiler-cli": "^8.0.0-rc.2",
+    "@angular/language-service": "^8.0.0-rc.2",
     "@types/jasmine": "^2.5.52",
     "@types/jasminewd2": "^2.0.4",
     "@types/node": "~6.0.60",
@@ -123,7 +123,7 @@
     "hast-util-is-element": "^1.0.0",
     "hast-util-to-string": "^1.0.0",
     "html": "^1.0.0",
-    "http-server": "^0.9.0",
+    "http-server": "^0.11.1",
     "ignore": "^3.3.3",
     "image-size": "^0.5.1",
     "jasmine": "^2.6.0",

aio/scripts/_payload-limits.json

@@ -4,10 +4,10 @@
       "uncompressed": {
         "runtime-es5": 2980,
         "runtime-es2015": 2986,
-        "main-es5": 501356,
-        "main-es2015": 440336,
+        "main-es5": 504760,
+        "main-es2015": 443497,
         "polyfills-es5": 128751,
-        "polyfills-es2015": 59557
+        "polyfills-es2015": 53147
       }
     }
   }

aio/scripts/switch-to-ivy.js

@@ -33,7 +33,7 @@ function _main() {
   const oldTsConfigStr = readFileSync(tsConfigPath, 'utf8');
   const oldTsConfigObj = parse(oldTsConfigStr);
   const newTsConfigObj = extend(true, oldTsConfigObj, NG_COMPILER_OPTS);
-  const newTsConfigStr = JSON.stringify(newTsConfigObj, null, 2);
+  const newTsConfigStr = `${JSON.stringify(newTsConfigObj, null, 2)}\n`;
   console.log(`\nNew config: ${newTsConfigStr}`);
   writeFileSync(tsConfigPath, newTsConfigStr);
 

aio/scripts/test-production.sh

@@ -6,11 +6,8 @@ set +x -eu -o pipefail
   readonly aioDir="$(realpath $thisDir/..)"
 
   readonly protractorConf="$aioDir/tests/deployment/e2e/protractor.conf.js"
-  readonly minPwaScore="$1"
-  readonly urls=(
-    "https://angular.io/"
-    "https://next.angular.io/"
-  )
+  readonly targetUrl="$1"
+  readonly minPwaScore="$2"
 
   cd "$aioDir"
 
@@ -19,16 +16,14 @@ set +x -eu -o pipefail
   yarn install --frozen-lockfile --non-interactive
   yarn update-webdriver
 
-  # Run checks for all URLs.
-  for url in "${urls[@]}"; do
-    echo -e "\nChecking '$url'...\n-----"
+  # Run checks for target URL.
+  echo -e "\nChecking '$targetUrl'...\n-----"
 
-    # Run basic e2e and deployment config tests.
-    yarn protractor "$protractorConf" --baseUrl "$url"
+  # Run basic e2e and deployment config tests.
+  yarn protractor "$protractorConf" --baseUrl "$targetUrl"
 
-    # Run PWA-score tests.
-    yarn test-pwa-score "$url" "$minPwaScore"
-  done
+  # Run PWA-score tests.
+  yarn test-pwa-score "$targetUrl" "$minPwaScore"
 
   echo -e "\nAll checks passed!"
 )

aio/src/app/custom-elements/code/code-example.component.spec.ts

@@ -23,10 +23,10 @@ describe('CodeExampleComponent', () => {
     });
 
     fixture = TestBed.createComponent(HostComponent);
+    fixture.detectChanges();
+
     hostComponent = fixture.componentInstance;
     codeExampleComponent = hostComponent.codeExampleComponent;
-
-    fixture.detectChanges();
   });
 
   it('should be able to capture the code snippet provided in content', () => {

aio/src/app/custom-elements/code/code-tabs.component.spec.ts

@@ -23,10 +23,10 @@ describe('CodeTabsComponent', () => {
     });
 
     fixture = TestBed.createComponent(HostComponent);
+    fixture.detectChanges();
+
     hostComponent = fixture.componentInstance;
     codeTabsComponent = hostComponent.codeTabsComponent;
-
-    fixture.detectChanges();
   });
 
   it('should get correct tab info', () => {

aio/src/app/custom-elements/toc/toc.component.spec.ts

@@ -63,178 +63,182 @@ describe('TocComponent', () => {
       expect(tocComponent.type).toEqual('None');
     });
 
-    it('should not display anything when no h2 or h3 TocItems', () => {
-      tocService.tocList.next([tocItem('H1', 'h1')]);
-      fixture.detectChanges();
-      expect(tocComponentDe.children.length).toEqual(0);
-    });
+    describe('(once the lifecycle hooks have run)', () => {
+      beforeEach(() => fixture.detectChanges());
 
-    it('should update when the TocItems are updated', () => {
-      tocService.tocList.next([tocItem('Heading A')]);
-      fixture.detectChanges();
-      expect(tocComponentDe.queryAll(By.css('li')).length).toBe(1);
-
-      tocService.tocList.next([tocItem('Heading A'), tocItem('Heading B'), tocItem('Heading C')]);
-      fixture.detectChanges();
-      expect(tocComponentDe.queryAll(By.css('li')).length).toBe(3);
-    });
-
-    it('should only display H2 and H3 TocItems', () => {
-      tocService.tocList.next([tocItem('Heading A', 'h1'), tocItem('Heading B'), tocItem('Heading C', 'h3')]);
-      fixture.detectChanges();
-
-      const tocItems = tocComponentDe.queryAll(By.css('li'));
-      const textContents = tocItems.map(item => item.nativeNode.textContent.trim());
-
-      expect(tocItems.length).toBe(2);
-      expect(textContents.find(text => text === 'Heading A')).toBeFalsy();
-      expect(textContents.find(text => text === 'Heading B')).toBeTruthy();
-      expect(textContents.find(text => text === 'Heading C')).toBeTruthy();
-      expect(setPage().tocH1Heading).toBeFalsy();
-    });
-
-    it('should stop listening for TocItems once destroyed', () => {
-      tocService.tocList.next([tocItem('Heading A')]);
-      fixture.detectChanges();
-      expect(tocComponentDe.queryAll(By.css('li')).length).toBe(1);
-
-      tocComponent.ngOnDestroy();
-      tocService.tocList.next([tocItem('Heading A', 'h1'), tocItem('Heading B'), tocItem('Heading C')]);
-      fixture.detectChanges();
-      expect(tocComponentDe.queryAll(By.css('li')).length).toBe(1);
-    });
-
-    describe('when fewer than `maxPrimary` TocItems', () => {
-
-      beforeEach(() => {
-        tocService.tocList.next([tocItem('Heading A'), tocItem('Heading B'), tocItem('Heading C'), tocItem('Heading D')]);
+      it('should not display anything when no h2 or h3 TocItems', () => {
+        tocService.tocList.next([tocItem('H1', 'h1')]);
         fixture.detectChanges();
-        page = setPage();
+        expect(tocComponentDe.children.length).toEqual(0);
       });
 
-      it('should have four displayed items', () => {
-        expect(page.listItems.length).toEqual(4);
-      });
-
-      it('should not have secondary items', () => {
-        expect(tocComponent.type).toEqual('EmbeddedSimple');
-        const aSecond = page.listItems.find(item => item.classes.secondary);
-        expect(aSecond).toBeFalsy('should not find a secondary');
-      });
-
-      it('should not display expando buttons', () => {
-        expect(page.tocHeadingButtonEmbedded).toBeFalsy('top expand/collapse button');
-        expect(page.tocMoreButton).toBeFalsy('bottom more button');
-      });
-    });
-
-    describe('when many TocItems', () => {
-      let scrollToTopSpy: jasmine.Spy;
-
-      beforeEach(() => {
+      it('should update when the TocItems are updated', () => {
+        tocService.tocList.next([tocItem('Heading A')]);
         fixture.detectChanges();
-        page = setPage();
-        scrollToTopSpy = TestBed.get(ScrollService).scrollToTop;
+        expect(tocComponentDe.queryAll(By.css('li')).length).toBe(1);
+
+        tocService.tocList.next([tocItem('Heading A'), tocItem('Heading B'), tocItem('Heading C')]);
+        fixture.detectChanges();
+        expect(tocComponentDe.queryAll(By.css('li')).length).toBe(3);
       });
 
-      it('should have more than 4 displayed items', () => {
-        expect(page.listItems.length).toBeGreaterThan(4);
+      it('should only display H2 and H3 TocItems', () => {
+        tocService.tocList.next([tocItem('Heading A', 'h1'), tocItem('Heading B'), tocItem('Heading C', 'h3')]);
+        fixture.detectChanges();
+
+        const tocItems = tocComponentDe.queryAll(By.css('li'));
+        const textContents = tocItems.map(item => item.nativeNode.textContent.trim());
+
+        expect(tocItems.length).toBe(2);
+        expect(textContents.find(text => text === 'Heading A')).toBeFalsy();
+        expect(textContents.find(text => text === 'Heading B')).toBeTruthy();
+        expect(textContents.find(text => text === 'Heading C')).toBeTruthy();
+        expect(setPage().tocH1Heading).toBeFalsy();
       });
 
-      it('should not display the h1 item', () => {
-        expect(page.listItems.find(item => item.classes.h1)).toBeFalsy('should not find h1 item');
+      it('should stop listening for TocItems once destroyed', () => {
+        tocService.tocList.next([tocItem('Heading A')]);
+        fixture.detectChanges();
+        expect(tocComponentDe.queryAll(By.css('li')).length).toBe(1);
+
+        tocComponent.ngOnDestroy();
+        tocService.tocList.next([tocItem('Heading A', 'h1'), tocItem('Heading B'), tocItem('Heading C')]);
+        fixture.detectChanges();
+        expect(tocComponentDe.queryAll(By.css('li')).length).toBe(1);
       });
 
-      it('should be in "collapsed" (not expanded) state at the start', () => {
-        expect(tocComponent.isCollapsed).toBeTruthy();
-      });
-
-      it('should have "collapsed" class at the start', () => {
-        expect(tocComponentDe.children[0].classes.collapsed).toEqual(true);
-      });
-
-      it('should display expando buttons', () => {
-        expect(page.tocHeadingButtonEmbedded).toBeTruthy('top expand/collapse button');
-        expect(page.tocMoreButton).toBeTruthy('bottom more button');
-      });
-
-      it('should have secondary items', () => {
-        expect(tocComponent.type).toEqual('EmbeddedExpandable');
-      });
-
-      // CSS will hide items with the secondary class when collapsed
-      it('should have secondary item with a secondary class', () => {
-        const aSecondary = page.listItems.find(item => item.classes.secondary);
-        expect(aSecondary).toBeTruthy('should find a secondary');
-      });
-
-      describe('after click tocHeading button', () => {
+      describe('when fewer than `maxPrimary` TocItems', () => {
 
         beforeEach(() => {
-          page.tocHeadingButtonEmbedded.nativeElement.click();
+          tocService.tocList.next([tocItem('Heading A'), tocItem('Heading B'), tocItem('Heading C'), tocItem('Heading D')]);
           fixture.detectChanges();
+          page = setPage();
         });
 
-        it('should not be "collapsed"', () => {
-          expect(tocComponent.isCollapsed).toEqual(false);
+        it('should have four displayed items', () => {
+          expect(page.listItems.length).toEqual(4);
         });
 
-        it('should not have "collapsed" class', () => {
-          expect(tocComponentDe.children[0].classes.collapsed).toBeFalsy();
+        it('should not have secondary items', () => {
+          expect(tocComponent.type).toEqual('EmbeddedSimple');
+          const aSecond = page.listItems.find(item => item.classes.secondary);
+          expect(aSecond).toBeFalsy('should not find a secondary');
         });
 
-        it('should not scroll', () => {
-          expect(scrollToTopSpy).not.toHaveBeenCalled();
-        });
-
-        it('should be "collapsed" after clicking again', () => {
-          page.tocHeadingButtonEmbedded.nativeElement.click();
-          fixture.detectChanges();
-          expect(tocComponent.isCollapsed).toEqual(true);
-        });
-
-        it('should not scroll after clicking again', () => {
-          page.tocHeadingButtonEmbedded.nativeElement.click();
-          fixture.detectChanges();
-          expect(scrollToTopSpy).not.toHaveBeenCalled();
+        it('should not display expando buttons', () => {
+          expect(page.tocHeadingButtonEmbedded).toBeFalsy('top expand/collapse button');
+          expect(page.tocMoreButton).toBeFalsy('bottom more button');
         });
       });
 
-      describe('after click tocMore button', () => {
+      describe('when many TocItems', () => {
+        let scrollToTopSpy: jasmine.Spy;
 
         beforeEach(() => {
-          page.tocMoreButton.nativeElement.click();
           fixture.detectChanges();
+          page = setPage();
+          scrollToTopSpy = TestBed.get(ScrollService).scrollToTop;
         });
 
-        it('should not be "collapsed"', () => {
-          expect(tocComponent.isCollapsed).toEqual(false);
+        it('should have more than 4 displayed items', () => {
+          expect(page.listItems.length).toBeGreaterThan(4);
         });
 
-        it('should not have "collapsed" class', () => {
-          expect(tocComponentDe.children[0].classes.collapsed).toBeFalsy();
+        it('should not display the h1 item', () => {
+          expect(page.listItems.find(item => item.classes.h1)).toBeFalsy('should not find h1 item');
         });
 
-        it('should not scroll', () => {
-          expect(scrollToTopSpy).not.toHaveBeenCalled();
+        it('should be in "collapsed" (not expanded) state at the start', () => {
+          expect(tocComponent.isCollapsed).toBeTruthy();
         });
 
-        it('should be "collapsed" after clicking again', () => {
-          page.tocMoreButton.nativeElement.click();
-          fixture.detectChanges();
-          expect(tocComponent.isCollapsed).toEqual(true);
+        it('should have "collapsed" class at the start', () => {
+          expect(tocComponentDe.children[0].classes.collapsed).toEqual(true);
         });
 
-        it('should be "collapsed" after clicking tocHeadingButton', () => {
-          page.tocMoreButton.nativeElement.click();
-          fixture.detectChanges();
-          expect(tocComponent.isCollapsed).toEqual(true);
+        it('should display expando buttons', () => {
+          expect(page.tocHeadingButtonEmbedded).toBeTruthy('top expand/collapse button');
+          expect(page.tocMoreButton).toBeTruthy('bottom more button');
         });
 
-        it('should scroll after clicking again', () => {
-          page.tocMoreButton.nativeElement.click();
-          fixture.detectChanges();
-          expect(scrollToTopSpy).toHaveBeenCalled();
+        it('should have secondary items', () => {
+          expect(tocComponent.type).toEqual('EmbeddedExpandable');
+        });
+
+        // CSS will hide items with the secondary class when collapsed
+        it('should have secondary item with a secondary class', () => {
+          const aSecondary = page.listItems.find(item => item.classes.secondary);
+          expect(aSecondary).toBeTruthy('should find a secondary');
+        });
+
+        describe('after click tocHeading button', () => {
+
+          beforeEach(() => {
+            page.tocHeadingButtonEmbedded.nativeElement.click();
+            fixture.detectChanges();
+          });
+
+          it('should not be "collapsed"', () => {
+            expect(tocComponent.isCollapsed).toEqual(false);
+          });
+
+          it('should not have "collapsed" class', () => {
+            expect(tocComponentDe.children[0].classes.collapsed).toBeFalsy();
+          });
+
+          it('should not scroll', () => {
+            expect(scrollToTopSpy).not.toHaveBeenCalled();
+          });
+
+          it('should be "collapsed" after clicking again', () => {
+            page.tocHeadingButtonEmbedded.nativeElement.click();
+            fixture.detectChanges();
+            expect(tocComponent.isCollapsed).toEqual(true);
+          });
+
+          it('should not scroll after clicking again', () => {
+            page.tocHeadingButtonEmbedded.nativeElement.click();
+            fixture.detectChanges();
+            expect(scrollToTopSpy).not.toHaveBeenCalled();
+          });
+        });
+
+        describe('after click tocMore button', () => {
+
+          beforeEach(() => {
+            page.tocMoreButton.nativeElement.click();
+            fixture.detectChanges();
+          });
+
+          it('should not be "collapsed"', () => {
+            expect(tocComponent.isCollapsed).toEqual(false);
+          });
+
+          it('should not have "collapsed" class', () => {
+            expect(tocComponentDe.children[0].classes.collapsed).toBeFalsy();
+          });
+
+          it('should not scroll', () => {
+            expect(scrollToTopSpy).not.toHaveBeenCalled();
+          });
+
+          it('should be "collapsed" after clicking again', () => {
+            page.tocMoreButton.nativeElement.click();
+            fixture.detectChanges();
+            expect(tocComponent.isCollapsed).toEqual(true);
+          });
+
+          it('should be "collapsed" after clicking tocHeadingButton', () => {
+            page.tocMoreButton.nativeElement.click();
+            fixture.detectChanges();
+            expect(tocComponent.isCollapsed).toEqual(true);
+          });
+
+          it('should scroll after clicking again', () => {
+            page.tocMoreButton.nativeElement.click();
+            fixture.detectChanges();
+            expect(scrollToTopSpy).toHaveBeenCalled();
+          });
         });
       });
     });

aio/src/app/search/search-box/search-box.component.spec.ts

@@ -38,7 +38,17 @@ describe('SearchBoxComponent', () => {
     it('should get the current search query from the location service',
           fakeAsync(inject([LocationService], (location: MockLocationService) => {
       location.search.and.returnValue({ search: 'initial search' });
-      component.ngOnInit();
+      component.ngAfterViewInit();
+      expect(location.search).toHaveBeenCalled();
+      tick(300);
+      expect(host.searchHandler).toHaveBeenCalledWith('initial search');
+      expect(component.searchBox.nativeElement.value).toEqual('initial search');
+    })));
+
+    it('should decode the search query from the location service (chrome search provider format)',
+          fakeAsync(inject([LocationService], (location: MockLocationService) => {
+      location.search.and.returnValue({ search: 'initial+search' });
+      component.ngAfterViewInit();
       expect(location.search).toHaveBeenCalled();
       tick(300);
       expect(host.searchHandler).toHaveBeenCalledWith('initial search');

aio/src/app/search/search-box/search-box.component.ts

@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild, ElementRef, EventEmitter, Output } from '@angular/core';
+import { AfterViewInit, Component, ViewChild, ElementRef, EventEmitter, Output } from '@angular/core';
 import { LocationService } from 'app/shared/location.service';
 import { Subject } from 'rxjs';
 import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
@@ -24,7 +24,7 @@ import { debounceTime, distinctUntilChanged } from 'rxjs/operators';
     (focus)="doFocus()"
     (click)="doSearch()">`
 })
-export class SearchBoxComponent implements OnInit {
+export class SearchBoxComponent implements AfterViewInit {
 
   private searchDebounce = 300;
   private searchSubject = new Subject<string>();
@@ -40,10 +40,10 @@ export class SearchBoxComponent implements OnInit {
   /**
    * When we first show this search box we trigger a search if there is a search query in the URL
    */
-  ngOnInit() {
+  ngAfterViewInit() {
     const query = this.locationService.search()['search'];
     if (query) {
-      this.query = query;
+      this.query = this.decodeQuery(query);
       this.doSearch();
     }
   }
@@ -60,6 +60,11 @@ export class SearchBoxComponent implements OnInit {
     this.searchBox.nativeElement.focus();
   }
 
+  private decodeQuery(query: string): string {
+    // `decodeURIComponent` does not handle `+` for spaces, replace via RexEx.
+    return query.replace(/\+/g, ' ');
+  }
+
   private get query() { return this.searchBox.nativeElement.value; }
   private set query(value: string) { this.searchBox.nativeElement.value = value; }
 }

aio/src/app/shared/location.service.spec.ts

@@ -6,12 +6,14 @@ import { Subject } from 'rxjs';
 import { GaService } from 'app/shared/ga.service';
 import { SwUpdatesService } from 'app/sw-updates/sw-updates.service';
 import { LocationService } from './location.service';
+import { ScrollService } from './scroll.service';
 
 describe('LocationService', () => {
   let injector: ReflectiveInjector;
   let location: MockLocationStrategy;
   let service: LocationService;
   let swUpdates: MockSwUpdatesService;
+  let scrollService: MockScrollService;
 
   beforeEach(() => {
     injector = ReflectiveInjector.resolveAndCreate([
@@ -20,12 +22,14 @@ describe('LocationService', () => {
         { provide: GaService, useClass: TestGaService },
         { provide: LocationStrategy, useClass: MockLocationStrategy },
         { provide: PlatformLocation, useClass: MockPlatformLocation },
-        { provide: SwUpdatesService, useClass: MockSwUpdatesService }
+        { provide: SwUpdatesService, useClass: MockSwUpdatesService },
+        { provide: ScrollService, useClass: MockScrollService }
     ]);
 
     location  = injector.get(LocationStrategy);
     service  = injector.get(LocationService);
     swUpdates  = injector.get(SwUpdatesService);
+    scrollService = injector.get(ScrollService);
   });
 
   describe('currentUrl', () => {
@@ -289,11 +293,14 @@ describe('LocationService', () => {
       expect(goExternalSpy).toHaveBeenCalledWith(externalUrl);
     });
 
-    it('should do a "full page navigation" if a ServiceWorker update has been activated', () => {
+    it('should do a "full page navigation" and remove the stored scroll position when navigating to ' +
+      'internal URLs only if a ServiceWorker update has been activated', () => {
       const goExternalSpy = spyOn(service, 'goExternal');
+      const removeStoredScrollPositionSpy = spyOn(scrollService, 'removeStoredScrollPosition');
 
       // Internal URL - No ServiceWorker update
       service.go('some-internal-url');
+      expect(removeStoredScrollPositionSpy).not.toHaveBeenCalled();
       expect(goExternalSpy).not.toHaveBeenCalled();
       expect(location.path(true)).toEqual('some-internal-url');
 
@@ -301,7 +308,25 @@ describe('LocationService', () => {
       swUpdates.updateActivated.next('foo');
       service.go('other-internal-url');
       expect(goExternalSpy).toHaveBeenCalledWith('other-internal-url');
-      expect(location.path(true)).toEqual('some-internal-url');
+      expect(removeStoredScrollPositionSpy).toHaveBeenCalled();
+    });
+
+    it('should not remove the stored scroll position when navigating to external URLs', () => {
+      const removeStoredScrollPositionSpy = spyOn(scrollService, 'removeStoredScrollPosition');
+      const goExternalSpy = spyOn(service, 'goExternal');
+      const externalUrl = 'http://some/far/away/land';
+      const otherExternalUrl = 'http://some/far/far/away/land';
+
+      // External URL - No ServiceWorker update
+      service.go(externalUrl);
+      expect(removeStoredScrollPositionSpy).not.toHaveBeenCalled();
+      expect(goExternalSpy).toHaveBeenCalledWith(externalUrl);
+
+      // External URL - ServiceWorker update
+      swUpdates.updateActivated.next('foo');
+      service.go(otherExternalUrl);
+      expect(removeStoredScrollPositionSpy).not.toHaveBeenCalled();
+      expect(goExternalSpy).toHaveBeenCalledWith(otherExternalUrl);
     });
 
     it('should not update currentUrl for external url that starts with "http"', () => {
@@ -607,6 +632,10 @@ class MockSwUpdatesService {
   updateActivated = new Subject<string>();
 }
 
+class MockScrollService {
+  removeStoredScrollPosition() { }
+}
+
 class TestGaService {
   locationChanged = jasmine.createSpy('locationChanged');
 }

aio/src/app/shared/location.service.ts

@@ -6,6 +6,7 @@ import { map, tap } from 'rxjs/operators';
 
 import { GaService } from 'app/shared/ga.service';
 import { SwUpdatesService } from 'app/sw-updates/sw-updates.service';
+import { ScrollService } from './scroll.service';
 
 @Injectable()
 export class LocationService {
@@ -25,6 +26,7 @@ export class LocationService {
   constructor(
     private gaService: GaService,
     private location: Location,
+    private scrollService: ScrollService,
     private platformLocation: PlatformLocation,
     swUpdates: SwUpdatesService) {
 
@@ -41,9 +43,13 @@ export class LocationService {
   go(url: string|null|undefined) {
     if (!url) { return; }
     url = this.stripSlashes(url);
-    if (/^http/.test(url) || this.swUpdateActivated) {
+    if (/^http/.test(url)) {
       // Has http protocol so leave the site
-      // (or do a "full page navigation" if a ServiceWorker update has been activated)
+      this.goExternal(url);
+    } else if (this.swUpdateActivated) {
+      // (Do a "full page navigation" if a ServiceWorker update has been activated)
+      // We need to remove stored Position in order to be sure to scroll to the Top position
+      this.scrollService.removeStoredScrollPosition();
       this.goExternal(url);
     } else {
       this.location.go(url);

aio/tests/deployment/shared/URLS_TO_REDIRECT.txt

@@ -22,11 +22,11 @@
 /api/core/testing/index/TestBed-class.html	/api/core/testing/TestBed
 /api/core/testing/inject-function	/api/core/testing/inject
 /api/core/testing/inject-function.html	/api/core/testing/inject
-/api/http/Headers-class	/guide/deprecation#http
-/api/http/Headers-class.html	/guide/deprecation#http
-/api/http/HTTP_PROVIDERS-let	/guide/deprecation#http
-/api/http/testing/index/MockBackend-class	/guide/deprecation#http
-/api/http/testing/index/MockBackend-class.html	/guide/deprecation#http
+/api/http/Headers-class	/guide/deprecations#http
+/api/http/Headers-class.html	/guide/deprecations#http
+/api/http/HTTP_PROVIDERS-let	/guide/deprecations#http
+/api/http/testing/index/MockBackend-class	/guide/deprecations#http
+/api/http/testing/index/MockBackend-class.html	/guide/deprecations#http
 /api/platform-browser-dynamic/testing/index/platformBrowserDynamicTesting-let.html	/api/platform-browser-dynamic/testing/platformBrowserDynamicTesting
 /api/platform-browser/AnimationDriver	/api/animations/browser/AnimationDriver
 /api/router/Route-class	/api/router/Route
@@ -95,15 +95,15 @@
 /docs/js/latest/api/forms/index/FormBuilder-class.html	/api/forms/FormBuilder
 /docs/js/latest/api/forms/index/NG_VALIDATORS-let	/api/forms/NG_VALIDATORS
 /docs/js/latest/api/forms/index/Validator-interface.html	/api/forms/Validator
-/docs/js/latest/api/http/ConnectionBackend-class	/guide/deprecation#http
-/docs/js/latest/api/http/index/Http-class.html	/guide/deprecation#http
-/docs/js/latest/api/http/index/Jsonp-class.html	/guide/deprecation#http
-/docs/js/latest/api/http/index/ResponseOptions-class.html	/guide/deprecation#http
-/docs/js/latest/api/http/index/URLSearchParams-class	/guide/deprecation#http
-/docs/js/latest/api/http/index/XHRConnection-class	/guide/deprecation#http
-/docs/js/latest/api/http/index/XHRConnection-class.html	/guide/deprecation#http
-/docs/js/latest/api/http/testing/index/MockConnection-class.html	/guide/deprecation#http
-/docs/js/latest/api/http/testing/MockBackend-class	/guide/deprecation#http
+/docs/js/latest/api/http/ConnectionBackend-class	/guide/deprecations#http
+/docs/js/latest/api/http/index/Http-class.html	/guide/deprecations#http
+/docs/js/latest/api/http/index/Jsonp-class.html	/guide/deprecations#http
+/docs/js/latest/api/http/index/ResponseOptions-class.html	/guide/deprecations#http
+/docs/js/latest/api/http/index/URLSearchParams-class	/guide/deprecations#http
+/docs/js/latest/api/http/index/XHRConnection-class	/guide/deprecations#http
+/docs/js/latest/api/http/index/XHRConnection-class.html	/guide/deprecations#http
+/docs/js/latest/api/http/testing/index/MockConnection-class.html	/guide/deprecations#http
+/docs/js/latest/api/http/testing/MockBackend-class	/guide/deprecations#http
 /docs/js/latest/api/platform-browser-dynamic/index/platformBrowserDynamic-let.html	/api/platform-browser-dynamic/platformBrowserDynamic
 /docs/js/latest/api/platform-browser-dynamic/testing/index/BrowserDynamicTestingModule-class.html	/api/platform-browser-dynamic/testing/BrowserDynamicTestingModule
 /docs/js/latest/api/platform-browser/animations/index/BrowserAnimationsModule-class	/api/platform-browser/animations/BrowserAnimationsModule
@@ -165,9 +165,9 @@
 /docs/ts/latest/api/core/testing/index/fakeAsync-function.html	/api/core/testing/fakeAsync
 /docs/ts/latest/api/core/testing/index/TestComponentRenderer-class.html	/api/core/testing/TestComponentRenderer
 /docs/ts/latest/api/core/testing/index/tick-function.html	/api/core/testing/tick
-/docs/ts/latest/api/http/Connection-class.html	/guide/deprecation#http
-/docs/ts/latest/api/http/testing/index/MockBackend-class.html	/guide/deprecation#http
-/docs/ts/latest/api/http/testing/index/MockConnection-class.html	/guide/deprecation#http
+/docs/ts/latest/api/http/Connection-class.html	/guide/deprecations#http
+/docs/ts/latest/api/http/testing/index/MockBackend-class.html	/guide/deprecations#http
+/docs/ts/latest/api/http/testing/index/MockConnection-class.html	/guide/deprecations#http
 /docs/ts/latest/api/platform-browser-dynamic/index/workerAppDynamicPlatform-let.html	/api/platform-browser-dynamic/workerAppDynamicPlatform
 /docs/ts/latest/api/testing/fakeAsync-function.html	/api/core/testing/fakeAsync
 /docs/ts/latest/cookbook/ts-to-js.html	https://v2.angular.io/docs/ts/latest/cookbook/ts-to-js.html

aio/tests/e2e/src/app.e2e-spec.ts

@@ -239,7 +239,9 @@ describe('site App', function() {
       /* tslint:disable:max-line-length */
       expect(page.ghLinks.get(0).getAttribute('href'))
         .toMatch(/https:\/\/github\.com\/angular\/angular\/edit\/master\/aio\/content\/guide\/http\.md\?message=docs%3A%20describe%20your%20change\.\.\./);
-    });
+    // TODO(gkalpak): This test often times out with Ivy (because loading `guide/http` takes a lot of time).
+    //                Remove the timeout once the performance issues have been fixed.
+    }, 60000);
 
     it('should not be present on top level pages', () => {
       page.navigateTo('features');

aio/tools/examples/shared/boilerplate/cli/package.json

@@ -24,7 +24,7 @@
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
     "web-animations-js": "^2.3.1",
-    "zone.js": "~0.9.0"
+    "zone.js": "~0.9.1"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.10.0",

aio/tools/examples/shared/boilerplate/cli/tslint.json

@@ -73,7 +73,6 @@
     "no-trailing-whitespace": true,
     "no-unnecessary-initializer": true,
     "no-unused-expression": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
     "one-line": [

aio/tools/examples/shared/boilerplate/i18n/package.json

@@ -27,7 +27,7 @@
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
     "web-animations-js": "^2.3.1",
-    "zone.js": "~0.9.0"
+    "zone.js": "~0.9.1"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.10.0",

aio/tools/examples/shared/boilerplate/service-worker/package.json

@@ -25,7 +25,7 @@
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
     "web-animations-js": "^2.3.1",
-    "zone.js": "~0.9.0"
+    "zone.js": "~0.9.1"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.10.0",

aio/tools/examples/shared/boilerplate/systemjs/tslint.json

@@ -48,7 +48,6 @@
     "no-unused-expression": true,
     "no-unused-variable": true,
     "no-unreachable": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
     "one-line": [

aio/tools/examples/shared/boilerplate/universal/package.json

@@ -32,7 +32,7 @@
     "core-js": "^2.5.4",
     "rxjs": "^6.5.1",
     "web-animations-js": "^2.3.1",
-    "zone.js": "~0.9.0"
+    "zone.js": "~0.9.1"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.10.0",

aio/tools/examples/shared/package.json

@@ -39,7 +39,7 @@
     "rxjs": "^6.5.1",
     "systemjs": "0.19.39",
     "web-animations-js": "^2.3.1",
-    "zone.js": "~0.9.0"
+    "zone.js": "~0.9.1"
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^0.11.0",
@@ -59,7 +59,7 @@
     "@types/node": "~8.9.4",
     "canonical-path": "1.0.0",
     "concurrently": "^3.0.0",
-    "http-server": "^0.9.0",
+    "http-server": "^0.11.1",
     "jasmine-core": "~2.99.1",
     "jasmine-marbles": "^0.4.0",
     "jasmine-spec-reporter": "~4.2.1",

aio/tools/examples/shared/yarn.lock

@@ -1006,10 +1006,6 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.0.tgz#ac3613b1da9bed1b47510bb4651b8931e47146c7"
-
 async@1.5.2, async@1.x, async@^1.4.0, async@^1.5.2:
   version "1.5.2"
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
@@ -2480,14 +2476,15 @@ ecc-jsbn@~0.1.1:
   dependencies:
     jsbn "~0.1.0"
 
-ecstatic@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-1.4.1.tgz#32cb7b6fa2e290d58668674d115e8f0c3d567d6a"
+ecstatic@^3.0.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.1.tgz#b15b5b036c2233defc78d7bacbd8765226c95577"
+  integrity sha512-/rrctvxZ78HMI/tPIsqdvFKHHscxR3IJuKrZI2ZoUgkt2SiufyLFBmcco+aqQBIu6P1qBsUNG3drAAGLx80vTQ==
   dependencies:
-    he "^0.5.0"
-    mime "^1.2.11"
+    he "^1.1.1"
+    mime "^1.6.0"
     minimist "^1.1.0"
-    url-join "^1.0.0"
+    url-join "^2.0.5"
 
 ee-first@1.1.1:
   version "1.1.1"
@@ -3624,9 +3621,10 @@ hawk@~6.0.2:
     hoek "4.x.x"
     sntp "2.x.x"
 
-he@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-0.5.0.tgz#2c05ffaef90b68e860f3fd2b54ef580989277ee2"
+he@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
 hmac-drbg@^1.0.0:
   version "1.0.1"
@@ -3726,17 +3724,18 @@ http-proxy@^1.13.0, http-proxy@^1.16.2, http-proxy@^1.8.1:
     eventemitter3 "1.x.x"
     requires-port "1.x.x"
 
-http-server@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.9.0.tgz#8f1b06bdc733618d4dc42831c7ba1aff4e06001a"
+http-server@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b"
+  integrity sha512-6JeGDGoujJLmhjiRGlt8yK8Z9Kl0vnl/dQoQZlc4oeqaUoAKQg94NILLfrY3oWzSyFaQCVNTcKE5PZ3cH8VP9w==
   dependencies:
     colors "1.0.3"
     corser "~2.0.0"
-    ecstatic "^1.4.0"
+    ecstatic "^3.0.0"
     http-proxy "^1.8.1"
     opener "~1.4.0"
     optimist "0.6.x"
-    portfinder "0.4.x"
+    portfinder "^1.0.13"
     union "~0.4.3"
 
 http-signature@~1.1.0:
@@ -4991,7 +4990,7 @@ mime@1.3.4:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.3.4.tgz#115f9e3b6b3daf2959983cb38f149a2d40eb5d53"
 
-mime@1.4.1, mime@^1.2.11, mime@^1.4.1:
+mime@1.4.1, mime@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
 
@@ -4999,6 +4998,11 @@ mime@1.4.1, mime@^1.2.11, mime@^1.4.1:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.0.3.tgz#4353337854747c48ea498330dc034f9f4bbbcc0b"
 
+mime@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
+
 mime@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369"
@@ -5965,13 +5969,6 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-portfinder@0.4.x:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-0.4.0.tgz#a3ffadffafe4fb98e0601a85eda27c27ce84ca1e"
-  dependencies:
-    async "0.9.0"
-    mkdirp "0.5.x"
-
 portfinder@1.0.17:
   version "1.0.17"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.17.tgz#a8a1691143e46c4735edefcf4fbcccedad26456a"
@@ -5980,6 +5977,15 @@ portfinder@1.0.17:
     debug "^2.2.0"
     mkdirp "0.5.x"
 
+portfinder@^1.0.13:
+  version "1.0.20"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.20.tgz#bea68632e54b2e13ab7b0c4775e9b41bf270e44a"
+  integrity sha512-Yxe4mTyDzTd59PZJY4ojZR8F+E5e97iq2ZOHPz3HDgSvYC5siNad2tLooQ5y5QHyQhc3xVqvyk/eNA3wuoa7Sw==
+  dependencies:
+    async "^1.5.2"
+    debug "^2.2.0"
+    mkdirp "0.5.x"
+
 portfinder@^1.0.9:
   version "1.0.13"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9"
@@ -8071,9 +8077,10 @@ urix@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
 
-url-join@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78"
+url-join@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
+  integrity sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=
 
 url-parse@^1.4.3:
   version "1.4.4"
@@ -8638,7 +8645,7 @@ yn@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/yn/-/yn-2.0.0.tgz#e5adabc8acf408f6385fc76495684c88e6af689a"
 
-zone.js@~0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.0.tgz#f42319d657f7616724ed40c5907d4614b4c683fa"
-  integrity sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q==
+zone.js@~0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
+  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==

aio/tools/transforms/angular-api-package/index.js

@@ -9,197 +9,209 @@ const Package = require('dgeni').Package;
 
 const basePackage = require('../angular-base-package');
 const typeScriptPackage = require('dgeni-packages/typescript');
-const { API_SOURCE_PATH, API_TEMPLATES_PATH, requireFolder } = require('../config');
+const {API_SOURCE_PATH, API_TEMPLATES_PATH, requireFolder} = require('../config');
 
-module.exports = new Package('angular-api', [basePackage, typeScriptPackage])
+module.exports =
+    new Package('angular-api', [basePackage, typeScriptPackage])
 
-  // Register the processors
-  .processor(require('./processors/splitDescription'))
-  .processor(require('./processors/convertPrivateClassesToInterfaces'))
-  .processor(require('./processors/generateApiListDoc'))
-  .processor(require('./processors/addNotYetDocumentedProperty'))
-  .processor(require('./processors/mergeDecoratorDocs'))
-  .processor(require('./processors/extractDecoratedClasses'))
-  .processor(require('./processors/extractPipeParams'))
-  .processor(require('./processors/matchUpDirectiveDecorators'))
-  .processor(require('./processors/addMetadataAliases'))
-  .processor(require('./processors/computeApiBreadCrumbs'))
-  .processor(require('./processors/filterContainedDocs'))
-  .processor(require('./processors/processClassLikeMembers'))
-  .processor(require('./processors/markBarredODocsAsPrivate'))
-  .processor(require('./processors/filterPrivateDocs'))
-  .processor(require('./processors/computeSearchTitle'))
-  .processor(require('./processors/simplifyMemberAnchors'))
-  .processor(require('./processors/computeStability'))
-  .processor(require('./processors/removeInjectableConstructors'))
-  .processor(require('./processors/collectPackageContentDocs'))
-  .processor(require('./processors/processPackages'))
-  .processor(require('./processors/processNgModuleDocs'))
-  .processor(require('./processors/fixupRealProjectRelativePath'))
-  .processor(require('./processors/processAliasDocs'))
+        // Register the processors
+        .processor(require('./processors/splitDescription'))
+        .processor(require('./processors/convertPrivateClassesToInterfaces'))
+        .processor(require('./processors/generateApiListDoc'))
+        .processor(require('./processors/addNotYetDocumentedProperty'))
+        .processor(require('./processors/mergeDecoratorDocs'))
+        .processor(require('./processors/extractDecoratedClasses'))
+        .processor(require('./processors/extractPipeParams'))
+        .processor(require('./processors/matchUpDirectiveDecorators'))
+        .processor(require('./processors/addMetadataAliases'))
+        .processor(require('./processors/computeApiBreadCrumbs'))
+        .processor(require('./processors/filterContainedDocs'))
+        .processor(require('./processors/processClassLikeMembers'))
+        .processor(require('./processors/markBarredODocsAsPrivate'))
+        .processor(require('./processors/filterPrivateDocs'))
+        .processor(require('./processors/computeSearchTitle'))
+        .processor(require('./processors/simplifyMemberAnchors'))
+        .processor(require('./processors/computeStability'))
+        .processor(require('./processors/removeInjectableConstructors'))
+        .processor(require('./processors/collectPackageContentDocs'))
+        .processor(require('./processors/processPackages'))
+        .processor(require('./processors/processNgModuleDocs'))
+        .processor(require('./processors/fixupRealProjectRelativePath'))
+        .processor(require('./processors/processAliasDocs'))
 
 
-  /**
-   * These are the API doc types that will be rendered to actual files.
-   * This is a super set of the exported docs, since we convert some classes to
-   * more Angular specific API types, such as decorators and directives.
-   */
-  .factory(function API_DOC_TYPES_TO_RENDER(EXPORT_DOC_TYPES) {
-    return EXPORT_DOC_TYPES.concat(['decorator', 'directive', 'ngmodule', 'pipe', 'package']);
-  })
+        /**
+         * These are the API doc types that will be rendered to actual files.
+         * This is a super set of the exported docs, since we convert some classes to
+         * more Angular specific API types, such as decorators and directives.
+         */
+        .factory(function API_DOC_TYPES_TO_RENDER(EXPORT_DOC_TYPES) {
+          return EXPORT_DOC_TYPES.concat(['decorator', 'directive', 'ngmodule', 'pipe', 'package']);
+        })
 
-  /**
-   * These are the doc types that are contained within other docs
-   */
-  .factory(function API_CONTAINED_DOC_TYPES() {
-    return ['member', 'function-overload', 'get-accessor-info', 'set-accessor-info', 'parameter'];
-  })
+        /**
+         * These are the doc types that are contained within other docs
+         */
+        .factory(function API_CONTAINED_DOC_TYPES() {
+          return [
+            'member', 'function-overload', 'get-accessor-info', 'set-accessor-info', 'parameter'
+          ];
+        })
 
-  /**
-   * These are the doc types that are API docs, including ones that will be merged into container docs,
-   * such as members and overloads.
-   */
-  .factory(function API_DOC_TYPES(API_DOC_TYPES_TO_RENDER, API_CONTAINED_DOC_TYPES) {
-    return API_DOC_TYPES_TO_RENDER.concat(API_CONTAINED_DOC_TYPES);
-  })
+        /**
+         * These are the doc types that are API docs, including ones that will be merged into
+         * container docs,
+         * such as members and overloads.
+         */
+        .factory(function API_DOC_TYPES(API_DOC_TYPES_TO_RENDER, API_CONTAINED_DOC_TYPES) {
+          return API_DOC_TYPES_TO_RENDER.concat(API_CONTAINED_DOC_TYPES);
+        })
 
-  .factory(require('./readers/package-content'))
+        .factory(require('./readers/package-content'))
 
-  // Where do we get the source files?
-  .config(function(readTypeScriptModules, readFilesProcessor, collectExamples, tsParser, packageContentFileReader) {
+        // Where do we get the source files?
+        .config(function(
+            readTypeScriptModules, readFilesProcessor, collectExamples, tsParser,
+            packageContentFileReader) {
 
-    // Tell TypeScript how to load modules that start with with `@angular`
-    tsParser.options.paths = { '@angular/*': [API_SOURCE_PATH + '/*'] };
-    tsParser.options.baseUrl = '.';
+          // Tell TypeScript how to load modules that start with with `@angular`
+          tsParser.options.paths = {'@angular/*': [API_SOURCE_PATH + '/*']};
+          tsParser.options.baseUrl = '.';
 
-    // API files are typescript
-    readTypeScriptModules.basePath = API_SOURCE_PATH;
-    readTypeScriptModules.ignoreExportsMatching = [/^_|^ɵɵ|^VERSION$/];
-    readTypeScriptModules.hidePrivateMembers = true;
+          // API files are typescript
+          readTypeScriptModules.basePath = API_SOURCE_PATH;
+          readTypeScriptModules.ignoreExportsMatching = [/^_|^ɵɵ|^Δ|^VERSION$/];
+          readTypeScriptModules.hidePrivateMembers = true;
 
-    // NOTE: This list should be in sync with tools/public_api_guard/BUILD.bazel
-    readTypeScriptModules.sourceFiles = [
-      'animations/index.ts',
-      'animations/browser/index.ts',
-      'animations/browser/testing/index.ts',
-      'common/http/index.ts',
-      'common/http/testing/index.ts',
-      'common/index.ts',
-      'common/testing/index.ts',
-      'core/index.ts',
-      'core/testing/index.ts',
-      'elements/index.ts',
-      'forms/index.ts',
-      // Current plan for Angular v8 is to hide documentation for the @angular/http package
-      // 'http/index.ts',
-      // 'http/testing/index.ts',
-      'platform-browser/index.ts',
-      'platform-browser/animations/index.ts',
-      'platform-browser/testing/index.ts',
-      'platform-browser-dynamic/index.ts',
-      'platform-browser-dynamic/testing/index.ts',
-      'platform-server/index.ts',
-      'platform-server/testing/index.ts',
-      'platform-webworker/index.ts',
-      'platform-webworker-dynamic/index.ts',
-      'router/index.ts',
-      'router/testing/index.ts',
-      'router/upgrade/index.ts',
-      'service-worker/index.ts',
-      'upgrade/index.ts',
-      'upgrade/static/index.ts',
-    ];
+          // NOTE: This list should be in sync with tools/public_api_guard/BUILD.bazel
+          readTypeScriptModules.sourceFiles = [
+            'animations/index.ts',
+            'animations/browser/index.ts',
+            'animations/browser/testing/index.ts',
+            'common/http/index.ts',
+            'common/http/testing/index.ts',
+            'common/index.ts',
+            'common/testing/index.ts',
+            'core/index.ts',
+            'core/testing/index.ts',
+            'elements/index.ts',
+            'forms/index.ts',
+            // Current plan for Angular v8 is to hide documentation for the @angular/http package
+            // 'http/index.ts',
+            // 'http/testing/index.ts',
+            'platform-browser/index.ts',
+            'platform-browser/animations/index.ts',
+            'platform-browser/testing/index.ts',
+            'platform-browser-dynamic/index.ts',
+            'platform-browser-dynamic/testing/index.ts',
+            'platform-server/index.ts',
+            'platform-server/testing/index.ts',
+            'platform-webworker/index.ts',
+            'platform-webworker-dynamic/index.ts',
+            'router/index.ts',
+            'router/testing/index.ts',
+            'router/upgrade/index.ts',
+            'service-worker/index.ts',
+            'upgrade/index.ts',
+            'upgrade/static/index.ts',
+          ];
 
-    readFilesProcessor.fileReaders.push(packageContentFileReader);
+          readFilesProcessor.fileReaders.push(packageContentFileReader);
 
-    // API Examples
-    readFilesProcessor.sourceFiles = [
-      {
-        basePath: API_SOURCE_PATH,
-        include: API_SOURCE_PATH + '/examples/**/*',
-        fileReader: 'exampleFileReader'
-      },
-      {
-        basePath: API_SOURCE_PATH,
-        include: API_SOURCE_PATH + '/**/PACKAGE.md',
-        fileReader: 'packageContentFileReader'
-      }
-    ];
-    collectExamples.exampleFolders.push('examples');
-  })
+          // API Examples
+          readFilesProcessor.sourceFiles = [
+            {
+              basePath: API_SOURCE_PATH,
+              include: API_SOURCE_PATH + '/examples/**/*',
+              fileReader: 'exampleFileReader'
+            },
+            {
+              basePath: API_SOURCE_PATH,
+              include: API_SOURCE_PATH + '/**/PACKAGE.md',
+              fileReader: 'packageContentFileReader'
+            }
+          ];
+          collectExamples.exampleFolders.push('examples');
+        })
 
-  // Configure jsdoc-style tag parsing
-  .config(function(parseTagsProcessor, getInjectables, tsHost) {
-    // Load up all the tag definitions in the tag-defs folder
-    parseTagsProcessor.tagDefinitions =
-        parseTagsProcessor.tagDefinitions.concat(getInjectables(requireFolder(__dirname, './tag-defs')));
-    // We don't want license headers to be joined to the first API item's comment
-    tsHost.concatMultipleLeadingComments = false;
-  })
+        // Configure jsdoc-style tag parsing
+        .config(function(parseTagsProcessor, getInjectables, tsHost) {
+          // Load up all the tag definitions in the tag-defs folder
+          parseTagsProcessor.tagDefinitions = parseTagsProcessor.tagDefinitions.concat(
+              getInjectables(requireFolder(__dirname, './tag-defs')));
+          // We don't want license headers to be joined to the first API item's comment
+          tsHost.concatMultipleLeadingComments = false;
+        })
 
-  .config(function(computeStability, splitDescription, addNotYetDocumentedProperty, API_DOC_TYPES_TO_RENDER, API_DOC_TYPES) {
-    computeStability.docTypes = API_DOC_TYPES_TO_RENDER;
-    // Only split the description on the API docs
-    splitDescription.docTypes = API_DOC_TYPES.concat(['package-content']);
-    addNotYetDocumentedProperty.docTypes = API_DOC_TYPES;
-  })
+        .config(function(
+            computeStability, splitDescription, addNotYetDocumentedProperty,
+            API_DOC_TYPES_TO_RENDER, API_DOC_TYPES) {
+          computeStability.docTypes = API_DOC_TYPES_TO_RENDER;
+          // Only split the description on the API docs
+          splitDescription.docTypes = API_DOC_TYPES.concat(['package-content']);
+          addNotYetDocumentedProperty.docTypes = API_DOC_TYPES;
+        })
 
-  .config(function(mergeDecoratorDocs) {
-    mergeDecoratorDocs.propertiesToMerge = [
-      'shortDescription',
-      'description',
-      'security',
-      'deprecated',
-      'see',
-      'usageNotes',
-    ];
-  })
+        .config(function(mergeDecoratorDocs) {
+          mergeDecoratorDocs.propertiesToMerge = [
+            'shortDescription',
+            'description',
+            'security',
+            'deprecated',
+            'see',
+            'usageNotes',
+          ];
+        })
 
-  .config(function(checkContentRules, API_DOC_TYPES, API_CONTAINED_DOC_TYPES) {
-    addMinLengthRules(checkContentRules);
-    addHeadingRules(checkContentRules, API_DOC_TYPES);
-    addAllowedPropertiesRules(checkContentRules, API_CONTAINED_DOC_TYPES);
-    checkContentRules.failOnContentErrors = true;
-  })
+        .config(function(checkContentRules, API_DOC_TYPES, API_CONTAINED_DOC_TYPES) {
+          addMinLengthRules(checkContentRules);
+          addHeadingRules(checkContentRules, API_DOC_TYPES);
+          addAllowedPropertiesRules(checkContentRules, API_CONTAINED_DOC_TYPES);
+          checkContentRules.failOnContentErrors = true;
+        })
 
-  .config(function(filterContainedDocs, API_CONTAINED_DOC_TYPES) {
-    filterContainedDocs.docTypes = API_CONTAINED_DOC_TYPES;
-  })
+        .config(function(filterContainedDocs, API_CONTAINED_DOC_TYPES) {
+          filterContainedDocs.docTypes = API_CONTAINED_DOC_TYPES;
+        })
 
 
-  .config(function(computePathsProcessor, EXPORT_DOC_TYPES, generateApiListDoc) {
+        .config(function(computePathsProcessor, EXPORT_DOC_TYPES, generateApiListDoc) {
 
-    const API_SEGMENT = 'api';
+          const API_SEGMENT = 'api';
 
-    generateApiListDoc.outputFolder = API_SEGMENT;
+          generateApiListDoc.outputFolder = API_SEGMENT;
 
-    computePathsProcessor.pathTemplates.push({
-      docTypes: ['package'],
-      getPath: function computeModulePath(doc) {
-        doc.moduleFolder = `${API_SEGMENT}/${doc.id.replace(/\/index$/, '')}`;
-        return doc.moduleFolder;
-      },
-      outputPathTemplate: '${moduleFolder}.json'
-    });
-    computePathsProcessor.pathTemplates.push({
-      docTypes: EXPORT_DOC_TYPES.concat(['decorator', 'directive', 'ngmodule', 'pipe']),
-      pathTemplate: '${moduleDoc.moduleFolder}/${name}',
-      outputPathTemplate: '${moduleDoc.moduleFolder}/${name}.json',
-    });
-  })
+          computePathsProcessor.pathTemplates.push({
+            docTypes: ['package'],
+            getPath: function computeModulePath(doc) {
+              doc.moduleFolder = `${API_SEGMENT}/${doc.id.replace(/\/index$/, '')}`;
+              return doc.moduleFolder;
+            },
+            outputPathTemplate: '${moduleFolder}.json'
+          });
+          computePathsProcessor.pathTemplates.push({
+            docTypes: EXPORT_DOC_TYPES.concat(['decorator', 'directive', 'ngmodule', 'pipe']),
+            pathTemplate: '${moduleDoc.moduleFolder}/${name}',
+            outputPathTemplate: '${moduleDoc.moduleFolder}/${name}.json',
+          });
+        })
 
-  .config(function(templateFinder) {
-    // Where to find the templates for the API doc rendering
-    templateFinder.templateFolders.unshift(API_TEMPLATES_PATH);
-  })
+        .config(function(templateFinder) {
+          // Where to find the templates for the API doc rendering
+          templateFinder.templateFolders.unshift(API_TEMPLATES_PATH);
+        })
 
 
-  .config(function(convertToJsonProcessor, postProcessHtml, API_DOC_TYPES_TO_RENDER, API_DOC_TYPES, autoLinkCode) {
-    convertToJsonProcessor.docTypes = convertToJsonProcessor.docTypes.concat(API_DOC_TYPES_TO_RENDER);
-    postProcessHtml.docTypes = convertToJsonProcessor.docTypes.concat(API_DOC_TYPES_TO_RENDER);
-    autoLinkCode.docTypes = API_DOC_TYPES;
-    autoLinkCode.codeElements = ['code', 'code-example', 'code-pane'];
-  });
+        .config(function(
+            convertToJsonProcessor, postProcessHtml, API_DOC_TYPES_TO_RENDER, API_DOC_TYPES,
+            autoLinkCode) {
+          convertToJsonProcessor.docTypes =
+              convertToJsonProcessor.docTypes.concat(API_DOC_TYPES_TO_RENDER);
+          postProcessHtml.docTypes =
+              convertToJsonProcessor.docTypes.concat(API_DOC_TYPES_TO_RENDER);
+          autoLinkCode.docTypes = API_DOC_TYPES;
+          autoLinkCode.codeElements = ['code', 'code-example', 'code-pane'];
+        });
 
 
 function addMinLengthRules(checkContentRules) {

aio/tools/transforms/cli-docs-package/processors/filterHiddenCommands.js

@@ -1,7 +1,7 @@
 module.exports = function filterHiddenCommands() {
   return {
     $runAfter: ['files-read'],
-    $runBefore: ['processCliContainerDoc'],
+    $runBefore: ['processCliContainerDoc', 'createSitemap'],
     $process(docs) {
       return docs.filter(doc => doc.docType !== 'cli-command' || doc.hidden !== true);
     }

aio/tools/transforms/cli-docs-package/processors/filterHiddenCommands.spec.js

@@ -18,7 +18,7 @@ describe('filterHiddenCommands processor', () => {
 
   it('should run before the correct processor', () => {
     const processor = processorFactory();
-    expect(processor.$runBefore).toEqual(['processCliContainerDoc']);
+    expect(processor.$runBefore).toEqual(['processCliContainerDoc', 'createSitemap']);
   });
 
   it('should remove CLI command docs that are hidden', () => {

aio/tools/tslint.json

@@ -41,7 +41,6 @@
       "no-switch-case-fall-through": true,
       "no-trailing-whitespace": true,
       "no-unused-expression": true,
-      "no-use-before-declare": true,
       "no-var-keyword": true,
       "object-literal-sort-keys": false,
       "one-line": [

aio/yarn.lock

@@ -2,24 +2,24 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/architect@0.800.0-beta.18":
-  version "0.800.0-beta.18"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.0-beta.18.tgz#fdf23d3854d4ca62b2e201efd2b267f800eba8d8"
-  integrity sha512-No7RpK98O+S1zSC0omO66yBKqUnM2Vt1l4tXDC43BGSMijL5JN/uSHpMSObUpmmMC1qxCeN5OXRU7QhZW+DxqA==
+"@angular-devkit/architect@0.800.0-rc.2":
+  version "0.800.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.800.0-rc.2.tgz#4096016fa6df93acbf02be648554631939aa87c0"
+  integrity sha512-JU/x3UvUW+uVuF0tNkVTRtAvGfbKDXLFI3lm7i40qmts5z1zeQlPjrz+DRTe7msevoVu7DMQTJ7vlbyHUjZOFw==
   dependencies:
-    "@angular-devkit/core" "8.0.0-beta.18"
+    "@angular-devkit/core" "8.0.0-rc.2"
     rxjs "6.4.0"
 
-"@angular-devkit/build-angular@0.800.0-beta.18":
-  version "0.800.0-beta.18"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.0-beta.18.tgz#3ce37929cb9462fc43f532b1186c8a0e3005fcb1"
-  integrity sha512-bEzgBI8kWpdapKU0xMONHYtzfCDMZVwfwetTK9nRCk2c4CEa0k6I9r6UTgPpqGU1pf2wHgrSd+QdpwbOORNufw==
+"@angular-devkit/build-angular@0.800.0-rc.2":
+  version "0.800.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.800.0-rc.2.tgz#df78a27a58813bc442629f8500e1f3d4fd72c519"
+  integrity sha512-E6P3CO4IUEyCezrBuNwMZ+H/Rg+0R/FH3/TyWiivY5D3bLGvRFJbQE5ZQkVWbd1i1woxvHdqkjgco9hpOko2XQ==
   dependencies:
-    "@angular-devkit/architect" "0.800.0-beta.18"
-    "@angular-devkit/build-optimizer" "0.800.0-beta.18"
-    "@angular-devkit/build-webpack" "0.800.0-beta.18"
-    "@angular-devkit/core" "8.0.0-beta.18"
-    "@ngtools/webpack" "8.0.0-beta.18"
+    "@angular-devkit/architect" "0.800.0-rc.2"
+    "@angular-devkit/build-optimizer" "0.800.0-rc.2"
+    "@angular-devkit/build-webpack" "0.800.0-rc.2"
+    "@angular-devkit/core" "8.0.0-rc.2"
+    "@ngtools/webpack" "8.0.0-rc.2"
     ajv "6.10.0"
     autoprefixer "9.5.1"
     browserslist "4.5.5"
@@ -38,7 +38,7 @@
     loader-utils "1.2.3"
     mini-css-extract-plugin "0.6.0"
     minimatch "3.0.4"
-    open "6.1.0"
+    open "6.2.0"
     parse5 "4.0.0"
     postcss "7.0.14"
     postcss-import "12.0.1"
@@ -65,30 +65,30 @@
     webpack-subresource-integrity "1.1.0-rc.6"
     worker-plugin "3.1.0"
 
-"@angular-devkit/build-optimizer@0.800.0-beta.18":
-  version "0.800.0-beta.18"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.0-beta.18.tgz#4e8e8ae1c2e14146633217605315b51e3f9eeee6"
-  integrity sha512-x5oh7GUjYLvrOvh4uNM6aDtNFv7hafo9ru11ee7sgXwHIYdcVmp6ew19Sjj3nAr0Sh1rAUf7QoNZVO/txxnBRA==
+"@angular-devkit/build-optimizer@0.800.0-rc.2":
+  version "0.800.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.800.0-rc.2.tgz#d56cdc127699ad25eb817caf97336d239600f5cb"
+  integrity sha512-YKTFlAfD4JZk1h4lZDA4HVPPIq1JB5Dxg/Icn2GvcuUws6wVcXUflMTIpBgIMF2j07fMIYPqSAcSBd+UsBJBvA==
   dependencies:
     loader-utils "1.2.3"
     source-map "0.5.6"
     typescript "3.4.4"
     webpack-sources "1.3.0"
 
-"@angular-devkit/build-webpack@0.800.0-beta.18":
-  version "0.800.0-beta.18"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.0-beta.18.tgz#f343d759bdd09a907c77fc6a0515416c30291e88"
-  integrity sha512-pSPyW1D7yEZXxCRb42qXmwEO8vHLeDgbRUXiTtMh0Yf86Zb5Ku7xH+pK7suOhJXEZKv2UWBfQXWWP9SrBX/4rg==
+"@angular-devkit/build-webpack@0.800.0-rc.2":
+  version "0.800.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.800.0-rc.2.tgz#c08218f54381157744a3166c0d94b1db180ba063"
+  integrity sha512-t+/5WqgcsvgPIFGE48I+UWJPDpkQ6E+dKH6RuXec94VBJEv1pC9FJdoi6s/CqEzzPiZsWxJzrWI4dpPAn1eWuA==
   dependencies:
-    "@angular-devkit/architect" "0.800.0-beta.18"
-    "@angular-devkit/core" "8.0.0-beta.18"
+    "@angular-devkit/architect" "0.800.0-rc.2"
+    "@angular-devkit/core" "8.0.0-rc.2"
     rxjs "6.4.0"
     webpack-merge "4.2.1"
 
-"@angular-devkit/core@8.0.0-beta.18":
-  version "8.0.0-beta.18"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.0-beta.18.tgz#dfaa0786af0a7466467b8a9cd1fe745418690df0"
-  integrity sha512-+kQd0m6HgGTn7JM9GWzrJgjI/PPOa0K+t+a6YZS4n/MdZSzhId556Df5/UnrgsBghSDjyVwu7+owijvNwQlj2w==
+"@angular-devkit/core@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-8.0.0-rc.2.tgz#e596a44da215713cdef5405f1477e70626e5d68c"
+  integrity sha512-hfkQ1QaA0ZIquTNQYJiK0OhdSzdxWY1SJr20JwSBHezAvhN4sJHRBRN9RxGLWdL1d4Z4rUB4KEIvx0cMMk6Ueg==
   dependencies:
     ajv "6.10.0"
     fast-json-stable-stringify "2.0.0"
@@ -96,63 +96,63 @@
     rxjs "6.4.0"
     source-map "0.7.3"
 
-"@angular-devkit/schematics@8.0.0-beta.18":
-  version "8.0.0-beta.18"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.0-beta.18.tgz#97dece6eaddd331516a94da985f33add21b76f5c"
-  integrity sha512-F2pkiNe/rMOdcnKm/4s/lvM/8guwtrj5nEk0klyesDZLaZt94XEtasq0XrBxHju+7PmM6IwaDA6o5qsQ/6IAKg==
+"@angular-devkit/schematics@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-8.0.0-rc.2.tgz#f4490b1277cdba9622227b178128c76f54e7eca1"
+  integrity sha512-VuXCRE/PmQWMHaaBbbOq7f2M6/DeKnYUyqG2xpBJaSP+rX7j08gd6RGzkn6V81C6jxt0Q3WkXnQfj5ZQuFnF5w==
   dependencies:
-    "@angular-devkit/core" "8.0.0-beta.18"
+    "@angular-devkit/core" "8.0.0-rc.2"
     rxjs "6.4.0"
 
-"@angular/animations@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-beta.14.tgz#50259f6f3c97101183216e8311b8c0875c4356c3"
-  integrity sha512-ihYHQXEbjzemjJxJV4p2XAWOD9H4r8HpfNekxxelgj2RyZhrMQStzL+PEKxHHlGn167HuZz5YEoW4MXGflTtsA==
+"@angular/animations@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-8.0.0-rc.2.tgz#aef2683aba35498fe26253bf8f461a1658864e49"
+  integrity sha512-XTT7Eif6Km6MSbLr6qlCmx8vjRgx/Hp5Hv1WnnPtRFt8XeidYGGYIq2si3CxQ2xBjEO3OpNbPqtYvZKH1yuBdA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cdk@8.0.0-beta.2":
-  version "8.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.0.0-beta.2.tgz#27544be4a99b0d56bdbf9f206b2f8e290de82f61"
-  integrity sha512-/ze014/AGp9nAI6kK7w6TQnz533PRvjJOpEULaBclNRHSNGZElncOGPfnD6V/Zr/CKY5zFbwLHQEqVUP4ObTwg==
+"@angular/cdk@8.0.0-rc.0":
+  version "8.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-8.0.0-rc.0.tgz#64731574ddcf6912b079e03efab95464ce17acee"
+  integrity sha512-fa0AFR/v4t4rVFUwqpfRnzRhzyoReYcssjR6fQ4WMMxbhRHNZSJaPxvnykMOZsh7oQy0d6Dy4kENO6nXZptR9g==
   dependencies:
     tslib "^1.7.1"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/cli@8.0.0-beta.18":
-  version "8.0.0-beta.18"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.0-beta.18.tgz#454a3d230c280fea7ec02c97eae8bd56a9a17dd9"
-  integrity sha512-uNuTCN75w9m2uLq3Vk2e+FfiSa19AHeGOrrwtLdPJLr5GU1Jum2wl9Mn9W4eyiSSiZNKN+IWWa6wkLV0/SybQw==
+"@angular/cli@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-8.0.0-rc.2.tgz#fda3c42c3682a53168be67c0624db04144c0aa9c"
+  integrity sha512-Aj5JJKa6JxNU3U9InvveIhU8gg6ZA1UvvKHHzX87FsUQhHzm7XIfwC5JrYGDE4c9ErIE40J3we7Hcsv2AjzkTw==
   dependencies:
-    "@angular-devkit/architect" "0.800.0-beta.18"
-    "@angular-devkit/core" "8.0.0-beta.18"
-    "@angular-devkit/schematics" "8.0.0-beta.18"
-    "@schematics/angular" "8.0.0-beta.18"
-    "@schematics/update" "0.800.0-beta.18"
+    "@angular-devkit/architect" "0.800.0-rc.2"
+    "@angular-devkit/core" "8.0.0-rc.2"
+    "@angular-devkit/schematics" "8.0.0-rc.2"
+    "@schematics/angular" "8.0.0-rc.2"
+    "@schematics/update" "0.800.0-rc.2"
     "@yarnpkg/lockfile" "1.1.0"
     debug "^4.1.1"
     ini "1.3.5"
     inquirer "6.3.1"
     npm-package-arg "6.1.0"
-    open "6.1.0"
+    open "6.2.0"
     pacote "9.5.0"
     semver "6.0.0"
     symbol-observable "1.2.0"
     universal-analytics "^0.4.20"
     uuid "^3.3.2"
 
-"@angular/common@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-beta.14.tgz#a27efe0b3e38e38f0e481a2a3f8cad026823b39d"
-  integrity sha512-4mBGXb+VyakX+YqAAfDsYrlKmjDcyD0BjmWi1u7aTJgf5QmEvFD4QLXzHoWEsmBFnTgoFHXMtXogF04GXy3kuA==
+"@angular/common@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-8.0.0-rc.2.tgz#77b2da22cb11bf2039799d56ec2fb7c4f51a1374"
+  integrity sha512-/MUZhebMAkAwV8jkimBONN2eOQ2/5qO54ZvPypyy2tEHk69JRNLFjREaR+VU8yGlS/1MU6jTYxyfRW2c8ggLzA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-beta.14.tgz#61aa5947d3427afd0043fdba079a8cc616d29201"
-  integrity sha512-Q+B9bUDqVOT3OZdUsOFJeQWSmVKUdUoaU5ptq6UQFALCa/0skQrcL/KOFpej3fk3ZRVTkQ+vWQ1nMzv+tm8Byw==
+"@angular/compiler-cli@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-8.0.0-rc.2.tgz#a3ef74f3e4ea448ccf1387c18c32fc664b67b2e1"
+  integrity sha512-lLhedaTQ08/i4aysCPpTYbAP0/8T5/EHE79FByp/7XxqRuQxcXkFJujQT1Q/KReKa0gA9JEYD4I1eBJpNYyMLQ==
   dependencies:
     canonical-path "1.0.0"
     chokidar "^2.1.1"
@@ -164,73 +164,73 @@
     shelljs "^0.8.1"
     source-map "^0.6.1"
     tslib "^1.9.0"
-    yargs "9.0.1"
+    yargs "13.1.0"
 
-"@angular/compiler@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-beta.14.tgz#dc01066a060ea9fbd9696a015f481279aa23c2b0"
-  integrity sha512-Copy2bMf8EL9WcHwz1rHeMY6CqWhOZmvGRBSVwI149awbTxc31h3+01TG2I5FlgIm+vc70PUldp7EumqFiCCDA==
+"@angular/compiler@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-8.0.0-rc.2.tgz#8395c20d2d7e93c6941a45b039e03ae7a6277797"
+  integrity sha512-/NR0EN6wjit2mfgOhWirOjKp+s7lO1QSKhzK3TjYCda1L7Pijo29s3BGMWUSPCRno8zNH5o7Q0mWCC55MBGB4w==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-beta.14.tgz#d3e75291ac390a1a29bf037bfd292586a90aea8b"
-  integrity sha512-7gltt13BTUFgGHpOBUmvxr/PUcqY8n6177NpYgEJRBFLZl2FtErG+7BfYBCt23StAi+K6ZafP+IX2m1evOtX8g==
+"@angular/core@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-8.0.0-rc.2.tgz#800fd49bbc176f7ee064375b726503c5e6c8387c"
+  integrity sha512-ImXzoQk8U3IiL75dJWnO/aIGfaExgiqDc6GJYgQ8PvB7ZUkdUOj/a+jd6asMvE52VZJkof5XShhdonTScPcdUA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/elements@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-8.0.0-beta.14.tgz#951a9c79c475a26a86bc83c7e21769863b6611f0"
-  integrity sha512-oY6hv7cN0zOElABrO7lEiz+/xVPF5+97r/RA/x2vIVWyei7J7VIWQxAvHX+osrndIwAgXtBlyx0U0EXfp+BshA==
+"@angular/elements@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/elements/-/elements-8.0.0-rc.2.tgz#84ca2aadff66bfcd3c8042492a0c6b87a6a749fa"
+  integrity sha512-7KVPDSGXo33WD+ZQHjmvSXyBa6az6MHIQo3I+wRKUB9pBZNqMa2Dcb7FQp7fq3tQTEpOW6fO52ozxAZ/ybozxA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0-beta.14.tgz#db0958d9f1bd8d22aef1605c66704d9247837f31"
-  integrity sha512-40GN2X+ycaUyq1/VX8jQcQqnuDojp2A7OBtfGguTsz2viKlIFY89GvErqPzGcbUwoKE2e00pNDEK2NWwLqLmpg==
+"@angular/forms@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-8.0.0-rc.2.tgz#f4db4653470b74cd55508aa83da761309a1d341d"
+  integrity sha512-rjjGNVaxwOayuZCpsG8V13RK/h7S6v5ItzG6Ai1agO/em4/riNhEP3+BvxM4Rs1v4AfGOd+LhOeLt5qptj0JKA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/language-service@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.0-beta.14.tgz#cf293951d518889cdaedc433306d0699d078a364"
-  integrity sha512-FNPYEDEUlgF7dejL6spCtLs/7+nMq7mAAMvtI1hPDldAhLMkfygrGlxtDrREG+6ekYDBJVpHy7Sik/e9Hn/Szw==
+"@angular/language-service@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-8.0.0-rc.2.tgz#5b8fd13b7cd9e7cc1c097f92749f05e72b1c7e47"
+  integrity sha512-PXsntGd053iiM9lJPo7jmjhd5dp6AxugEC4WDTXimZ3vK2Hzv53CnKuVTUGcTWjwazbKAEyG0jiUl4VXptwTAA==
 
-"@angular/material@8.0.0-beta.2":
-  version "8.0.0-beta.2"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.0.0-beta.2.tgz#91abce0ef64b655ecec4ff3895ab02c485906071"
-  integrity sha512-3816IV/IVg1juj6jlEbXmWepl97JsLwVO0aHRGpTg8FAdilK5w36eUiXCqKecvDnNAHpwDFavAwrAlToxUQBvw==
+"@angular/material@8.0.0-rc.0":
+  version "8.0.0-rc.0"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-8.0.0-rc.0.tgz#c5170f9617abba3176e991a1e197e1efa0bff95a"
+  integrity sha512-8J+oPHxcoDJnZUE+j5eYDR5FS/zN7RHljK2FtjiG2wsGGRiomnMLQBoFCQL55P1sgqWz3l4vKgi5GuwA65pADQ==
   dependencies:
     tslib "^1.7.1"
 
-"@angular/platform-browser-dynamic@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-beta.14.tgz#ef2463033f7383500aaa55627fbd487c5c377033"
-  integrity sha512-NWcOey/bzstnbVzNvBpryEAamWNAQobUkP4i3mSnKvWAyhs1GO7IPOsTwzOOPVvQBTOq0GFdYJjDoB4DIo3/ZA==
+"@angular/platform-browser-dynamic@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-8.0.0-rc.2.tgz#86e8e227f19aa9c6ef4439623ce6cf7f2b0cd3b1"
+  integrity sha512-c4QXgAikQx25AOnNiQUOe/yNJunR95rfTJ5yApcNU76eeCMG9KLFNGGQTg+PmcxZ6UMcw9zp2Tck9vjSb2BZYg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-beta.14.tgz#9023453d850243fbc7c6452c26e100fd1d505617"
-  integrity sha512-nOo8wZU1PToNgb1BdKVWVmJqX4l30YWOzMCJ1S41LMImf0k+PXgKYUCQ5OzFBJNTH0x8JvANTvsBiqJyNN+QkQ==
+"@angular/platform-browser@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-8.0.0-rc.2.tgz#b40fa05fd32422be499ab3986bc3031374f7c5bc"
+  integrity sha512-ErzIDckIqic9rmqMFk4scRX+lo7AWifOP+IOCot1KGPdQ7+CP/h/neJ9fiIzYTSDYUm5xk5i+2aW+2SWRJYQdA==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/router@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-beta.14.tgz#62e4be7b085cce764e00c608eb910886767cd61e"
-  integrity sha512-QGIvWPd4ngxWzEwzAqEk7M54CGmmYGRxs/+V8Zohau580XL5lK6tuPvN+slO1dWe3+YuFt6U02zzs9mRGlLnYw==
+"@angular/router@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-8.0.0-rc.2.tgz#e0e4636f56fc08760863486f45f203bb9b00543e"
+  integrity sha512-7NnRdEykm0FJf/SHjUWz3cgGDtW5KM2gKm8it8V8azr3vIiMRYyqhDqCKkhutjt7C+yKNotB5M7Da9uYf0n/xQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/service-worker@^8.0.0-beta.14":
-  version "8.0.0-beta.14"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-beta.14.tgz#7fdac405d2f6757cbaeb2abdb35b513f69e0bdf2"
-  integrity sha512-dQGdpjj97bVp0AvLHI4wpbQCEeWSoPssnKf24oXaJHLM0UuWQgumlBzKU4/gWBpQ+lQoW+txELp4qoY4YH/Yig==
+"@angular/service-worker@^8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-8.0.0-rc.2.tgz#e73374fe4ccd8c15790f007832a5e60576ed85d9"
+  integrity sha512-uudl7+P9Xov9naoW7Ruv0rvvp+jYWe3P3OOpRul8X6tTYarKnorj3F44Y5GoNO5Xxjp0psPSD558rXrrIBt98w==
   dependencies:
     tslib "^1.9.0"
 
@@ -316,40 +316,32 @@
     through2 "^2.0.0"
     xdg-basedir "^3.0.0"
 
-"@ngtools/webpack@8.0.0-beta.18":
-  version "8.0.0-beta.18"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.0-beta.18.tgz#64ebc3823aad7cf80e1afe0e91e06bc281a4448c"
-  integrity sha512-9c7ovJqVq6EpxQx4WYiR1OI6AhG3/RC+dyzvNE3uKEL7WGT6fG/4dKCxr7CA/wYjuogz5Q2Z5n2dLunOTTt5PQ==
+"@ngtools/webpack@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-8.0.0-rc.2.tgz#d8321a89b2c14fcb627d3d5e326b4125b283f08c"
+  integrity sha512-0pXtkvbwp53z+BgQwBllyIHjMM082phkM8hFwlEHCbYeWkSRBqDld7HgzXBEwpBe+4MKjtWF2xXbDp/4BdTjOQ==
   dependencies:
-    "@angular-devkit/core" "8.0.0-beta.18"
+    "@angular-devkit/core" "8.0.0-rc.2"
     enhanced-resolve "4.1.0"
     rxjs "6.4.0"
     tree-kill "1.2.1"
     webpack-sources "1.3.0"
 
-"@phenomnomnominal/tsquery@3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@phenomnomnominal/tsquery/-/tsquery-3.0.0.tgz#6f2f4dbf6304ff52b12cc7a5b979f20c3794a22a"
-  integrity sha512-SW8lKitBHWJ9fAYkJ9kJivuctwNYCh3BUxLdH0+XiR1GPBiu+7qiZzh8p8jqlj1LgVC1TbvfNFroaEsmYlL8Iw==
+"@schematics/angular@8.0.0-rc.2":
+  version "8.0.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.0-rc.2.tgz#94bc9bb68d75e07142a37f4881c287063d460df2"
+  integrity sha512-sBIUz2xEBZJxXAiIsJEaTI7G8r1Mc0aI0tNnw0vQLF6sMSaVKJssN2gYg5dmceDXohJtcgdc3hN1xPL6ZpvsdA==
   dependencies:
-    esquery "^1.0.1"
+    "@angular-devkit/core" "8.0.0-rc.2"
+    "@angular-devkit/schematics" "8.0.0-rc.2"
 
-"@schematics/angular@8.0.0-beta.18":
-  version "8.0.0-beta.18"
-  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-8.0.0-beta.18.tgz#5ad1c76d0279a6b0d286a52b27e4e61b62f348c3"
-  integrity sha512-gmSlDX9ywU3Ce40jl71FpoJDGyYcH3olPnRQGUn8auF7Z/+XVuG2+9EkTrnGwOpuxlmIMLkrlSJjL/1bnJbtpw==
+"@schematics/update@0.800.0-rc.2":
+  version "0.800.0-rc.2"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.0-rc.2.tgz#4ea24343c32f47ee7c2f2404fb67a50331dc8b1a"
+  integrity sha512-oWnxEoscVHfzz0mEvfqwe7hRw4fzsYOmnZEVVLAb62lZQdPQHitflBITI+ubrPmHSgILHoBAWqOYlkuEKVXVAg==
   dependencies:
-    "@angular-devkit/core" "8.0.0-beta.18"
-    "@angular-devkit/schematics" "8.0.0-beta.18"
-    "@phenomnomnominal/tsquery" "3.0.0"
-
-"@schematics/update@0.800.0-beta.18":
-  version "0.800.0-beta.18"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.800.0-beta.18.tgz#03becf819814b5498ff94a21330a95d0529c3f83"
-  integrity sha512-U8yUgRapI64ABHbBQ0KIRKMAUd935n2bKcscechoocB9L/64uRgaBqBsNFXsTuepgGmPxPz0ZKq12h4ny1m+nA==
-  dependencies:
-    "@angular-devkit/core" "8.0.0-beta.18"
-    "@angular-devkit/schematics" "8.0.0-beta.18"
+    "@angular-devkit/core" "8.0.0-rc.2"
+    "@angular-devkit/schematics" "8.0.0-rc.2"
     "@yarnpkg/lockfile" "1.1.0"
     ini "1.3.5"
     pacote "9.5.0"
@@ -1086,10 +1078,6 @@ async-limiter@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.0.tgz#78faed8c3d074ab81f22b4e985d79e8738f720f8"
 
-async@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/async/-/async-0.9.0.tgz#ac3613b1da9bed1b47510bb4651b8931e47146c7"
-
 async@2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4"
@@ -3102,14 +3090,15 @@ ecdsa-sig-formatter@1.0.9:
     base64url "^2.0.0"
     safe-buffer "^5.0.1"
 
-ecstatic@^1.4.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-1.4.1.tgz#32cb7b6fa2e290d58668674d115e8f0c3d567d6a"
+ecstatic@^3.0.0:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/ecstatic/-/ecstatic-3.3.1.tgz#b15b5b036c2233defc78d7bacbd8765226c95577"
+  integrity sha512-/rrctvxZ78HMI/tPIsqdvFKHHscxR3IJuKrZI2ZoUgkt2SiufyLFBmcco+aqQBIu6P1qBsUNG3drAAGLx80vTQ==
   dependencies:
-    he "^0.5.0"
-    mime "^1.2.11"
+    he "^1.1.1"
+    mime "^1.6.0"
     minimist "^1.1.0"
-    url-join "^1.0.0"
+    url-join "^2.0.5"
 
 editions@^1.1.1, editions@^1.1.2, editions@^1.3.1, editions@^1.3.3:
   version "1.3.3"
@@ -3143,6 +3132,11 @@ elliptic@^6.0.0:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-6.1.1.tgz#c6cd0ec1b0642e2a3c67a1137efc5e796da4f88e"
   integrity sha1-xs0OwbBkLio8Z6ETfvxeeW2k+I4=
 
+emoji-regex@^7.0.1:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
+  integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -3447,13 +3441,6 @@ esquery@^1.0.0:
   dependencies:
     estraverse "^4.0.0"
 
-esquery@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
-  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
-  dependencies:
-    estraverse "^4.0.0"
-
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -4173,6 +4160,11 @@ get-caller-file@^1.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
   integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
 
+get-caller-file@^2.0.1:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
 get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
@@ -4661,9 +4653,10 @@ hawk@~6.0.2:
     hoek "4.x.x"
     sntp "2.x.x"
 
-he@^0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/he/-/he-0.5.0.tgz#2c05ffaef90b68e860f3fd2b54ef580989277ee2"
+he@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
 
 header-case@^1.0.0:
   version "1.0.1"
@@ -4820,17 +4813,18 @@ http-proxy@^1.17.0:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
-http-server@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.9.0.tgz#8f1b06bdc733618d4dc42831c7ba1aff4e06001a"
+http-server@^0.11.1:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b"
+  integrity sha512-6JeGDGoujJLmhjiRGlt8yK8Z9Kl0vnl/dQoQZlc4oeqaUoAKQg94NILLfrY3oWzSyFaQCVNTcKE5PZ3cH8VP9w==
   dependencies:
     colors "1.0.3"
     corser "~2.0.0"
-    ecstatic "^1.4.0"
+    ecstatic "^3.0.0"
     http-proxy "^1.8.1"
     opener "~1.4.0"
     optimist "0.6.x"
-    portfinder "0.4.x"
+    portfinder "^1.0.13"
     union "~0.4.3"
 
 http-signature@~1.2.0:
@@ -6709,12 +6703,12 @@ mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.18, mime-types@~2.1.19:
   dependencies:
     mime-db "~1.38.0"
 
-mime@1.4.1, mime@^1.2.11, mime@^1.3.4:
+mime@1.4.1, mime@^1.3.4:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@^1.4.1:
+mime@^1.4.1, mime@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -7340,10 +7334,10 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
-open@6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/open/-/open-6.1.0.tgz#0e7e671b883976a4e5251b5d1ca905ab6f4be78f"
-  integrity sha512-Vqch7NFb/WsMujhqfq+B3u0xkssRjZlxh+NSsBSphpcgaFD7gfB0SUBfR91E9ygBlyNGNogXR2cUB8rRfoo2kQ==
+open@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.2.0.tgz#7cf92cb961b5d8498b071e64098bf5e27f57230c"
+  integrity sha512-Vxf6HJkwrqmvh9UAID3MnMYXntbTxKLOSfOnO7LJdzPf3NE3KQYFNV0/Lcz2VAndbRFil58XVCyh8tiX11fiYw==
   dependencies:
     is-wsl "^1.1.0"
 
@@ -7436,7 +7430,7 @@ os-locale@^2.0.0:
     lcid "^1.0.0"
     mem "^1.1.0"
 
-os-locale@^3.0.0:
+os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
   integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -7865,13 +7859,6 @@ pluralize@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-1.2.1.tgz#d1a21483fd22bb41e58a12fa3421823140897c45"
 
-portfinder@0.4.x:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-0.4.0.tgz#a3ffadffafe4fb98e0601a85eda27c27ce84ca1e"
-  dependencies:
-    async "0.9.0"
-    mkdirp "0.5.x"
-
 portfinder@^1.0.13:
   version "1.0.19"
   resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.19.tgz#07e87914a55242dcda5b833d42f018d6875b595f"
@@ -8678,6 +8665,11 @@ require-main-filename@^1.0.1:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
   integrity sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=
 
+require-main-filename@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
+  integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
+
 require-uncached@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3"
@@ -9654,6 +9646,15 @@ string-width@^1.0.1, string-width@^1.0.2:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
+string-width@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-3.1.0.tgz#22767be21b62af1081574306f69ac51b62203961"
+  integrity sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==
+  dependencies:
+    emoji-regex "^7.0.1"
+    is-fullwidth-code-point "^2.0.0"
+    strip-ansi "^5.1.0"
+
 string.prototype.padend@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
@@ -10531,9 +10532,10 @@ url-join@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-0.0.1.tgz#1db48ad422d3402469a87f7d97bdebfe4fb1e3c8"
 
-url-join@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78"
+url-join@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/url-join/-/url-join-2.0.5.tgz#5af22f18c052a000a48d7b82c5e9c2e2feeda728"
+  integrity sha1-WvIvGMBSoACkjXuCxenC4v7tpyg=
 
 url-parse-lax@^1.0.0:
   version "1.0.0"
@@ -11197,6 +11199,14 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
+yargs-parser@^13.0.0:
+  version "13.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.0.0.tgz#3fc44f3e76a8bdb1cc3602e860108602e5ccde8b"
+  integrity sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==
+  dependencies:
+    camelcase "^5.0.0"
+    decamelize "^1.2.0"
+
 yargs-parser@^5.0.0:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-5.0.0.tgz#275ecf0d7ffe05c77e64e7c86e4cd94bf0e1228a"
@@ -11245,6 +11255,23 @@ yargs@12.0.5:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
+yargs@13.1.0:
+  version "13.1.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.1.0.tgz#b2729ce4bfc0c584939719514099d8a916ad2301"
+  integrity sha512-1UhJbXfzHiPqkfXNHYhiz79qM/kZqjTE8yGlEjZa85Q+3+OwcV6NRkV7XOV1W2Eom2bzILeUn55pQYffjVOLAg==
+  dependencies:
+    cliui "^4.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.0.0"
+
 yargs@3.32.0, yargs@^3.32.0:
   version "3.32.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-3.32.0.tgz#03088e9ebf9e756b69751611d2a5ef591482c995"
@@ -11257,25 +11284,6 @@ yargs@3.32.0, yargs@^3.32.0:
     window-size "^0.1.4"
     y18n "^3.2.0"
 
-yargs@9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
-  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
-  dependencies:
-    camelcase "^4.1.0"
-    cliui "^3.2.0"
-    decamelize "^1.1.1"
-    get-caller-file "^1.0.1"
-    os-locale "^2.0.0"
-    read-pkg-up "^2.0.0"
-    require-directory "^2.1.1"
-    require-main-filename "^1.0.1"
-    set-blocking "^2.0.0"
-    string-width "^2.0.0"
-    which-module "^2.0.0"
-    y18n "^3.2.1"
-    yargs-parser "^7.0.0"
-
 yargs@^7.0.2:
   version "7.1.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-7.1.0.tgz#6ba318eb16961727f5d284f8ea003e8d6154d0c8"
@@ -11329,7 +11337,7 @@ zip-stream@^1.1.0, zip-stream@^1.2.0:
     lodash "^4.8.0"
     readable-stream "^2.0.0"
 
-zone.js@^0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.0.tgz#f42319d657f7616724ed40c5907d4614b4c683fa"
-  integrity sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q==
+zone.js@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
+  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==

docs/PUBLIC_API.md

@@ -37,7 +37,7 @@ We explicitly don't consider the following to be our public API surface:
 
 - any file/import paths within our package except for the `/`, `/testing` and `/bundles/*` and other documented package entry-points.
 - constructors of injectable classes (services and directives) - please use DI to obtain instances of these classes
-- any class members or symbols marked as `private`, or prefixed with underscore (`_`), [barred latin o](https://en.wikipedia.org/wiki/%C6%9F) (`ɵ`), and  [double barred latin o](https://en.wikipedia.org/wiki/%C6%9F) (`ɵɵ`).
+- any class members or symbols marked as `private`, or prefixed with underscore (`_`), [barred latin o](https://en.wikipedia.org/wiki/%C6%9F) (`ɵ`), and  [Greek letter delta](https://en.wikipedia.org/wiki/Delta_(letter)) (`Δ`).
 - extending any of our classes unless the support for this is specifically documented in the API docs
 - the contents and API surface of the code generated by Angular's compiler (with one notable exception: the existence and name of `NgModuleFactory` instances exported from generated code is guaranteed)
 

integration/_payload-limits.json

@@ -3,7 +3,7 @@
     "master": {
       "uncompressed": {
         "runtime": 1497,
-        "main": 167065,
+        "main": 166739,
         "polyfills": 43626
       }
     }
@@ -12,7 +12,7 @@
     "master": {
       "uncompressed": {
         "runtime": 1440,
-        "main": 30932,
+        "main": 14487,
         "polyfills": 43567
       }
     }
@@ -21,7 +21,7 @@
     "master": {
       "uncompressed": {
         "runtime": 1440,
-        "main": 157393,
+        "main": 149205,
         "polyfills": 43567
       }
     }

integration/bazel-schematics/test.sh

@@ -9,7 +9,7 @@ function installLocalPackages() {
   readonly pwd=$(pwd)
   readonly packages=(
     animations common compiler core forms platform-browser
-    platform-browser-dynamic router bazel compiler-cli language-service upgrade
+    platform-browser-dynamic router bazel compiler-cli language-service
   )
   local local_packages=()
   for package in "${packages[@]}"; do

integration/bazel/angular-metadata.tsconfig.json

@@ -23,6 +23,7 @@
     "node_modules/@angular/core/schematics/**",
     "node_modules/@angular/compiler-cli/**",
     "node_modules/@angular/**/testing/**",
+    "node_modules/@angular/common/upgrade*",
     "node_modules/@angular/router/upgrade*"
   ]
 }

integration/bazel/src/package.json

@@ -10,11 +10,10 @@
     "@angular/platform-browser": "packages-dist:platform-browser",
     "@angular/platform-browser-dynamic": "packages-dist:platform-browser-dynamic",
     "@angular/router": "packages-dist:router",
-    "@angular/upgrade": "packages-dist:upgrade",
     "reflect-metadata": "0.1.12",
     "rxjs": "6.4.0",
     "tslib": "1.9.3",
-    "zone.js": "0.9.0"
+    "zone.js": "0.9.1"
   },
   "devDependencies": {
     "@angular/bazel": "packages-dist:bazel",
@@ -31,4 +30,4 @@
     "postinstall": "ngc -p ./angular-metadata.tsconfig.json",
     "//": "TODO(gregmagolan): figure out how to keep dependencies here up to date with the root package.json"
   }
-}
+}

integration/bazel/src/yarn.lock

@@ -3662,7 +3662,7 @@ z-schema@~3.18.3:
   optionalDependencies:
     commander "^2.7.1"
 
-zone.js@0.9.0:
-  version "0.9.0"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.0.tgz#f42319d657f7616724ed40c5907d4614b4c683fa"
-  integrity sha512-EfygvVnLxPSCMSgJ4h7SoY+XNr7ybdwvvwEQ70lvMFl9coNnciXSyWi8Kg6znK1ubyUSffkCKvleSQpLuUKw0Q==
+zone.js@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.9.1.tgz#e37c6e5c54c13fae4de26b5ffe8d8e9212da6d9b"
+  integrity sha512-GkPiJL8jifSrKReKaTZ5jkhrMEgXbXYC+IPo1iquBjayRa0q86w3Dipjn8b415jpitMExe9lV8iTsv8tk3DGag==

integration/bazel/test/e2e/on-prepare.ts

@@ -2,7 +2,7 @@ import { browser } from 'protractor';
 import {OnPrepareConfig, runServer} from '@angular/bazel/protractor-utils';
 
 export = function(config: OnPrepareConfig) {
-  const portFlag = config.server.endsWith('prodserver') ? '-p' : '-port';
+  const portFlag = /prodserver(\.exe)?$/.test(config.server) ? '-p' : '-port';
   return runServer(config.workspace, config.server, portFlag, [])
     .then(serverSpec => {
       const serverUrl = `http://localhost:${serverSpec.port}`;

integration/cli-hello-world-ivy-compat/package.json

@@ -28,7 +28,7 @@
     "zone.js": "file:../../node_modules/zone.js"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.800.0-beta.11",
+    "@angular-devkit/build-angular": "0.800.0-rc.2",
     "@angular/cli": "file:../../node_modules/@angular/cli",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "@angular/language-service": "file:../../dist/packages-dist/language-service",

integration/cli-hello-world-ivy-compat/tslint.json

@@ -73,7 +73,6 @@
     "no-trailing-whitespace": true,
     "no-unnecessary-initializer": true,
     "no-unused-expression": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
     "one-line": [

integration/cli-hello-world-ivy-minimal/package.json

@@ -28,7 +28,7 @@
     "zone.js": "file:../../node_modules/zone.js"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.800.0-beta.11",
+    "@angular-devkit/build-angular": "0.800.0-rc.2",
     "@angular/cli": "file:../../node_modules/@angular/cli",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "@angular/language-service": "file:../../dist/packages-dist/language-service",

integration/cli-hello-world-ivy-minimal/tslint.json

@@ -73,7 +73,6 @@
     "no-trailing-whitespace": true,
     "no-unnecessary-initializer": true,
     "no-unused-expression": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
     "one-line": [

integration/cli-hello-world/package.json

@@ -28,7 +28,7 @@
     "zone.js": "file:../../node_modules/zone.js"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^0.800.0-beta.11",
+    "@angular-devkit/build-angular": "0.800.0-rc.2",
     "@angular/cli": "file:../../node_modules/@angular/cli",
     "@angular/compiler-cli": "file:../../dist/packages-dist/compiler-cli",
     "@angular/language-service": "file:../../dist/packages-dist/language-service",

integration/cli-hello-world/tslint.json

@@ -73,7 +73,6 @@
     "no-trailing-whitespace": true,
     "no-unnecessary-initializer": true,
     "no-unused-expression": true,
-    "no-use-before-declare": true,
     "no-var-keyword": true,
     "object-literal-sort-keys": false,
     "one-line": [

integration/ngcc/test.sh

@@ -40,30 +40,30 @@ if [[ $? != 0 ]]; then exit 1; fi
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Did it compile @angular/core/ApplicationModule correctly?
-  grep "ApplicationModule.ngModuleDef = ɵɵdefineNgModule" node_modules/@angular/core/fesm2015/core.js
+  grep "ApplicationModule.ngModuleDef = ΔdefineNgModule" node_modules/@angular/core/fesm2015/core.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ɵɵdefineNgModule" node_modules/@angular/core/fesm5/core.js
+  grep "ApplicationModule.ngModuleDef = ΔdefineNgModule" node_modules/@angular/core/fesm5/core.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ɵngcc0.ɵɵdefineNgModule" node_modules/@angular/core/esm2015/src/application_module.js
+  grep "ApplicationModule.ngModuleDef = ɵngcc0.ΔdefineNgModule" node_modules/@angular/core/esm2015/src/application_module.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "ApplicationModule.ngModuleDef = ɵngcc0.ɵɵdefineNgModule" node_modules/@angular/core/esm5/src/application_module.js
+  grep "ApplicationModule.ngModuleDef = ɵngcc0.ΔdefineNgModule" node_modules/@angular/core/esm5/src/application_module.js
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Did it transform @angular/core typing files correctly?
   grep "import [*] as ɵngcc0 from './src/r3_symbols';" node_modules/@angular/core/core.d.ts
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "static ngInjectorDef: ɵngcc0.ɵɵInjectorDef<ApplicationModule>;" node_modules/@angular/core/core.d.ts
+  grep "static ngInjectorDef: ɵngcc0.ΔInjectorDef<ApplicationModule>;" node_modules/@angular/core/core.d.ts
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Did it generate a base factory call for synthesized constructors correctly?
-  grep "const ɵMatTable_BaseFactory = ɵngcc0.ɵɵgetInheritedFactory(MatTable);" node_modules/@angular/material/esm2015/table.js
+  grep "const ɵMatTable_BaseFactory = ɵngcc0.ΔgetInheritedFactory(MatTable);" node_modules/@angular/material/esm2015/table.js
   if [[ $? != 0 ]]; then exit 1; fi
-  grep "const ɵMatTable_BaseFactory = ɵngcc0.ɵɵgetInheritedFactory(MatTable);" node_modules/@angular/material/esm5/table.es5.js
+  grep "const ɵMatTable_BaseFactory = ɵngcc0.ΔgetInheritedFactory(MatTable);" node_modules/@angular/material/esm5/table.es5.js
   if [[ $? != 0 ]]; then exit 1; fi
 
 # Can it be safely run again (as a noop)?
 # And check that it logged skipping compilation as expected
-ivy-ngcc | grep 'Skipping'
+ivy-ngcc -l debug | grep 'Skipping'
 if [[ $? != 0 ]]; then exit 1; fi
 
 # Check that running it with logging level error outputs nothing

integration/side-effects/.gitignore

@@ -0,0 +1,3 @@
+# The check-side-effects package generates and deletes this file.
+# If the process is killed, it will be left behind.
+check-side-effects.tmp-input.js

integration/side-effects/README.md

@@ -0,0 +1,9 @@
+This test checks if the side effects for loading Angular packages have changed using <https://github.com/filipesilva/check-side-effects>.
+
+Running `yarn test` will check all ES modules listed in `side-effects.json`.
+
+Running `yarn update` will update any changed side effects.
+
+To add a new ES module to this test, add a new entry in `side-effects.json`.
+
+Usually the ESM and FESM should have the same output, but retained objects that were renamed during the flattening step will leave behind a different name.

integration/side-effects/package.json

@@ -0,0 +1,19 @@
+{
+  "name": "angular-side-effects",
+  "version": "0.0.0",
+  "license": "MIT",
+  "scripts": {
+    "test": "check-side-effects --test side-effects.json --pure-getters",
+    "update": "yarn test --update"
+  },
+  "dependencies": {
+    "@angular/animations": "file:../../dist/packages-dist/animations",
+    "@angular/common": "file:../../dist/packages-dist/common",
+    "@angular/core": "file:../../dist/packages-dist/core",
+    "@angular/elements": "file:../../dist/packages-dist/elements",
+    "@angular/forms": "file:../../dist/packages-dist/forms",
+    "@angular/platform-browser": "file:../../dist/packages-dist/platform-browser",
+    "@angular/router": "file:../../dist/packages-dist/router",
+    "check-side-effects": "file:../../node_modules/check-side-effects"
+  }
+}

integration/side-effects/side-effects.json

@@ -0,0 +1,132 @@
+{
+  "tests": [
+    {
+      "esModules": "./node_modules/@angular/animations/esm5/animations.js",
+      "expectedOutput": "./snapshots/animations/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/fesm5/animations.js",
+      "expectedOutput": "./snapshots/animations/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/esm2015/animations.js",
+      "expectedOutput": "./snapshots/animations/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/fesm2015/animations.js",
+      "expectedOutput": "./snapshots/animations/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/esm5/browser/browser.js",
+      "expectedOutput": "./snapshots/animations-browser/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/fesm5/browser.js",
+      "expectedOutput": "./snapshots/animations-browser/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/esm2015/browser/browser.js",
+      "expectedOutput": "./snapshots/animations-browser/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/animations/fesm2015/browser.js",
+      "expectedOutput": "./snapshots/animations-browser/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/common/esm5/common.js",
+      "expectedOutput": "./snapshots/common/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/common/fesm5/common.js",
+      "expectedOutput": "./snapshots/common/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/common/esm2015/common.js",
+      "expectedOutput": "./snapshots/common/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/common/fesm2015/common.js",
+      "expectedOutput": "./snapshots/common/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/core/esm5/core.js",
+      "expectedOutput": "./snapshots/core/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/core/fesm5/core.js",
+      "expectedOutput": "./snapshots/core/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/core/esm2015/core.js",
+      "expectedOutput": "./snapshots/core/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/core/fesm2015/core.js",
+      "expectedOutput": "./snapshots/core/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/elements/esm5/elements.js",
+      "expectedOutput": "./snapshots/elements/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/elements/fesm5/elements.js",
+      "expectedOutput": "./snapshots/elements/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/elements/esm2015/elements.js",
+      "expectedOutput": "./snapshots/elements/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/elements/fesm2015/elements.js",
+      "expectedOutput": "./snapshots/elements/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/forms/esm5/forms.js",
+      "expectedOutput": "./snapshots/forms/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/forms/fesm5/forms.js",
+      "expectedOutput": "./snapshots/forms/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/forms/esm2015/forms.js",
+      "expectedOutput": "./snapshots/forms/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/forms/fesm2015/forms.js",
+      "expectedOutput": "./snapshots/forms/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/platform-browser/esm5/platform-browser.js",
+      "expectedOutput": "./snapshots/platform-browser/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/platform-browser/fesm5/platform-browser.js",
+      "expectedOutput": "./snapshots/platform-browser/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/platform-browser/esm2015/platform-browser.js",
+      "expectedOutput": "./snapshots/platform-browser/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/platform-browser/fesm2015/platform-browser.js",
+      "expectedOutput": "./snapshots/platform-browser/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/router/esm5/router.js",
+      "expectedOutput": "./snapshots/router/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/router/fesm5/router.js",
+      "expectedOutput": "./snapshots/router/esm5.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/router/esm2015/router.js",
+      "expectedOutput": "./snapshots/router/esm2015.js"
+    },
+    {
+      "esModules": "./node_modules/@angular/router/fesm2015/router.js",
+      "expectedOutput": "./snapshots/router/esm2015.js"
+    }
+  ]
+}

integration/side-effects/snapshots/animations-browser/esm2015.js

@@ -0,0 +1,3 @@
+import "@angular/animations";
+
+import "@angular/core";

integration/side-effects/snapshots/animations-browser/esm5.js

@@ -0,0 +1,5 @@
+import "tslib";
+
+import "@angular/animations";
+
+import "@angular/core";

integration/side-effects/snapshots/animations/esm2015.js

@@ -0,0 +1 @@
+

integration/side-effects/snapshots/animations/esm5.js

@@ -0,0 +1 @@
+

integration/side-effects/snapshots/common/esm2015.js

@@ -0,0 +1 @@
+import "@angular/core";

integration/side-effects/snapshots/common/esm5.js

@@ -0,0 +1,3 @@
+import "@angular/core";
+
+import "tslib";

integration/side-effects/snapshots/core/esm2015.js

@@ -0,0 +1,151 @@
+import { Subject, Subscription } from "rxjs";
+
+import "rxjs/operators";
+
+function getGlobal() {
+    const __globalThis = "undefined" !== typeof globalThis && globalThis;
+    const __window = "undefined" !== typeof window && window;
+    const __self = "undefined" !== typeof self && "undefined" !== typeof WorkerGlobalScope && self instanceof WorkerGlobalScope && self;
+    const __global = "undefined" !== typeof global && global;
+    return __globalThis || __global || __window || __self;
+}
+
+const _global = getGlobal();
+
+let _symbolIterator = null;
+
+function getSymbolIterator() {
+    if (!_symbolIterator) {
+        const Symbol = _global["Symbol"];
+        if (Symbol && Symbol.iterator) _symbolIterator = Symbol.iterator; else {
+            const keys = Object.getOwnPropertyNames(Map.prototype);
+            for (let i = 0; i < keys.length; ++i) {
+                const key = keys[i];
+                if ("entries" !== key && "size" !== key && Map.prototype[key] === Map.prototype["entries"]) _symbolIterator = key;
+            }
+        }
+    }
+    return _symbolIterator;
+}
+
+if ("undefined" === typeof ngI18nClosureMode) _global["ngI18nClosureMode"] = "undefined" !== typeof goog && "function" === typeof goog.getMsg;
+
+function flatten(list, mapFn) {
+    const result = [];
+    let i = 0;
+    while (i < list.length) {
+        const item = list[i];
+        if (Array.isArray(item)) if (item.length > 0) {
+            list = item.concat(list.slice(i + 1));
+            i = 0;
+        } else i++; else {
+            result.push(mapFn ? mapFn(item) : item);
+            i++;
+        }
+    }
+    return result;
+}
+
+class EventEmitter extends Subject {
+    constructor(isAsync = false) {
+        super();
+        this.__isAsync = isAsync;
+    }
+    emit(value) {
+        super.next(value);
+    }
+    subscribe(generatorOrNext, error, complete) {
+        let schedulerFn;
+        let errorFn = err => null;
+        let completeFn = () => null;
+        if (generatorOrNext && "object" === typeof generatorOrNext) {
+            schedulerFn = this.__isAsync ? value => {
+                setTimeout(() => generatorOrNext.next(value));
+            } : value => {
+                generatorOrNext.next(value);
+            };
+            if (generatorOrNext.error) errorFn = this.__isAsync ? err => {
+                setTimeout(() => generatorOrNext.error(err));
+            } : err => {
+                generatorOrNext.error(err);
+            };
+            if (generatorOrNext.complete) completeFn = this.__isAsync ? () => {
+                setTimeout(() => generatorOrNext.complete());
+            } : () => {
+                generatorOrNext.complete();
+            };
+        } else {
+            schedulerFn = this.__isAsync ? value => {
+                setTimeout(() => generatorOrNext(value));
+            } : value => {
+                generatorOrNext(value);
+            };
+            if (error) errorFn = this.__isAsync ? err => {
+                setTimeout(() => error(err));
+            } : err => {
+                error(err);
+            };
+            if (complete) completeFn = this.__isAsync ? () => {
+                setTimeout(() => complete());
+            } : () => {
+                complete();
+            };
+        }
+        const sink = super.subscribe(schedulerFn, errorFn, completeFn);
+        if (generatorOrNext instanceof Subscription) generatorOrNext.add(sink);
+        return sink;
+    }
+}
+
+class QueryList {
+    constructor() {
+        this.dirty = true;
+        this._results = [];
+        this.changes = new EventEmitter();
+        this.length = 0;
+    }
+    map(fn) {
+        return this._results.map(fn);
+    }
+    filter(fn) {
+        return this._results.filter(fn);
+    }
+    find(fn) {
+        return this._results.find(fn);
+    }
+    reduce(fn, init) {
+        return this._results.reduce(fn, init);
+    }
+    forEach(fn) {
+        this._results.forEach(fn);
+    }
+    some(fn) {
+        return this._results.some(fn);
+    }
+    toArray() {
+        return this._results.slice();
+    }
+    [getSymbolIterator()]() {
+        return this._results[getSymbolIterator()]();
+    }
+    toString() {
+        return this._results.toString();
+    }
+    reset(resultsTree) {
+        this._results = flatten(resultsTree);
+        this.dirty = false;
+        this.length = this._results.length;
+        this.last = this._results[this.length - 1];
+        this.first = this._results[0];
+    }
+    notifyOnChanges() {
+        this.changes.emit(this);
+    }
+    setDirty() {
+        this.dirty = true;
+    }
+    destroy() {
+        this.changes.complete();
+        this.changes.unsubscribe();
+    }
+}

integration/side-effects/snapshots/core/esm5.js

@@ -0,0 +1,17 @@
+import "tslib";
+
+import "rxjs";
+
+import "rxjs/operators";
+
+function getGlobal() {
+    var __globalThis = "undefined" !== typeof globalThis && globalThis;
+    var __window = "undefined" !== typeof window && window;
+    var __self = "undefined" !== typeof self && "undefined" !== typeof WorkerGlobalScope && self instanceof WorkerGlobalScope && self;
+    var __global = "undefined" !== typeof global && global;
+    return __globalThis || __global || __window || __self;
+}
+
+var _global = getGlobal();
+
+if ("undefined" === typeof ngI18nClosureMode) _global["ngI18nClosureMode"] = "undefined" !== typeof goog && "function" === typeof goog.getMsg;

integration/side-effects/snapshots/elements/esm2015.js

@@ -0,0 +1,5 @@
+import "@angular/core";
+
+import "rxjs";
+
+import "rxjs/operators";

integration/side-effects/snapshots/elements/esm5.js

@@ -0,0 +1,7 @@
+import "tslib";
+
+import "@angular/core";
+
+import "rxjs";
+
+import "rxjs/operators";

integration/side-effects/snapshots/forms/esm2015.js

@@ -0,0 +1,7 @@
+import "@angular/core";
+
+import "@angular/platform-browser";
+
+import "rxjs";
+
+import "rxjs/operators";

integration/side-effects/snapshots/forms/esm5.js

@@ -0,0 +1,9 @@
+import "tslib";
+
+import "@angular/core";
+
+import "@angular/platform-browser";
+
+import "rxjs";
+
+import "rxjs/operators";

integration/side-effects/snapshots/platform-browser/esm2015.js

@@ -0,0 +1,3 @@
+import "@angular/common";
+
+import "@angular/core";

integration/side-effects/snapshots/platform-browser/esm5.js

@@ -0,0 +1,5 @@
+import "tslib";
+
+import "@angular/common";
+
+import "@angular/core";

integration/side-effects/snapshots/router/esm2015.js

@@ -0,0 +1,9 @@
+import "@angular/common";
+
+import "@angular/core";
+
+import "rxjs";
+
+import "rxjs/operators";
+
+import "@angular/platform-browser";

integration/side-effects/snapshots/router/esm5.js

@@ -0,0 +1,11 @@
+import "tslib";
+
+import "@angular/common";
+
+import "@angular/core";
+
+import "rxjs";
+
+import "rxjs/operators";
+
+import "@angular/platform-browser";

integration/side-effects/yarn.lock

@@ -0,0 +1,375 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@angular-devkit/build-optimizer@0.14.0-beta.5":
+  version "0.14.0-beta.5"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.14.0-beta.5.tgz#f842a0b2717517cdc8e40704076d6182feccb81a"
+  integrity sha512-sQ86BGrd65QD9fV+wgDWNFKS2kxsZFj/lSn3pjgguV43XjGvnNlXnsVAgZOruygyXjB/afEOkNpO/4sKFNxiMw==
+  dependencies:
+    loader-utils "1.2.3"
+    source-map "0.5.6"
+    typescript "3.2.4"
+    webpack-sources "1.3.0"
+
+"@angular/animations@file:../../dist/packages-dist/animations":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/common@file:../../dist/packages-dist/common":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/core@file:../../dist/packages-dist/core":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/elements@file:../../dist/packages-dist/elements":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/forms@file:../../dist/packages-dist/forms":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/platform-browser@file:../../dist/packages-dist/platform-browser":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@angular/router@file:../../dist/packages-dist/router":
+  version "8.0.0-rc.0"
+  dependencies:
+    tslib "^1.9.0"
+
+"@babel/code-frame@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0.tgz#06e2ab19bdb535385559aabb5ba59729482800f8"
+  integrity sha512-OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA==
+  dependencies:
+    "@babel/highlight" "^7.0.0"
+
+"@babel/highlight@^7.0.0":
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0.tgz#f710c38c8d458e6dd9a201afb637fcb781ce99e4"
+  integrity sha512-UFMC4ZeFC48Tpvj7C8UgLvtkaUuovQX+5xNWrsIoMG8o2z+XFKjKaN9iVmS84dPwVN00W4wPmqvYoZF3EGAsfw==
+  dependencies:
+    chalk "^2.0.0"
+    esutils "^2.0.2"
+    js-tokens "^4.0.0"
+
+"@types/estree@0.0.39":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+
+"@types/node@*":
+  version "11.11.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.11.1.tgz#9ee55ffce20f72e141863b0036a6e51c6fc09a1f"
+  integrity sha512-2azXFP9n4aA2QNLkKm/F9pzKxgYj1SMawZ5Eh9iC21RH3XNcFsivLVU2NhpMgQm7YobSByvIol4c42ZFusXFHQ==
+
+"@types/node@^11.13.9":
+  version "11.13.10"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.13.10.tgz#4df59e5966b56f512bac98898bcbee5067411f0f"
+  integrity sha512-leUNzbFTMX94TWaIKz8N15Chu55F9QSH+INKayQr5xpkasBQBRF3qQXfo3/dOnMU/dEIit+Y/SU8HyOjq++GwA==
+
+"@types/resolve@0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
+  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+  dependencies:
+    "@types/node" "*"
+
+acorn@^6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
+  integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+big.js@^5.2.2:
+  version "5.2.2"
+  resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
+
+buffer-from@^1.0.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
+  integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
+
+builtin-modules@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.1.0.tgz#aad97c15131eb76b65b50ef208e7584cd76a7484"
+  integrity sha512-k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==
+
+chalk@^2.0.0:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+"check-side-effects@file:../../node_modules/check-side-effects":
+  version "0.0.20"
+  dependencies:
+    "@angular-devkit/build-optimizer" "0.14.0-beta.5"
+    minimist "~1.2.0"
+    rollup "~1.11.3"
+    rollup-plugin-node-resolve "~4.2.3"
+    rollup-plugin-terser "~4.0.4"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
+
+commander@^2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
+
+core-util-is@~1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
+  integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+
+emojis-list@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
+  integrity sha1-TapNnbAPmBmIDHn6RXrlsJof04k=
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
+
+esutils@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
+  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
+
+inherits@~2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
+  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
+
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha1-Mlj7afeMFNW4FdZkM2tM/7ZEFZE=
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+  integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+
+jest-worker@^24.0.0:
+  version "24.4.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.4.0.tgz#fbc452b0120bb5c2a70cdc88fa132b48eeb11dd0"
+  integrity sha512-BH9X/klG9vxwoO99ZBUbZFfV8qO0XNZ5SIiCyYK2zOuJBl6YJVAeNIQjcoOVNu4HGEHeYEKsUWws8kSlSbZ9YQ==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^1.0.1"
+    supports-color "^6.1.0"
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+json5@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
+  dependencies:
+    minimist "^1.2.0"
+
+loader-utils@1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^2.0.0"
+    json5 "^1.0.1"
+
+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
+  dependencies:
+    readable-stream "^2.0.1"
+
+minimist@^1.2.0, minimist@~1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+  integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
+
+path-parse@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
+  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+
+process-nextick-args@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa"
+  integrity sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==
+
+readable-stream@^2.0.1:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
+  integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~2.0.0"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.1.1"
+    util-deprecate "~1.0.1"
+
+resolve@^1.10.0:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.10.0.tgz#3bdaaeaf45cc07f375656dfd2e54ed0810b101ba"
+  integrity sha512-3sUr9aq5OfSg2S9pNtPA9hL1FVEAjvfOC4leW0SNf/mpnaakz2a9femSd6LqAww2RaFctwyf1lCqnTHuF1rxDg==
+  dependencies:
+    path-parse "^1.0.6"
+
+rollup-plugin-node-resolve@~4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-4.2.3.tgz#638a373a54287d19fcc088fdd1c6fd8a58e4d90a"
+  integrity sha512-r+WaesPzdGEynpLZLALFEDugA4ACa5zn7bc/+LVX4vAXQQ8IgDHv0xfsSvJ8tDXUtprfBtrDtRFg27ifKjcJTg==
+  dependencies:
+    "@types/resolve" "0.0.8"
+    builtin-modules "^3.1.0"
+    is-module "^1.0.0"
+    resolve "^1.10.0"
+
+rollup-plugin-terser@~4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-4.0.4.tgz#6f661ef284fa7c27963d242601691dc3d23f994e"
+  integrity sha512-wPANT5XKVJJ8RDUN0+wIr7UPd0lIXBo4UdJ59VmlPCtlFsE20AM+14pe+tk7YunCsWEiuzkDBY3QIkSCjtrPXg==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    jest-worker "^24.0.0"
+    serialize-javascript "^1.6.1"
+    terser "^3.14.1"
+
+rollup@~1.11.3:
+  version "1.11.3"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-1.11.3.tgz#6f436db2a2d6b63f808bf60ad01a177643dedb81"
+  integrity sha512-81MR7alHcFKxgWzGfG7jSdv+JQxSOIOD/Fa3iNUmpzbd7p+V19e1l9uffqT8/7YAHgGOzmoPGN3Fx3L2ptOf5g==
+  dependencies:
+    "@types/estree" "0.0.39"
+    "@types/node" "^11.13.9"
+    acorn "^6.1.1"
+
+safe-buffer@~5.1.0, safe-buffer@~5.1.1:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
+  integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+
+serialize-javascript@^1.6.1:
+  version "1.6.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.6.1.tgz#4d1f697ec49429a847ca6f442a2a755126c4d879"
+  integrity sha512-A5MOagrPFga4YaKQSWHryl7AXvbQkEqpw4NNYMTNYUNV51bA8ABHgYFpqKx+YFFrw59xMV1qGH1R4AgoNIVgCw==
+
+source-list-map@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
+
+source-map-support@~0.5.10:
+  version "0.5.11"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.11.tgz#efac2ce0800355d026326a0ca23e162aeac9a4e2"
+  integrity sha512-//sajEx/fGL3iw6fltKMdPvy8kL3kJ2O3iuYlRoT3k9Kb4BjOoZ+BZzaNHeuaruSt+Kf3Zk9tnfAQg9/AJqUVQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@0.5.6:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412"
+  integrity sha1-dc449SvwczxafwwRjYEzSiu19BI=
+
+source-map@^0.6.0, source-map@~0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+string_decoder@~1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8"
+  integrity sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+  dependencies:
+    safe-buffer "~5.1.0"
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
+terser@^3.14.1:
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
+  dependencies:
+    commander "^2.19.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.10"
+
+tslib@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
+  integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
+
+typescript@3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
+  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+  integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+
+webpack-sources@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
+  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"

modules/benchmarks/src/tree/render3_function/index.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {ɵRenderFlags, ɵrenderComponent as renderComponent, ɵɵcontainer, ɵɵcontainerRefreshEnd, ɵɵcontainerRefreshStart, ɵɵdefineComponent, ɵɵelementEnd, ɵɵelementStart, ɵɵelementStyleProp, ɵɵelementStyling, ɵɵembeddedViewEnd, ɵɵembeddedViewStart, ɵɵinterpolation1, ɵɵtext, ɵɵtextBinding} from '@angular/core';
+import {ɵRenderFlags, ɵrenderComponent as renderComponent, Δcontainer, ΔcontainerRefreshEnd, ΔcontainerRefreshStart, ΔdefineComponent, ΔelementEnd, ΔelementStart, ΔelementStyleProp, ΔelementStyling, ΔembeddedViewEnd, ΔembeddedViewStart, Δinterpolation1, Δtext, ΔtextBinding} from '@angular/core';
 
 import {bindAction, profile} from '../../util';
 import {createDom, destroyDom, detectChanges} from '../render3/tree';
@@ -18,7 +18,7 @@ export class TreeFunction {
   data: TreeNode = emptyTree;
 
   /** @nocollapse */
-  static ngComponentDef = ɵɵdefineComponent({
+  static ngComponentDef = ΔdefineComponent({
     type: TreeFunction,
     selectors: [['tree']],
     consts: 5,
@@ -35,38 +35,38 @@ export class TreeFunction {
 const c1 = ['background-color'];
 export function TreeTpl(rf: ɵRenderFlags, ctx: TreeNode) {
   if (rf & ɵRenderFlags.Create) {
-    ɵɵelementStart(0, 'tree');
+    ΔelementStart(0, 'tree');
     {
-      ɵɵelementStart(1, 'span');
-      ɵɵelementStyling(null, c1);
-      { ɵɵtext(2); }
-      ɵɵelementEnd();
-      ɵɵcontainer(3);
-      ɵɵcontainer(4);
+      ΔelementStart(1, 'span');
+      ΔelementStyling(null, c1);
+      { Δtext(2); }
+      ΔelementEnd();
+      Δcontainer(3);
+      Δcontainer(4);
     }
-    ɵɵelementEnd();
+    ΔelementEnd();
   }
   if (rf & ɵRenderFlags.Update) {
-    ɵɵelementStyleProp(1, 0, ctx.depth % 2 ? '' : 'grey');
-    ɵɵtextBinding(2, ɵɵinterpolation1(' ', ctx.value, ' '));
-    ɵɵcontainerRefreshStart(3);
+    ΔelementStyleProp(1, 0, ctx.depth % 2 ? '' : 'grey');
+    ΔtextBinding(2, Δinterpolation1(' ', ctx.value, ' '));
+    ΔcontainerRefreshStart(3);
     {
       if (ctx.left != null) {
-        let rf0 = ɵɵembeddedViewStart(0, 5, 1);
+        let rf0 = ΔembeddedViewStart(0, 5, 1);
         { TreeTpl(rf0, ctx.left); }
-        ɵɵembeddedViewEnd();
+        ΔembeddedViewEnd();
       }
     }
-    ɵɵcontainerRefreshEnd();
-    ɵɵcontainerRefreshStart(4);
+    ΔcontainerRefreshEnd();
+    ΔcontainerRefreshStart(4);
     {
       if (ctx.right != null) {
-        let rf0 = ɵɵembeddedViewStart(0, 5, 1);
+        let rf0 = ΔembeddedViewStart(0, 5, 1);
         { TreeTpl(rf0, ctx.right); }
-        ɵɵembeddedViewEnd();
+        ΔembeddedViewEnd();
       }
     }
-    ɵɵcontainerRefreshEnd();
+    ΔcontainerRefreshEnd();
   }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-srcs",
-  "version": "8.0.0-rc.0",
+  "version": "8.0.0-rc.4",
   "private": true,
   "branchPattern": "2.0.*",
   "description": "Angular - a web framework for modern web apps",
@@ -107,8 +107,8 @@
     "tslint": "5.7.0",
     "typescript": "~3.4.2",
     "xhr2": "0.1.4",
-    "yargs": "9.0.1",
-    "zone.js": "^0.9.0"
+    "yargs": "13.1.0",
+    "zone.js": "^0.9.1"
   },
   "optionalDependencies": {
     "fsevents": "2.0.1"
@@ -123,6 +123,7 @@
     "@types/minimist": "^1.2.0",
     "@types/systemjs": "0.19.32",
     "browserstacktunnel-wrapper": "2.0.1",
+    "check-side-effects": "0.0.20",
     "clang-format": "1.0.41",
     "cldr": "4.10.0",
     "cldr-data-downloader": "0.3.2",
@@ -153,6 +154,7 @@
     "sauce-connect": "https://saucelabs.com/downloads/sc-4.5.1-linux.tar.gz",
     "semver": "5.4.1",
     "tslint-eslint-rules": "4.1.1",
+    "tslint-no-toplevel-property-access": "0.0.2",
     "tsutils": "2.27.2",
     "universal-analytics": "0.4.15",
     "vlq": "0.2.2",

packages/animations/browser/src/dsl/style_normalization/web_animations_style_normalizer.ts

@@ -34,9 +34,10 @@ export class WebAnimationsStyleNormalizer extends AnimationStyleNormalizer {
   }
 }
 
-const DIMENSIONAL_PROP_MAP = makeBooleanMap(
-    'width,height,minWidth,minHeight,maxWidth,maxHeight,left,top,bottom,right,fontSize,outlineWidth,outlineOffset,paddingTop,paddingLeft,paddingBottom,paddingRight,marginTop,marginLeft,marginBottom,marginRight,borderRadius,borderWidth,borderTopWidth,borderLeftWidth,borderRightWidth,borderBottomWidth,textIndent,perspective'
-        .split(','));
+const DIMENSIONAL_PROP_MAP =
+    (() => makeBooleanMap(
+         'width,height,minWidth,minHeight,maxWidth,maxHeight,left,top,bottom,right,fontSize,outlineWidth,outlineOffset,paddingTop,paddingLeft,paddingBottom,paddingRight,marginTop,marginLeft,marginBottom,marginRight,borderRadius,borderWidth,borderTopWidth,borderLeftWidth,borderRightWidth,borderBottomWidth,textIndent,perspective'
+             .split(',')))();
 
 function makeBooleanMap(keys: string[]): {[key: string]: boolean} {
   const map: {[key: string]: boolean} = {};

packages/animations/browser/src/render/shared.ts

@@ -158,16 +158,20 @@ if (_isNode || typeof Element !== 'undefined') {
   // this is well supported in all browsers
   _contains = (elm1: any, elm2: any) => { return elm1.contains(elm2) as boolean; };
 
-  if (_isNode || Element.prototype.matches) {
-    _matches = (element: any, selector: string) => element.matches(selector);
-  } else {
-    const proto = Element.prototype as any;
-    const fn = proto.matchesSelector || proto.mozMatchesSelector || proto.msMatchesSelector ||
-        proto.oMatchesSelector || proto.webkitMatchesSelector;
-    if (fn) {
-      _matches = (element: any, selector: string) => fn.apply(element, [selector]);
+  _matches = (() => {
+    if (_isNode || Element.prototype.matches) {
+      return (element: any, selector: string) => element.matches(selector);
+    } else {
+      const proto = Element.prototype as any;
+      const fn = proto.matchesSelector || proto.mozMatchesSelector || proto.msMatchesSelector ||
+          proto.oMatchesSelector || proto.webkitMatchesSelector;
+      if (fn) {
+        return (element: any, selector: string) => fn.apply(element, [selector]);
+      } else {
+        return _matches;
+      }
     }
-  }
+  })();
 
   _query = (element: any, selector: string, multi: boolean): any[] => {
     let results: any[] = [];

packages/bazel/package.bzl

@@ -28,11 +28,10 @@ def rules_angular_dev_dependencies():
     _maybe(
         http_archive,
         name = "bazel_toolchains",
-        sha256 = "67335b3563d9b67dc2550b8f27cc689b64fadac491e69ce78763d9ba894cc5cc",
-        strip_prefix = "bazel-toolchains-cddc376d428ada2927ad359211c3e356bd9c9fbb",
+        sha256 = "142bcbd8cb751ce1193a1d7fef4e328493cd0a69cc0555183ad237f81418ba40",
+        strip_prefix = "bazel-toolchains-628224f6cf48e81116d0ee0bf65424eaa630d5b3",
         urls = [
-            "https://mirror.bazel.build/github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz",
-            "https://github.com/bazelbuild/bazel-toolchains/archive/cddc376d428ada2927ad359211c3e356bd9c9fbb.tar.gz",
+            "https://github.com/xingao267/bazel-toolchains/archive/628224f6cf48e81116d0ee0bf65424eaa630d5b3.tar.gz",
         ],
     )
 

packages/bazel/package.json

@@ -34,11 +34,11 @@
     "@types/node": "6.0.84",
     "semver": "^5.6.0",
     "shelljs": "0.8.2",
-    "tsickle": "0.34.3"
+    "tsickle": "^0.35.0"
   },
   "peerDependencies": {
     "@angular/compiler-cli": "0.0.0-PLACEHOLDER",
-    "@bazel/typescript": "0.27.12",
+    "@bazel/typescript": "0.*",
     "typescript": ">=3.4 <3.5"
   },
   "repository": {

packages/bazel/src/builders/bazel.ts

@@ -8,8 +8,8 @@
 
 /// <reference types='node'/>
 
-import {fork} from 'child_process';
-import {copyFileSync, existsSync, readdirSync, statSync, unlinkSync} from 'fs';
+import {spawn} from 'child_process';
+import {copyFileSync, existsSync, readFileSync, readdirSync, statSync, unlinkSync, writeFileSync} from 'fs';
 import {dirname, join, normalize} from 'path';
 
 export type Executable = 'bazel' | 'ibazel';
@@ -24,7 +24,7 @@ export function runBazel(
   projectDir = normalize(projectDir);
   binary = normalize(binary);
   return new Promise((resolve, reject) => {
-    const buildProcess = fork(binary, [command, workspaceTarget, ...flags], {
+    const buildProcess = spawn(binary, [command, workspaceTarget, ...flags], {
       cwd: projectDir,
       stdio: 'inherit',
     });
@@ -51,12 +51,12 @@ export function runBazel(
  */
 export function checkInstallation(name: Executable, projectDir: string): string {
   projectDir = normalize(projectDir);
-  const packageName = `@bazel/${name}/package.json`;
+  const packageName = `@bazel/${name}`;
   try {
     const bazelPath = require.resolve(packageName, {
       paths: [projectDir],
     });
-    return dirname(bazelPath);
+    return require(bazelPath).getNativeBinary();
   } catch (error) {
     if (error.code === 'MODULE_NOT_FOUND') {
       throw new Error(
@@ -106,6 +106,33 @@ function listR(dir: string): string[] {
   return list(dir, '', []);
 }
 
+/**
+ * Return the name of the lock file that is present in the specified 'root'
+ * directory. If none exists, default to creating an empty yarn.lock file.
+ */
+function getOrCreateLockFile(root: string): 'yarn.lock'|'package-lock.json' {
+  const yarnLock = join(root, 'yarn.lock');
+  if (existsSync(yarnLock)) {
+    return 'yarn.lock';
+  }
+  const npmLock = join(root, 'package-lock.json');
+  if (existsSync(npmLock)) {
+    return 'package-lock.json';
+  }
+  // Prefer yarn if no lock file exists
+  writeFileSync(yarnLock, '');
+  return 'yarn.lock';
+}
+
+// Replace yarn_install rule with npm_install and copy from 'source' to 'dest'.
+function replaceYarnWithNpm(source: string, dest: string) {
+  const srcContent = readFileSync(source, 'utf-8');
+  const destContent = srcContent.replace(/yarn_install/g, 'npm_install')
+                          .replace('yarn_lock', 'package_lock_json')
+                          .replace('yarn.lock', 'package-lock.json');
+  writeFileSync(dest, destContent);
+}
+
 /**
  * Copy Bazel files (WORKSPACE, BUILD.bazel, etc) from the template directory to
  * the project `root` directory, and return the absolute paths of the files
@@ -117,6 +144,7 @@ export function copyBazelFiles(root: string, templateDir: string) {
   templateDir = normalize(templateDir);
   const bazelFiles: string[] = [];
   const templates = listR(templateDir);
+  const useYarn = getOrCreateLockFile(root) === 'yarn.lock';
 
   for (const template of templates) {
     const name = template.replace('__dot__', '.').replace('.template', '');
@@ -124,7 +152,11 @@ export function copyBazelFiles(root: string, templateDir: string) {
     const dest = join(root, name);
     try {
       if (!existsSync(dest)) {
-        copyFileSync(source, dest);
+        if (!useYarn && name === 'WORKSPACE') {
+          replaceYarnWithNpm(source, dest);
+        } else {
+          copyFileSync(source, dest);
+        }
         bazelFiles.push(dest);
       }
     } catch {

packages/bazel/src/builders/files/__dot__bazelrc.template

@@ -23,6 +23,8 @@ build --incompatible_strict_action_env
 run --incompatible_strict_action_env
 test --incompatible_strict_action_env
 
+build --incompatible_bzl_disallow_load_after_statement=false
+
 test --test_output=errors
 
 # Use the Angular 6 compiler