release: cut the v7.2.7 release

fix(core): traverse and sanitize content of unsafe elements (#28804 )
In the past, the sanitizer would remove unsafe elements, but still traverse and sanitize (and potentially preserve) their content. This was problematic in the case of `<style></style>` tags, whose content would be converted to HTML text nodes. In order to fix this, the sanitizer's behavior was changed in #25879 to ignore the content of _all_ unsafe elements. While this fixed the problem with `<style></style>` tags, it unnecessarily removed the contents for _any_ unsafe element. This was an unneeded breaking change. This commit partially restores the old sanitizer behavior (namely traversing content of unsafe elements), but introduces a list of elements whose content should not be traversed if the elements themselves are considered unsafe. Currently, this list contains `style`, `script` and `template`. Related to #25879 and #26007. Fixes #28427 PR Close #28804
2019-02-26 16:20:57 -08:00 · 2019-02-26 13:32:10 -08:00 · 2019-02-26 08:40:44 -08:00 · 2019-02-26 08:39:17 -08:00 · 2019-02-25 14:07:56 -08:00 · 2019-02-25 12:54:58 -08:00
180 changed files with 2292 additions and 1324 deletions
--- a/.bazelignore
+++ b/.bazelignore
@ -1,5 +1,6 @@
 node_modules
 dist
+aio/content
 aio/node_modules
 aio/tools/examples/shared/node_modules
 integration/bazel
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -26,18 +26,29 @@ var_2: &browsers_docker_image circleci/node:10.12-browsers
 # **NOTE 1 **: If you change the cache key prefix, also sync the restore_cache fallback to match.
 # **NOTE 2 **: Keep the static part of the cache key as prefix to enable correct fallbacks.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_3: &cache_key v2-angular-node-10.12-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}
+var_3: &cache_key v3-angular-node-10.12-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}

 # Initializes the CI environment by setting up common environment variables.
 var_4: &init_environment
  run:
-    name: Initializing environment (setting up variables, removing Yarn)
-    # Remove the yarn installed in the docker container; we want our own version
+    name: Initializing environment (setting up variables, overwriting Yarn)
+    # Overwrite the yarn installed in the docker container with our own version.
    command: |
-      sudo rm /usr/local/bin/yarn
-      source ./.circleci/env.sh
+      ./.circleci/env.sh
+      ourYarn=$(realpath ./third_party/github.com/yarnpkg/yarn/releases/download/v1.13.0/bin/yarn.js)
+      sudo chmod a+x $ourYarn
+      sudo ln -fs $ourYarn /usr/local/bin/yarn
      echo "Yarn version: $(yarn --version)"

+      # Add GitHub to known hosts.
+      mkdir -p ~/.ssh
+      echo 'github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==' >> ~/.ssh/known_hosts
+
+      # use git+ssh instead of https
+      git config --global url."ssh://git@github.com".insteadOf "https://github.com" || true
+      git config --global gc.auto 0 || true
+
+
 var_5: &setup_bazel_remote_execution
  run:
    name: "Setup bazel RBE remote execution"
@ -56,7 +67,23 @@ var_6: &job_defaults
 # Similar to travis behavior, but not quite the same.
 # See https://discuss.circleci.com/t/1662
 var_7: &post_checkout
-  post: git pull --ff-only origin "refs/pull/${CI_PULL_REQUEST//*pull\//}/merge"
+  run:
+    name: Post checkout step
+    command: >
+      if [[ -n "${CIRCLE_PR_NUMBER}" ]]; then
+        # Fetch the head and merge commits for this PR.
+        git fetch origin +refs/pull/$CIRCLE_PR_NUMBER/head:pr/$CIRCLE_PR_NUMBER/head
+        git fetch origin +refs/pull/$CIRCLE_PR_NUMBER/merge:pr/$CIRCLE_PR_NUMBER/merge
+        # Checkout the merged PR for testing as CircleCI will just use the PR head otherwise.
+        git checkout -qf pr/$CIRCLE_PR_NUMBER/merge
+        # Reset the merge commit into its PR head.
+        git reset pr/$CIRCLE_PR_NUMBER/head
+        # Commit the merge changes into the head of the PR.
+        # This way we keep the last commit message.
+        git config user.name "angular-ci"
+        git config user.email "angular-ci"
+        git commit . --amend --no-edit
+      fi

 var_8: &yarn_install
  run:
@ -79,18 +106,58 @@ var_10: &restore_cache
    keys:
      - *cache_key
      # This fallback should be the cache_key without variables.
-      - v2-angular-node-10.12-
+      - v3-angular-node-10.12-
+
+# Branch filter that can be specified for jobs that should only run on publish branches
+# (e.g. master or the patch branch)
+var_12: &publish_branches_filter
+  branches:
+    only:
+      - master
+      # e.g. 7.0.x, 7.1.x, etc.
+      - /\d+\.\d+\.x/
+
+# Workspace initially persisted by the `install` job, and then enhanced by `test_aio` and
+# `build-npm-packages`.
+# https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
+# https://circleci.com/blog/deep-diving-into-circleci-workspaces/
+var_13: &attach_workspace
+  attach_workspace:
+    at: ~/

 version: 2
 jobs:
-  lint:
+  setup:
    <<: *job_defaults
    steps:
-      - checkout:
-          <<: *post_checkout
+      - checkout
+      - *post_checkout
+      # This cache is saved in the build-npm-packages so that Bazel cache is also included.
      - *restore_cache
      - *init_environment
      - *yarn_install
+      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
+      # Make the bazel directories and add a file to them if they don't exist already so that
+      # persist_to_workspace does not fail.
+      - run: |
+          if [ ! -d ~/bazel_repository_cache ]; then
+            mkdir ~/bazel_repository_cache
+            touch ~/bazel_repository_cache/MARKER
+          fi
+      # Persist any changes at this point to be reused by further jobs.
+      # **NOTE 1 **: Folders persisted here should be kept in sync with `var_13: &attach_workspace`.
+      # **NOTE 2 **: To add new content to the workspace, always persist on the same root.
+      - persist_to_workspace:
+          root: ~/
+          paths:
+            - ./ng
+            - ./bazel_repository_cache
+
+  lint:
+    <<: *job_defaults
+    steps:
+      - *attach_workspace
+      - *init_environment

      - run: 'yarn bazel:format -mode=check ||
              (echo "BUILD files not formatted. Please run ''yarn bazel:format''" ; exit 1)'
@ -98,19 +165,14 @@ jobs:
      - run: 'yarn bazel:lint ||
              (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'

-      # Use `yarn gulp ...` (instead of `node_modules/.bin/gulp ...`) to ensure that yarn
-      # (which is an exported bash function) will be available to processes spawned by gulp.
      - run: yarn gulp lint

  test:
    <<: *job_defaults
    resource_class: xlarge
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
+      - *attach_workspace
      - *init_environment
-      - *yarn_install
      - *setup_circleci_bazel_config

      # Setup remote execution and run RBE-compatible tests.
@ -125,11 +187,8 @@ jobs:
    <<: *job_defaults
    resource_class: xlarge
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
+      - *attach_workspace
      - *init_environment
-      - *yarn_install
      - *setup_circleci_bazel_config
      - *setup_bazel_remote_execution

@ -163,9 +222,7 @@ jobs:
      # Needed because the AIO tests and the PWA score test depend on Chrome being available.
      - image: *browsers_docker_image
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
+      - *attach_workspace
      - *init_environment
        # Build aio
      - run: yarn --cwd aio build --progress=false
@ -190,9 +247,7 @@ jobs:
    # Needed because before deploying the deploy-production script runs the PWA score tests.
    - image: *browsers_docker_image
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
+      - *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/')"
@ -204,11 +259,7 @@ jobs:
      # Needed because the AIO tests and the PWA score test depend on Chrome being available.
      - image: *browsers_docker_image
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
-      - attach_workspace:
-          at: dist
+      - *attach_workspace
      - *init_environment
        # Build aio (with local Angular packages)
      - run: yarn --cwd aio build-local --progress=false
@ -223,11 +274,7 @@ jobs:
  test_aio_local_ivy:
    <<: *job_defaults
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
-      - attach_workspace:
-          at: dist
+      - *attach_workspace
      - *init_environment
        # Build aio with Ivy (using local Angular packages)
      - run: yarn --cwd aio build-with-ivy --progress=false
@ -235,11 +282,7 @@ jobs:
  test_aio_tools:
    <<: *job_defaults
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
-      - attach_workspace:
-          at: dist
+      - *attach_workspace
      - *init_environment
        # Install
      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
@ -255,11 +298,7 @@ jobs:
      - image: *browsers_docker_image
    parallelism: 3
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
-      - attach_workspace:
-          at: dist
+      - *attach_workspace
      - *init_environment
        # Install aio
      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
@ -275,11 +314,7 @@ jobs:
      - image: *browsers_docker_image
    parallelism: 3
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
-      - attach_workspace:
-          at: dist
+      - *attach_workspace
      - *init_environment
        # Install aio
      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
@ -294,9 +329,7 @@ jobs:
    environment:
       AIO_SNAPSHOT_ARTIFACT_PATH: &aio_preview_artifact_path 'aio/tmp/snapshot.tgz'
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
+      - *attach_workspace
      - *init_environment
      - run: ./aio/scripts/build-artifacts.sh $AIO_SNAPSHOT_ARTIFACT_PATH $CI_PULL_REQUEST $CI_COMMIT
      - store_artifacts:
@ -313,9 +346,7 @@ jobs:
      # Needed because the test-preview script runs e2e tests and the PWA score test with Chrome.
      - image: *browsers_docker_image
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
+      - *attach_workspace
      - *init_environment
      - run: yarn --cwd aio install --frozen-lockfile --non-interactive
      - run:
@ -335,51 +366,44 @@ jobs:
    <<: *job_defaults
    resource_class: xlarge
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
+      - *attach_workspace
      - *init_environment
-      - *yarn_install
      - *setup_circleci_bazel_config
      - *setup_bazel_remote_execution

      - run: scripts/build-packages-dist.sh

      # Save the npm packages from //packages/... for other workflow jobs to read
-      # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
      - persist_to_workspace:
-          root: dist
+          root: ~/
          paths:
-            - packages-dist
+            - ng/dist/packages-dist

+      # Save dependencies and bazel repository cache to use on subsequent runs.
      - save_cache:
          key: *cache_key
          paths:
            - "node_modules"
+            - "aio/node_modules"
            - "~/bazel_repository_cache"

-
  # Build the ivy npm packages.
  build-ivy-npm-packages:
    <<: *job_defaults
    resource_class: xlarge
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
+      - *attach_workspace
      - *init_environment
-      - *yarn_install
      - *setup_circleci_bazel_config
      - *setup_bazel_remote_execution

      - run: scripts/build-ivy-npm-packages.sh

      # Save the npm packages from //packages/... for other workflow jobs to read
-      # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
      - persist_to_workspace:
-          root: dist
+          root: ~/
          paths:
-            - packages-dist-ivy-aot
+            - ng/dist/packages-dist-ivy-aot

  # We run the integration tests outside of Bazel for now.
  # They are a separate workflow job so that they can be easily re-run.
@ -398,14 +422,8 @@ jobs:
    # on a 4G worker so we use a larger machine here too.
    resource_class: xlarge
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
-      - attach_workspace:
-          at: dist
+      - *attach_workspace
      - *init_environment
-      # Some integration tests get their dependencies from the root `node_modules/`.
-      - *yarn_install
      # Runs the integration tests in parallel across multiple CircleCI container instances. The
      # amount of container nodes for this job is controlled by the "parallelism" option.
      - run: ./integration/run_tests.sh ${CIRCLE_NODE_INDEX} ${CIRCLE_NODE_TOTAL}
@ -415,8 +433,7 @@ jobs:
  publish_snapshot:
    <<: *job_defaults
    steps:
-      - checkout:
-          <<: *post_checkout
+      - *attach_workspace
      - *init_environment
      # See below - ideally this job should not trigger for non-upstream builds.
      # But since it does, we have to check this condition.
@ -428,8 +445,6 @@ jobs:
              || "$CI_REPO_OWNER" != "angular"
              || "$CI_REPO_NAME" != "angular"
          ]] && circleci step halt || true'
-      - attach_workspace:
-          at: dist
      # CircleCI has a config setting to force SSH for all github connections
      # This is not compatible with our mechanism of using a Personal Access Token
      # Clear the global setting
@ -446,9 +461,7 @@ jobs:
      # 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:
          name: Run tests against the deployed apps
@ -460,20 +473,6 @@ jobs:
          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

-  legacy-unit-tests-local:
-    <<: *job_defaults
-    docker:
-      - image: *browsers_docker_image
-    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
-      - *init_environment
-      - *yarn_install
-      - run: yarn tsc -p packages
-      - run: yarn tsc -p modules
-      - run: yarn karma start ./karma-js.conf.js --single-run --browsers=ChromeNoSandbox
-
  legacy-unit-tests-saucelabs:
    <<: *job_defaults
    # In order to avoid the bottleneck of having a slow host machine, we acquire a better
@ -481,11 +480,8 @@ jobs:
    # and therefore the tunnel and Karma need to process a lot of file requests and tests.
    resource_class: xlarge
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
+      - *attach_workspace
      - *init_environment
-      - *yarn_install
      - run:
          name: Preparing environment for running tests on Saucelabs.
          command: |
@ -506,13 +502,8 @@ jobs:
  legacy-misc-tests:
    <<: *job_defaults
    steps:
-      - checkout:
-          <<: *post_checkout
-      - *restore_cache
+      - *attach_workspace
      - *init_environment
-      - *yarn_install
-      - attach_workspace:
-          at: dist
      - run: yarn gulp check-cycle
      # TODO: disabled because the Bazel packages-dist does not seem to have map files for
      # the ESM5/ES2015 output. See: https://github.com/angular/angular/issues/27966
@ -522,13 +513,22 @@ workflows:
  version: 2
  default_workflow:
    jobs:
-      - lint
-      - test
-      - test_ivy_aot
-      - build-npm-packages
-      - test_aio
-      - legacy-unit-tests-local
-      - legacy-unit-tests-saucelabs
+      - setup
+      - lint:
+          requires:
+          - setup
+      - test:
+          requires:
+          - setup
+      - test_ivy_aot:
+          requires:
+          - setup
+      - build-npm-packages:
+          requires:
+          - setup
+      - test_aio:
+          requires:
+          - setup
      - deploy_aio:
          requires:
            - test_aio
@ -551,6 +551,8 @@ workflows:
      #     requires:
      #       - build-npm-packages
      - aio_preview:
+          requires:
+            - setup
          # Only run on PR builds. (There can be no previews for non-PR builds.)
          filters:
            branches:
@ -580,15 +582,29 @@ workflows:
            # since the publishing script expects the legacy outputs layout.
            - build-npm-packages
            - legacy-misc-tests
-            - legacy-unit-tests-local
-            - legacy-unit-tests-saucelabs

+  saucelabs_tests:
+    jobs:
+      - setup
+      - legacy-unit-tests-saucelabs:
+          requires:
+            - setup
+    triggers:
+      - schedule:
+          # Runs the Saucelabs legacy tests every hour. We still want to run Saucelabs
+          # frequently as the caretaker needs up-to-date results when merging PRs or creating
+          # a new release. Also we primarily moved the Saucelabs job into a cronjob that doesn't
+          # run for PRs, in order to ensure that PRs are not affected by Saucelabs flakiness or
+          # incidents. This is still guaranteed (even if we run the job every hour).
+          cron: "0 * * * *"
+          filters: *publish_branches_filter

  aio_monitoring:
    jobs:
      - aio_monitoring
    triggers:
      - schedule:
+          # Runs AIO monitoring job at 00:00AM every day.
          cron: "0 0 * * *"
          filters:
            branches:
--- a/.circleci/env.sh
+++ b/.circleci/env.sh
@ -62,12 +62,5 @@ setPublicVar SAUCE_TUNNEL_IDENTIFIER "angular-${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_
 setPublicVar SAUCE_READY_FILE_TIMEOUT 120


-####################################################################################################
-# Define our own yarn command for CircleCI.
-####################################################################################################
-echo "function yarn () { /usr/bin/env node $projectDir/third_party/github.com/yarnpkg/yarn/releases/download/v1.13.0/bin/yarn.js \"\$@\"; }" >> $BASH_ENV;
-echo "export -f yarn;" >> $BASH_ENV;
-
-
 # Source `$BASH_ENV` to make the variables available immediately.
 source $BASH_ENV;
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,15 @@
+<a name="7.2.7"></a>
+## [7.2.7](https://github.com/angular/angular/compare/7.2.6...7.2.7) (2019-02-27)
+
+
+### Bug Fixes
+
+* **bazel:** pin browser repositories using [@npm](https://github.com/npm)_bazel_karma//:browser_repositories.bzl in bazel schematics ([#28896](https://github.com/angular/angular/issues/28896)) ([b686449](https://github.com/angular/angular/commit/b686449))
+* **core:** traverse and sanitize content of unsafe elements ([#28804](https://github.com/angular/angular/issues/28804)) ([fdcf877](https://github.com/angular/angular/commit/fdcf877)), closes [#25879](https://github.com/angular/angular/issues/25879) [#25879](https://github.com/angular/angular/issues/25879) [#26007](https://github.com/angular/angular/issues/26007) [#28427](https://github.com/angular/angular/issues/28427)
+* **language-service:** Fix completions for input/output with alias ([#28904](https://github.com/angular/angular/issues/28904)) ([d0018e6](https://github.com/angular/angular/commit/d0018e6)), closes [#27959](https://github.com/angular/angular/issues/27959)
+
+
+
 <a name="7.2.6"></a>
 ## [7.2.6](https://github.com/angular/angular/compare/7.2.5...7.2.6) (2019-02-20)

--- a/17
+++ b/17
@ -8,7 +8,7 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 #    path = "../rules_nodejs",
 #)
 #local_repository(
-#    name = "build_bazel_rules_typescript",
+#    name = "npm_bazel_typescript",
 #    path = "../rules_typescript",
 #)

@ -19,15 +19,6 @@ http_archive(
    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.18.6/rules_nodejs-0.18.6.tar.gz"],
 )

-# Fetch the rxjs repository since we build rxjs from source
-# TODO(gregmagolan): use rxjs bundles in the bazel build
-http_archive(
-    name = "rxjs",
-    sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
-    strip_prefix = "package/src",
-    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
-)
-
 # Use a mock @npm repository while we are building angular from source
 # downstream. Angular will get its npm dependencies with in @ngdeps which
 # is setup in ng_setup_workspace().
@ -76,7 +67,7 @@ load("//packages/bazel:package.bzl", "rules_angular_dev_dependencies")
 rules_angular_dev_dependencies()

 # Load karma dependencies
-load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies")
+load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies")

 rules_karma_dependencies()

@ -87,12 +78,12 @@ web_test_repositories()

 # Temporary work-around for https://github.com/angular/angular/issues/28681
 # TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
-load("@angular//:browser_repositories.bzl", "browser_repositories")
+load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")

 browser_repositories()

 # Setup the rules_typescript tooolchain
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
+load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")

 ts_setup_workspace()

--- a/aio/content/examples/structural-directives/src/app/app.component.html
+++ b/aio/content/examples/structural-directives/src/app/app.component.html
@ -152,7 +152,7 @@
 <div [ngSwitch]="hero?.emotion">
  <app-happy-hero    *ngSwitchCase="'happy'"    [hero]="hero"></app-happy-hero>
  <app-sad-hero      *ngSwitchCase="'sad'"      [hero]="hero"></app-sad-hero>
-  <app-confused-hero *ngSwitchCase="'app-confused'" [hero]="hero"></app-confused-hero>
+  <app-confused-hero *ngSwitchCase="'confused'" [hero]="hero"></app-confused-hero>
  <app-unknown-hero  *ngSwitchDefault           [hero]="hero"></app-unknown-hero>
 </div>
 <!-- #enddocregion built-in, ngswitch -->
--- a/aio/content/examples/styleguide/src/04-11/app/core/nav/nav.component.css
+++ b/aio/content/examples/styleguide/src/04-11/app/core/nav/nav.component.css
@ -32,8 +32,6 @@
  height: 56px;
  padding: 0 16px 0 72px;
  padding-left: 8px;
-  background-color: #673AB7;
-  background: #0033FF;
  background-color: #222;
 }

--- a/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.css
+++ b/aio/content/examples/styleguide/src/04-11/app/core/spinner/spinner.component.css
@ -1,6 +1,5 @@
 /*#docregion*/
 .spinner {
-  position: absolute;
  left: 7em;
  top: 20em;
  position: absolute;
--- a/aio/content/examples/styleguide/src/04-12/app/core/nav/nav.component.css
+++ b/aio/content/examples/styleguide/src/04-12/app/core/nav/nav.component.css
@ -32,8 +32,6 @@
  height: 56px;
  padding: 0 16px 0 72px;
  padding-left: 8px;
-  background-color: #673AB7;
-  background: #0033FF;
  background-color: #222;
 }

--- a/aio/content/guide/architecture-modules.md
+++ b/aio/content/guide/architecture-modules.md
@ -1,6 +1,6 @@
 # Introduction to modules

-Angular apps are modular and Angular has its own modularity system called *NgModules*. 
+Angular apps are modular and Angular has its own modularity system called *NgModules*.
 NgModules are containers for a cohesive block of code dedicated to an application domain, a workflow, or a closely related set of capabilities. They can contain components, service providers, and other code files whose scope is defined by the containing NgModule. They can import functionality that is exported from other NgModules, and export selected functionality for use by other NgModules.

 Every Angular app has at least one NgModule class, [the *root module*](guide/bootstrapping), which is conventionally named `AppModule` and resides in a file named `app.module.ts`. You launch your app by *bootstrapping* the root NgModule.
@ -27,7 +27,7 @@ Here's a simple root NgModule definition.

 <div class="alert is-helpful">

-   The `export` property of `AppComponent` is included here for illustration; it isn't actually necessary in this example. A root NgModule has no reason to *export* anything because other modules don't need to *import* the root NgModule.
+  `AppComponent` is included in the `exports` list here for illustration; it isn't actually necessary in this example. A root NgModule has no reason to *export* anything because other modules don't need to *import* the root NgModule.

 </div>

@ -89,7 +89,7 @@ For example, import Angular's `Component` decorator from the `@angular/core` lib

 <code-example path="architecture/src/app/app.component.ts" region="import" linenums="false"></code-example>

-You also import NgModules from Angular *libraries* using JavaScript import statements. 
+You also import NgModules from Angular *libraries* using JavaScript import statements.
 For example, the following code imports the `BrowserModule` NgModule from the `platform-browser` library.

 <code-example path="architecture/src/app/mini-app.ts" region="import-browser-module" linenums="false"></code-example>
--- a/aio/content/guide/dependency-injection.md
+++ b/aio/content/guide/dependency-injection.md
@ -182,8 +182,7 @@ Child modules and component injectors are independent of each other, and create

 Thanks to [injector inheritance](guide/hierarchical-dependency-injection),
 you can still inject application-wide services into these components.
-A component's injector is a child of its parent component's injector,
-and a descendent of its parent's parent's injector, and so on all the way back to the application's _root_ injector. Angular can inject a service provided by any injector in that lineage.
+A component's injector is a child of its parent component's injector, and inherits from all ancestor injectors all the way back to the application's _root_ injector. Angular can inject a service provided by any injector in that lineage.

 For example, Angular can inject `HeroListComponent` with both the `HeroService` provided in `HeroComponent` and the `UserService` provided in `AppModule`.

--- a/aio/content/guide/http.md
+++ b/aio/content/guide/http.md
@ -865,6 +865,9 @@ with the `reportProgress` option set true to enable tracking of progress events.

 Every progress event triggers change detection, so only turn them on if you truly intend to report progress in the UI.

+When using [`HttpClient#request()`](api/common/http/HttpClient#request) with an HTTP method, configure with
+[`observe: 'events'`](api/common/http/HttpClient#request) to see all events, including the progress of transfers.
+
 </div>

 Next, pass this request object to the `HttpClient.request()` method, which
--- a/aio/content/images/bios/leonardo.jpg
+++ b/aio/content/images/bios/leonardo.jpg
--- a/aio/content/marketing/contributors.json
+++ b/aio/content/marketing/contributors.json
@ -651,5 +651,13 @@
    "website": "https://medium.com/@sharondio",
    "bio": "Sharon is a mother to four teenagers, wife of a USMC veteran/police officer, and lead front-end engineer for an educational non-profit in Boston. In her spare time, she is the \"Head Instigator\" of the Angular-Boston Meetup and an active member of the Boston meetups community. She occasionally speaks on Angular and related topics at technology conferences across the country. She has a Bachelor of Fine Arts from SMU and a Masters with honors from RTFM.",
    "group": "GDE"
+  },
+  "leonardozizzamia": {
+    "name": "Leonardo Zizzamia",
+    "picture": "leonardo.jpg",
+    "twitter": "zizzamia",
+    "website": "https://medium.com/@zizzamia",
+    "bio": "Leonardo is a Senior Software Engineer at Coinbase. He is deeply passionate about web performance and most recently developed Perfume.js to help companies prioritize roadmaps and business, through performance analytics. From 2018, co-organizer of the Angular San Francisco Meetup group and NGRome Conference.",
+    "group": "GDE"
  }
 }
--- a/aio/content/marketing/events.html
+++ b/aio/content/marketing/events.html
@ -25,6 +25,12 @@
      <td>Gurgaon, India</td>
      <td>February 23, 2019</td>
    </tr>
+    <!-- ngVikings 2019-->
+    <tr>
+      <th><a href="https://ngvikings.org/" title="ngVikings">ngVikings</a></th>
+      <td>Copenhagen, Denmark</td>
+      <td>May 26th Workshops, 27-28 conference, 2019</td>
+    </tr>
    </tbody>
  </table>

--- a/aio/content/marketing/resources.json
+++ b/aio/content/marketing/resources.json
@ -66,7 +66,7 @@
            "url": "https://angularair.com/"
          },
          "sdlkfjsldfkz": {
-            "desc": "A weekly German podcast: Compact knowledge about Angular for take away",
+            "desc": "A weekly German podcast for Angular on the go",
            "logo": "",
            "rev": true,
            "title": "Happy Angular Podcast",
@ -415,6 +415,12 @@
            "rev": true,
            "title": "ag-Grid",
            "url": "https://www.ag-grid.com/best-angular-2-data-grid/"
+          },          
+          "fancygrid": {
+            "desc": "Angular grid library with charts integration and server communication for Enterprise.",
+            "rev": true,
+            "title": "FancyGrid",
+            "url": "https://fancygrid.com/docs/getting-started/angular"
          },
          "jqwidgets": {
            "desc": "Angular UI Components including data grid, tree grid, pivot grid, scheduler, charts, editors and other multi-purpose components",
@ -466,6 +472,12 @@
            "rev": true,
            "title": "Alyle UI",
            "url": "https://alyle-ui.firebaseapp.com/"
+          },
+          "nebular": {
+            "desc": "Theme System, UI Components, Auth and Security for your next Angular application.",
+            "rev": true,
+            "title": "Nebular",
+            "url": "https://akveo.github.io/nebular/"
          }
        }
      }
@ -819,6 +831,12 @@
            "title": "Formation JavaScript (French)",
            "url": "https://formationjavascript.com/formation-angular/"
          },
+          "humancoders-angular": {
+            "desc": "Angular trainings delivered by Human Coders (France)",
+            "rev": true,
+            "title": "Formation Angular (French)",
+            "url": "https://www.humancoders.com/formations/angular"
+          },
          "wao": {
            "desc": "Onsite Angular Training delivered by We Are One Sàrl in Switzerland",
            "logo": "https://weareone.ch/wordpress/wao-content/uploads/2014/12/logo_200_2x.png",
--- a/aio/content/tutorial/toh-pt1.md
+++ b/aio/content/tutorial/toh-pt1.md
@ -13,7 +13,7 @@ Using the Angular CLI, generate a new component named `heroes`.
 </code-example>

 The CLI creates a new folder, `src/app/heroes/`, and generates
-the three files of the  `HeroesComponent`.
+the four files of the  `HeroesComponent`.

 The `HeroesComponent` class file is as follows:

--- a/aio/src/index.html
+++ b/aio/src/index.html
@ -1,22 +1,21 @@
 <!doctype html>
-<html>
+<html lang="en">
+
 <head>
  <meta charset="utf-8">
-  <title>Angular Docs</title>
+  <title>Angular</title>
+  <meta name="Description" content="Angular is a platform for building mobile and desktop web applications.
+    Join the community of millions of developers who build compeling user interfaces with Angular.">
  <base href="/">

  <meta name="viewport" content="width=device-width, initial-scale=1">

  <link rel="search" type="application/opensearchdescription+xml" href="assets/opensearch.xml">
  <link rel="icon" type="image/x-icon" href="assets/images/favicons/favicon.ico">
-  <link rel="icon" type="image/png" href="assets/images/favicons/favicon-32x32.png"
-        sizes="32x32">
-  <link rel="icon" type="image/png" href="assets/images/favicons/favicon-194x194.png"
-        sizes="194x194">
-  <link rel="icon" type="image/png" href="assets/images/favicons/favicon-96x96.png"
-        sizes="96x96">
-  <link rel="icon" type="image/png" href="assets/images/favicons/favicon-16x16.png"
-        sizes="16x16">
+  <link rel="icon" type="image/png" href="assets/images/favicons/favicon-32x32.png" sizes="32x32">
+  <link rel="icon" type="image/png" href="assets/images/favicons/favicon-194x194.png" sizes="194x194">
+  <link rel="icon" type="image/png" href="assets/images/favicons/favicon-96x96.png" sizes="96x96">
+  <link rel="icon" type="image/png" href="assets/images/favicons/favicon-16x16.png" sizes="16x16">
  <link rel="apple-touch-icon" sizes="144x144" href="assets/images/favicons/favicon-144x144.png">
  <link rel="apple-touch-icon-precomposed" sizes="144x144" href="assets/images/favicons/favicon-144x144.png">

@ -39,39 +38,41 @@

  <!-- Google Analytics -->
  <script>
-  // Note this is a customised version of the GA tracking snippet
-  // See the comments below for more info
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;
-  ~i.name.indexOf('NG_DEFER_BOOTSTRAP')|| // only load library if not running e2e tests
-  m.parentNode.insertBefore(a,m)
-  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+    // Note this is a customised version of the GA tracking snippet
+    // See the comments below for more info
+    (function (i, s, o, g, r, a, m) {
+      i['GoogleAnalyticsObject'] = r; i[r] = i[r] || function () {
+        (i[r].q = i[r].q || []).push(arguments)
+      }, i[r].l = 1 * new Date(); a = s.createElement(o),
+        m = s.getElementsByTagName(o)[0]; a.async = 1; a.src = g;
+      ~i.name.indexOf('NG_DEFER_BOOTSTRAP') || // only load library if not running e2e tests
+        m.parentNode.insertBefore(a, m)
+    })(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
  </script>
  <!-- End Google Analytics -->

  <script>
    // Report fatal errors to Google Analytics
-    window.onerror = function() {
-      ga('send', 'exception', {exDescription: formatError.apply(null, arguments), exFatal: true});
+    window.onerror = function () {
+      ga('send', 'exception', { exDescription: formatError.apply(null, arguments), exFatal: true });

      function formatError(msg, url, line, col, e) {
        var stack;
        msg = msg.replace(/^Error: /, '');
        if (e) {
          stack = e.stack
-              // strip the leading "Error: " from the stack trace
-              .replace(/^Error: /, '')
-              // strip the message from the stack trace, if present
-              .replace(msg + '\n', '')
-              // strip leading spaces
-              .replace(/^ +/gm, '')
-              // strip all leading "at " for each frame
-              .replace(/^at /gm, '')
-              // replace long urls with just the last segment: `filename:line:column`
-              .replace(/(?: \(|@)http.+\/([^/)]+)\)?(?:\n|$)/gm, '@$1\n')
-              // replace "eval code" in Edge
-              .replace(/ *\(eval code(:\d+:\d+)\)(?:\n|$)/gm, '@???$1\n')
+            // strip the leading "Error: " from the stack trace
+            .replace(/^Error: /, '')
+            // strip the message from the stack trace, if present
+            .replace(msg + '\n', '')
+            // strip leading spaces
+            .replace(/^ +/gm, '')
+            // strip all leading "at " for each frame
+            .replace(/^at /gm, '')
+            // replace long urls with just the last segment: `filename:line:column`
+            .replace(/(?: \(|@)http.+\/([^/)]+)\)?(?:\n|$)/gm, '@$1\n')
+            // replace "eval code" in Edge
+            .replace(/ *\(eval code(:\d+:\d+)\)(?:\n|$)/gm, '@???$1\n')
        } else {
          line = line || '?';
          col = col || '?';
@ -85,6 +86,7 @@
  <script nomodule src="generated/ie-polyfills.min.js"></script>

 </head>
+
 <body>

  <aio-shell></aio-shell>
@ -104,4 +106,5 @@
    </h2>
  </noscript>
 </body>
+
 </html>
--- a/aio/src/styles/2-modules/_toc.scss
+++ b/aio/src/styles/2-modules/_toc.scss
@ -138,9 +138,7 @@ aio-toc.embedded {
      }

      a {
-        font-size: inherit;
        color: lighten($darkgray, 10);
-        display:table-cell;
        overflow: visible;
        font-size: 12px;
        display: table-cell;
--- a/browser_repositories.bzl
+++ b/browser_repositories.bzl
@ -1,113 +0,0 @@
-# Copyright 2018 The Bazel Authors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Pinned browser versions.
-
-This function is here temporarily to fix https://github.com/angular/angular/issues/28681.
-It will be removed once the browser versions are fixed upstream and we can pull
-working versions from rules_webtesting browser_repositories().
-
-TODO(gregmagolan): remove this file once we have working browser versions from rules_webtesting.
-"""
-
-load("@io_bazel_rules_webtesting//web/internal:platform_http_file.bzl", "platform_http_file")
-
-def browser_repositories():
-    """Load pinned rules_webtesting browser versions."""
-
-    platform_http_file(
-        name = "org_chromium_chromium",
-        amd64_sha256 =
-            "941de83d78b27d43db07f427136ba159d661bb111db8d9ffe12499b863a003e1",
-        amd64_urls = [
-            # Chromium 69.0.3497.0 (2018-07-19 snaphot 576668)
-            # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Linux_x64/576668/
-            "https://commondatastorage.googleapis.com/chromium-browser-snapshots/Linux_x64/576668/chrome-linux.zip",
-        ],
-        licenses = ["notice"],  # BSD 3-clause (maybe more?)
-        macos_sha256 =
-            "bd01783e7d179e9f85d4b6f0c9df53118d13977cc7d365a1caa9d198c6afcfd8",
-        macos_urls = [
-            # Chromium 69.0.3497.0 (2018-07-19 snaphot 576668)
-            # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Mac/576668/
-            "https://commondatastorage.googleapis.com/chromium-browser-snapshots/Mac/576668/chrome-mac.zip",
-        ],
-        windows_sha256 =
-            "2997d6231867688a2bceb49af1d8dbdbe6ea5de848b98d686d40dd153ae4d271",
-        windows_urls = [
-            # Chromium 69.0.3497.0 (2018-07-19 snaphot 576668)
-            # https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html?prefix=Win_x64/576668/
-            "https://commondatastorage.googleapis.com/chromium-browser-snapshots/Win_x64/576668/chrome-win32.zip",
-        ],
-    )
-
-    platform_http_file(
-        name = "org_chromium_chromedriver",
-        amd64_sha256 =
-            "687d2e15c42908e2911344c08a949461b3f20a83017a7a682ef4d002e05b5d46",
-        amd64_urls = [
-            # ChromeDriver 2.44 supports Chrome v69-71
-            # http://chromedriver.chromium.org/downloads
-            "https://chromedriver.storage.googleapis.com/2.44/chromedriver_linux64.zip",
-        ],
-        licenses = ["reciprocal"],  # BSD 3-clause, ICU, MPL 1.1, libpng (BSD/MIT-like), Academic Free License v. 2.0, BSD 2-clause, MIT
-        macos_sha256 =
-            "3fd49c2782a5f93cb48ff2dee021004d9a7fb393798e4c4807b391cedcd30ed9",
-        macos_urls = [
-            # ChromeDriver 2.44 supports Chrome v69-71
-            # http://chromedriver.chromium.org/downloads
-            "https://chromedriver.storage.googleapis.com/2.44/chromedriver_mac64.zip",
-        ],
-        windows_sha256 =
-            "5d2d2ddb2ed3730672484160c822b75b41c4e77f9cadb5111530699d561c548c",
-        windows_urls = [
-            # ChromeDriver 2.44 supports Chrome v69-71
-            # http://chromedriver.chromium.org/downloads
-            "https://chromedriver.storage.googleapis.com/2.44/chromedriver_win32.zip",
-        ],
-    )
-
-    platform_http_file(
-        name = "org_mozilla_firefox",
-        amd64_sha256 =
-            "3a729ddcb1e0f5d63933177a35177ac6172f12edbf9fbbbf45305f49333608de",
-        amd64_urls = [
-            "https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2",
-            "https://ftp.mozilla.org/pub/firefox/releases/61.0.2/linux-x86_64/en-US/firefox-61.0.2.tar.bz2",
-        ],
-        licenses = ["reciprocal"],  # MPL 2.0
-        macos_sha256 =
-            "bf23f659ae34832605dd0576affcca060d1077b7bf7395bc9874f62b84936dc5",
-        macos_urls = [
-            "https://mirror.bazel.build/ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg",
-            "https://ftp.mozilla.org/pub/firefox/releases/61.0.2/mac/en-US/Firefox%2061.0.2.dmg",
-        ],
-    )
-
-    platform_http_file(
-        name = "org_mozilla_geckodriver",
-        amd64_sha256 =
-            "c9ae92348cf00aa719be6337a608fae8304691a95668e8e338d92623ba9e0ec6",
-        amd64_urls = [
-            "https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz",
-            "https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-linux64.tar.gz",
-        ],
-        licenses = ["reciprocal"],  # MPL 2.0
-        macos_sha256 =
-            "ce4a3e9d706db94e8760988de1ad562630412fa8cf898819572522be584f01ce",
-        macos_urls = [
-            "https://mirror.bazel.build/github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz",
-            "https://github.com/mozilla/geckodriver/releases/download/v0.21.0/geckodriver-v0.21.0-macos.tar.gz",
-        ],
-    )
--- a/docs/BAZEL.md
+++ b/docs/BAZEL.md
@ -22,7 +22,7 @@ You can access Bazel with the `yarn bazel` command

 The `WORKSPACE` file indicates that our root directory is a
 Bazel project. It contains the version of the Bazel rules we
-use to execute build steps, from `build_bazel_rules_typescript`.
+use to execute build steps, from `npm_bazel_typescript`.
 The sources on [GitHub] are published from Google's internal
 repository (google3).

--- a/integration/bazel-schematics/package.json.replace
+++ b/integration/bazel-schematics/package.json.replace
@ -20,7 +20,7 @@
    "@angular/platform-browser-dynamic": "file:../angular/dist/packages-dist/platform-browser-dynamic",
    "@angular/router": "file:../angular/dist/packages-dist/router",
    "core-js": "^2.5.4",
-    "rxjs": "~6.3.3",
+    "rxjs": "~6.4.0",
    "tslib": "^1.9.0",
    "zone.js": "~0.8.26"
  },
@ -32,8 +32,8 @@
    "@angular/language-service": "file:../angular/dist/packages-dist/language-service",
    "@bazel/bazel": "^0.21.0",
    "@bazel/ibazel": "^0.9.0",
-    "@bazel/karma": "^0.23.2",
-    "@bazel/typescript": "^0.23.2",
+    "@bazel/karma": "^0.25.1",
+    "@bazel/typescript": "^0.25.1",
    "@types/node": "~8.9.4",
    "@types/jasmine": "~2.8.8",
    "@types/jasminewd2": "~2.0.3",
--- a/integration/bazel-schematics/yarn.lock
+++ b/integration/bazel-schematics/yarn.lock
@ -68,12 +68,12 @@
    rxjs "6.3.3"

 "@angular/bazel@file:../../dist/packages-dist/bazel":
-  version "8.0.0-beta.2"
+  version "7.2.6"
  dependencies:
    "@angular-devkit/architect" "^0.10.6"
    "@angular-devkit/core" "^7.0.4"
    "@angular-devkit/schematics" "^7.3.0-rc.0"
-    "@bazel/typescript" "^0.23.2"
+    "@bazel/typescript" "^0.25.1"
    "@schematics/angular" "^7.0.4"
    "@types/node" "6.0.84"
    semver "^5.6.0"
@ -119,10 +119,10 @@
    "@bazel/bazel-linux_x64" "0.22.0"
    "@bazel/bazel-win32_x64" "0.22.0"

-"@bazel/typescript@^0.23.2":
-  version "0.23.2"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.23.2.tgz#a3ff199880855259d84216cb41644c1d9a0fad14"
-  integrity sha512-GrTyDW6Fvp/rgnxZGYampB5/QmDWvxtLEtUyMCPa/QXFR1OVxaMWeHxxuFEcES2UKJegqBDKAA8IzX21x4UbEw==
+"@bazel/typescript@^0.25.1":
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.25.1.tgz#71564de50ff6976fb37d90f2f7a479e87b158943"
+  integrity sha512-QFitUUXIWQMfVk5EwI9J9d5iNPfT+kUjPbahiJbJVZz1Fz9zNZ8+CR6FESfnxuUKlZK3Oy0VWFcz7mlHaceL/Q==
  dependencies:
    jasmine-core "2.8.0"
    protobufjs "5.0.3"
--- a/integration/bazel/WORKSPACE
+++ b/integration/bazel/WORKSPACE
@ -17,22 +17,6 @@ http_archive(
    url = "https://github.com/bazelbuild/rules_sass/archive/1.11.0.zip",
 )

-# Fetch the angular repository since we build angular from source
-# TODO(gregmagolan): use angular bundles in the Bazel build
-local_repository(
-    name = "angular",
-    path = "../..",
-)
-
-# Fetch the rxjs repository since we build rxjs from source
-# TODO(gregmagolan): use rxjs bundles in the Bazel build
-http_archive(
-    name = "rxjs",
-    sha256 = "72b0b4e517f43358f554c125e40e39f67688cd2738a8998b4a266981ed32f403",
-    strip_prefix = "package/src",
-    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz",
-)
-
 # Check the bazel version and download npm dependencies
 load("@build_bazel_rules_nodejs//:defs.bzl", "check_bazel_version", "node_repositories", "yarn_install")

@ -59,9 +43,6 @@ yarn_install(
    data = [
        # Needed because this tsconfig file is used in the "postinstall" script.
        "//:angular-metadata.tsconfig.json",
-        # Need a reference to @angular here so that Bazel sets up the
-        # external repository before calling yarn_install
-        "@angular//:LICENSE",
    ],
    package_json = "//src:package.json",
    yarn_lock = "//src:yarn.lock",
@ -73,7 +54,7 @@ load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
 install_bazel_dependencies()

 # Load karma dependencies
-load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies")
+load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies")

 rules_karma_dependencies()

@ -84,12 +65,12 @@ web_test_repositories()

 # Temporary work-around for https://github.com/angular/angular/issues/28681
 # TODO(gregmagolan): go back to @io_bazel_rules_webtesting browser_repositories
-load("@angular//:browser_repositories.bzl", "browser_repositories")
+load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")

 browser_repositories()

 # Setup the rules_typescript tooolchain
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
+load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")

 ts_setup_workspace()

@ -102,6 +83,6 @@ sass_repositories()
 # but we still need to set up the "angular" workspace since some Bazel rules depend on
 # the "ngdeps" repository. This can be fixed if we switched the Angular repository to the
 # "npm" repository for the bazel managed dependencies.
-load("@angular//:index.bzl", "ng_setup_workspace")
+load("@npm_angular_bazel//:index.bzl", "ng_setup_workspace")

 ng_setup_workspace()
--- a/integration/bazel/package.json
+++ b/integration/bazel/package.json
@ -11,6 +11,7 @@
  "scripts": {
    "//": "deps are listed in src/package.json which is used by yarn_install",
    "//": "this package.json file is only here so that `yarn test` can be called by /integration/run_tests.sh",
+    "pretest": "./pretest.sh",
    "test": "bazel build ... --noshow_progress && bazel test ..."
  }
-}
+}
--- a/integration/bazel/pretest.sh
+++ b/integration/bazel/pretest.sh
@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+
+set -eux -o pipefail
+# -e: exits if a command fails
+# -u: errors if an variable is referenced before being set
+# -x: shows the commands that get run
+# -o pipefail: causes a pipeline to produce a failure return code if any command errors
+
+# sedi makes `sed -i` work on both OSX & Linux
+# See https://stackoverflow.com/questions/2320564/i-need-my-sed-i-command-for-in-place-editing-to-work-with-both-gnu-sed-and-bsd
+sedi () {
+  case $(uname) in
+    Darwin*) sedi=('-i' '') ;;
+    *) sedi='-i' ;;
+  esac
+
+  sed "${sedi[@]}" "$@"
+}
+
+sedi "s#packages-dist:#file://$PWD/../../dist/packages-dist/#" src/package.json
--- a/integration/bazel/src/BUILD.bazel
+++ b/integration/bazel/src/BUILD.bazel
@ -1,6 +1,9 @@
 package(default_visibility = ["//visibility:public"])

-load("@angular//:index.bzl", "ng_module")
+load("@npm_angular_bazel//:index.bzl", "ng_module")
+load("@build_bazel_rules_nodejs//:defs.bzl", "http_server", "nodejs_binary", "rollup_bundle")
+load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 # Allow targets under sub-packages to reference the tsconfig.json file
 exports_files(["tsconfig.json"])
@ -14,40 +17,38 @@ ng_module(
        "@npm//@angular/core",
        "@npm//@angular/platform-browser",
        "@npm//@types",
+        "@npm//rxjs",
    ],
 )

-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+filegroup(
+    name = "rxjs_umd_modules",
+    srcs = [
+        # do not sort
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        ":rxjs_shims.js",
+    ],
+)

 ts_devserver(
    name = "devserver",
-    additional_root_paths = [
-        "npm/node_modules/tslib",
-        "npm/node_modules/zone.js/dist",
-    ],
    entry_module = "bazel_integration_test/src/main",
+    index_html = "index.html",
    scripts = [
        "@npm//node_modules/@angular/common:bundles/common.umd.js",
        "@npm//node_modules/@angular/common:bundles/common-http.umd.js",
        "@npm//node_modules/@angular/core:bundles/core.umd.js",
        "@npm//node_modules/@angular/platform-browser:bundles/platform-browser.umd.js",
+        "@npm//node_modules/tslib:tslib.js",
+        ":rxjs_umd_modules",
    ],
    serving_path = "/bundle.min.js",
    static_files = [
-        "@npm//node_modules/tslib:tslib.js",
        "@npm//node_modules/zone.js:dist/zone.min.js",
-        "index.html",
-    ],
-    deps = [
-        "//src",
-        # This will be removed with https://github.com/angular/angular/pull/28720. This is the
-        # only remaining dependency that we still build from source here.
-        "@rxjs",
    ],
+    deps = ["//src"],
 )

-load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary", "rollup_bundle")
-
 rollup_bundle(
    name = "bundle",
    entry_point = "src/main",
@ -56,25 +57,25 @@ rollup_bundle(
        "@npm//@angular/common",
        "@npm//@angular/core",
        "@npm//@angular/platform-browser",
+        "@npm//rxjs",
    ],
 )

-# Needed because the prodserver only loads static files that appear under this
-# package.
-genrule(
-    name = "zone.js",
-    srcs = ["@npm//node_modules/zone.js:dist/zone.min.js"],
-    outs = ["zone.min.js"],
-    cmd = "cp $< $@",
+web_package(
+    name = "prodapp",
+    assets = [
+        # do not sort
+        "@npm//node_modules/zone.js:dist/zone.min.js",
+        ":bundle.min.js",
+    ],
+    data = [
+        ":bundle",
+    ],
+    index_html = "index.html",
 )

-load("@build_bazel_rules_nodejs//:defs.bzl", "http_server")
-
 http_server(
    name = "prodserver",
-    data = [
-        "index.html",
-        ":bundle",
-        ":zone.js",
-    ],
+    data = [":prodapp"],
+    templated_args = ["src/prodapp"],
 )
--- a/integration/bazel/src/hello-world/BUILD.bazel
+++ b/integration/bazel/src/hello-world/BUILD.bazel
@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])

-load("@angular//:index.bzl", "ng_module", "ng_package")
 load("@io_bazel_rules_sass//sass:sass.bzl", "sass_binary")
-load("@build_bazel_rules_karma//:defs.bzl", "ts_web_test_suite")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_angular_bazel//:index.bzl", "ng_module", "ng_package")
+load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")

 sass_binary(
    name = "hello-world-styles",
@ -69,8 +69,6 @@ ts_web_test_suite(
    ],
    deps = [
        ":test_lib",
-        # This will be removed with https://github.com/angular/angular/pull/28720. This is the
-        # only remaining dependency that we still build from source here.
-        "@rxjs",
+        "//src:rxjs_umd_modules",
    ],
 )
--- a/integration/bazel/src/index.html
+++ b/integration/bazel/src/index.html
@ -3,10 +3,11 @@
 <html>
  <head>
    <title>Bazel Integration Test</title>
+    <base href="/">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
  </head>
  <body>
+    <!-- The Angular application will be bootstrapped into this element. -->
    <app-component></app-component>
-    <script src="/zone.min.js"></script>
-    <script src="/bundle.min.js"></script>
  </body>
 </html>
--- a/integration/bazel/src/package.json
+++ b/integration/bazel/src/package.json
@ -4,22 +4,22 @@
  "version": "0.0.0",
  "license": "MIT",
  "dependencies": {
-    "@angular/animations": "file:../angular/dist/packages-dist/animations",
-    "@angular/common": "file:../angular/dist/packages-dist/common",
-    "@angular/core": "file:../angular/dist/packages-dist/core",
-    "@angular/platform-browser": "file:../angular/dist/packages-dist/platform-browser",
-    "@angular/platform-browser-dynamic": "file:../angular/dist/packages-dist/platform-browser-dynamic",
+    "@angular/animations": "packages-dist:animations",
+    "@angular/common": "packages-dist:common",
+    "@angular/core": "packages-dist:core",
+    "@angular/platform-browser": "packages-dist:platform-browser",
+    "@angular/platform-browser-dynamic": "packages-dist:platform-browser-dynamic",
    "reflect-metadata": "0.1.12",
-    "rxjs": "6.3.3",
+    "rxjs": "6.4.0",
    "tslib": "1.9.3",
    "zone.js": "0.8.26"
  },
  "devDependencies": {
-    "@angular/bazel": "file:../angular/dist/packages-dist/bazel",
-    "@angular/compiler": "file:../angular/dist/packages-dist/compiler",
-    "@angular/compiler-cli": "file:../angular/dist/packages-dist/compiler-cli",
-    "@bazel/karma": "0.23.2",
-    "@bazel/typescript": "0.23.2",
+    "@angular/bazel": "packages-dist:bazel",
+    "@angular/compiler": "packages-dist:compiler",
+    "@angular/compiler-cli": "packages-dist:compiler-cli",
+    "@bazel/karma": "0.25.1",
+    "@bazel/typescript": "0.25.1",
    "@types/jasmine": "2.8.8",
    "@types/source-map": "0.5.1",
    "protractor": "5.1.2",
--- a/integration/bazel/src/rxjs_shims.js
+++ b/integration/bazel/src/rxjs_shims.js
@ -0,0 +1,35 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+// rxjs/operators
+(function(factory) {
+  if (typeof module === 'object' && typeof module.exports === 'object') {
+    var v = factory(require, exports);
+    if (v !== undefined) module.exports = v;
+  } else if (typeof define === 'function' && define.amd) {
+    define('rxjs/operators', ['exports', 'rxjs'], factory);
+  }
+})(function(exports, rxjs) {
+  'use strict';
+  Object.keys(rxjs.operators).forEach(function(key) { exports[key] = rxjs.operators[key]; });
+  Object.defineProperty(exports, '__esModule', {value: true});
+});
+
+// rxjs/testing
+(function(factory) {
+  if (typeof module === 'object' && typeof module.exports === 'object') {
+    var v = factory(require, exports);
+    if (v !== undefined) module.exports = v;
+  } else if (typeof define === 'function' && define.amd) {
+    define('rxjs/testing', ['exports', 'rxjs'], factory);
+  }
+})(function(exports, rxjs) {
+  'use strict';
+  Object.keys(rxjs.testing).forEach(function(key) { exports[key] = rxjs.testing[key]; });
+  Object.defineProperty(exports, '__esModule', {value: true});
+});
--- a/integration/bazel/src/yarn.lock
+++ b/integration/bazel/src/yarn.lock
@ -32,12 +32,12 @@
    rxjs "6.3.3"
    source-map "0.7.3"

-"@angular-devkit/core@7.3.1":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.1.tgz#d92f6545796579cabdcfc29579a2c977f7a96c6c"
-  integrity sha512-56XDWWfIzOAkEk69lBLgmCYybPUA4yjunhmMlCk7vVdb7gbQUyzNjFD04Uj0GjlejatAQ5F76tRwygD9C+3RXQ==
+"@angular-devkit/core@7.3.3":
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.3.tgz#cd6d5a8eca25ef07b6394bc2b08133d90d08d39f"
+  integrity sha512-fosULDtMoDWrOyUzTmBkJccOy7zodo02kENyKai7vOv9EWfv9jytkVdNc+jl0ys9OE2QadvSYBo49jhnZxFXfQ==
  dependencies:
-    ajv "6.7.0"
+    ajv "6.9.1"
    chokidar "2.0.4"
    fast-json-stable-stringify "2.0.0"
    rxjs "6.3.3"
@ -51,26 +51,26 @@
    "@angular-devkit/core" "7.1.2"
    rxjs "6.3.3"

-"@angular-devkit/schematics@^7.0.4":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.1.tgz#7dc704005b966ea6c1ee62f380120183bb76eee6"
-  integrity sha512-cd7usiasfSgw75INz72/VssrLr9tiVRYfo1TEdvr9ww0GuQbuQpB33xbV8W135eAV8+wzQ3Ce8ohaDHibvj6Yg==
+"@angular-devkit/schematics@^7.3.0-rc.0":
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.3.tgz#80e9dc3197a3181f32edfb5c07e7ac016eace7d3"
+  integrity sha512-SdDq9eKwceb6WLwci1fywtZ/kARR5CYyzi5dZIR1lOxrz00682uUBqH/X39mKdqc6eVqR7rtPceqNm6nQpOIMg==
  dependencies:
-    "@angular-devkit/core" "7.3.1"
+    "@angular-devkit/core" "7.3.3"
    rxjs "6.3.3"

 "@angular/animations@file:../angular/dist/packages-dist/animations":
-  version "0.0.0"
+  version "7.2.6"
  dependencies:
    tslib "^1.9.0"

 "@angular/bazel@file:../angular/dist/packages-dist/bazel":
-  version "0.0.0"
+  version "7.2.6"
  dependencies:
    "@angular-devkit/architect" "^0.10.6"
    "@angular-devkit/core" "^7.0.4"
-    "@angular-devkit/schematics" "^7.0.4"
-    "@bazel/typescript" "^0.21.0"
+    "@angular-devkit/schematics" "^7.3.0-rc.0"
+    "@bazel/typescript" "^0.25.1"
    "@schematics/angular" "^7.0.4"
    "@types/node" "6.0.84"
    semver "^5.6.0"
@ -78,15 +78,15 @@
    tsickle "0.34.0"

 "@angular/common@file:../angular/dist/packages-dist/common":
-  version "0.0.0"
+  version "7.2.6"
  dependencies:
    tslib "^1.9.0"

 "@angular/compiler-cli@file:../angular/dist/packages-dist/compiler-cli":
-  version "0.0.0"
+  version "7.2.6"
  dependencies:
    canonical-path "1.0.0"
-    chokidar "^1.4.2"
+    chokidar "^2.1.1"
    convert-source-map "^1.5.1"
    dependency-graph "^0.7.2"
    magic-string "^0.25.0"
@ -98,29 +98,29 @@
    yargs "9.0.1"

 "@angular/compiler@file:../angular/dist/packages-dist/compiler":
-  version "0.0.0"
+  version "7.2.6"
  dependencies:
    tslib "^1.9.0"

 "@angular/core@file:../angular/dist/packages-dist/core":
-  version "0.0.0"
+  version "7.2.6"
  dependencies:
    tslib "^1.9.0"

 "@angular/platform-browser-dynamic@file:../angular/dist/packages-dist/platform-browser-dynamic":
-  version "0.0.0"
+  version "7.2.6"
  dependencies:
    tslib "^1.9.0"

 "@angular/platform-browser@file:../angular/dist/packages-dist/platform-browser":
-  version "0.0.0"
+  version "7.2.6"
  dependencies:
    tslib "^1.9.0"

-"@bazel/karma@0.23.2":
-  version "0.23.2"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.23.2.tgz#17421a61cbcc6c917902beaaef88d61f22471f11"
-  integrity sha512-aNujXKusUjJIkc6CF03LS8AS7ULwNE0MKEL2TlYvnGCZviQ3nKrpRiEtWFmZlT+GrTOeu7AM4t3l4pSdQx/jnw==
+"@bazel/karma@0.25.1":
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.25.1.tgz#246286299b6e96fa4a91d240d3c3d7386164adaf"
+  integrity sha512-e5qyZkeHdxEYTIcHg04pmPF1SR8jy8I1mQLgDxX6NJDVx3JT7iIFeISqlS8hjBiykyX/XZ0CsVzkKYU/sG3ilg==
  dependencies:
    jasmine-core "2.8.0"
    karma "^4.0.0"
@ -134,10 +134,10 @@
    semver "5.6.0"
    tmp "0.0.33"

-"@bazel/typescript@0.23.2":
-  version "0.23.2"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.23.2.tgz#a3ff199880855259d84216cb41644c1d9a0fad14"
-  integrity sha512-GrTyDW6Fvp/rgnxZGYampB5/QmDWvxtLEtUyMCPa/QXFR1OVxaMWeHxxuFEcES2UKJegqBDKAA8IzX21x4UbEw==
+"@bazel/typescript@0.25.1", "@bazel/typescript@^0.25.1":
+  version "0.25.1"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.25.1.tgz#71564de50ff6976fb37d90f2f7a479e87b158943"
+  integrity sha512-QFitUUXIWQMfVk5EwI9J9d5iNPfT+kUjPbahiJbJVZz1Fz9zNZ8+CR6FESfnxuUKlZK3Oy0VWFcz7mlHaceL/Q==
  dependencies:
    jasmine-core "2.8.0"
    protobufjs "5.0.3"
@ -145,15 +145,6 @@
    source-map-support "0.5.9"
    tsutils "2.27.2"

-"@bazel/typescript@^0.21.0":
-  version "0.21.0"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.21.0.tgz#41c304f77a42c6a016280d0f4c20e0749c3f4b2a"
-  integrity sha512-ASXj0RFybmqoa3LwqkTU3gNkX9bY9wL/VDNo5hlp9pynYWl4RMpe9V3m/qDIdtSuLJ+qD+Z3FKT/OcpWQHMlYA==
-  dependencies:
-    protobufjs "5.0.3"
-    source-map-support "0.5.9"
-    tsutils "2.27.2"
-
 "@schematics/angular@^7.0.4":
  version "7.1.2"
  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.1.2.tgz#b3eefbc81d12b0b53816896f6172eb613885826c"
@ -246,10 +237,10 @@ ajv@6.5.3:
    json-schema-traverse "^0.4.1"
    uri-js "^4.2.2"

-ajv@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.7.0.tgz#e3ce7bb372d6577bb1839f1dfdfcbf5ad2948d96"
-  integrity sha512-RZXPviBTtfmtka9n9sy1N5M5b82CbxWIR6HIis4s3WQTXDJamc/0gpCWNGz6EWdWp4DOfjzJfhz/AS9zVPjjWg==
+ajv@6.9.1:
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
+  integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
  dependencies:
    fast-deep-equal "^2.0.1"
    fast-json-stable-stringify "^2.0.0"
@ -281,14 +272,6 @@ ansi-styles@^2.2.1:
  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
  integrity sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=

-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
 anymatch@^2.0.0:
  version "2.0.0"
  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@ -310,19 +293,12 @@ are-we-there-yet@~1.1.2:
    delegates "^1.0.0"
    readable-stream "^2.0.6"

-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
-
 arr-diff@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=

-arr-flatten@^1.0.1, arr-flatten@^1.1.0:
+arr-flatten@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
  integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
@ -394,7 +370,7 @@ assign-symbols@^1.0.0:
  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=

-async-each@^1.0.0:
+async-each@^1.0.0, async-each@^1.0.1:
  version "1.0.1"
  resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
  integrity sha1-GdOGodntxufByF04iu28xW0zYC0=
@ -531,16 +507,7 @@ braces@^0.1.2:
  dependencies:
    expand-range "^0.1.0"

-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
-  dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
-    repeat-element "^1.1.2"
-
-braces@^2.3.0, braces@^2.3.1:
+braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
  version "2.3.2"
  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
@ -667,21 +634,24 @@ chokidar@2.0.4, chokidar@^2.0.3:
  optionalDependencies:
    fsevents "^1.2.2"

-chokidar@^1.4.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
+chokidar@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.2.tgz#9c23ea40b01638439e0513864d362aeacc5ad058"
+  integrity sha512-IwXUx0FXc5ibYmPC2XeEj5mpXoV66sR+t3jqu2NS2GYwCktt3KF1/Qqjws/NkegajBA4RbZ5+DDwlOiJsxDHEg==
  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.0"
  optionalDependencies:
-    fsevents "^1.0.0"
+    fsevents "^1.2.7"

 chownr@^1.0.1:
  version "1.1.1"
@ -1099,13 +1069,6 @@ expand-braces@^0.1.1:
    array-unique "^0.2.1"
    braces "^0.1.2"

-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
-  dependencies:
-    is-posix-bracket "^0.1.0"
-
 expand-brackets@^2.1.4:
  version "2.1.4"
  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
@ -1127,13 +1090,6 @@ expand-range@^0.1.0:
    is-number "^0.1.1"
    repeat-string "^0.2.2"

-expand-range@^1.8.1:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
-  integrity sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=
-  dependencies:
-    fill-range "^2.1.0"
-
 extend-shallow@^2.0.1:
  version "2.0.1"
  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@ -1154,13 +1110,6 @@ extend@3, extend@^3.0.0, extend@~3.0.0, extend@~3.0.2:
  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==

-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
-  dependencies:
-    is-extglob "^1.0.0"
-
 extglob@^2.0.4:
  version "2.0.4"
  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
@ -1200,22 +1149,6 @@ fast-json-stable-stringify@2.0.0, fast-json-stable-stringify@^2.0.0:
  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
  integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=

-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
-
-fill-range@^2.1.0:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565"
-  integrity sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==
-  dependencies:
-    is-number "^2.1.0"
-    isobject "^2.0.0"
-    randomatic "^3.0.0"
-    repeat-element "^1.1.2"
-    repeat-string "^1.5.2"
-
 fill-range@^4.0.0:
  version "4.0.0"
  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
@ -1258,18 +1191,11 @@ follow-redirects@^1.0.0:
  dependencies:
    debug "=3.1.0"

-for-in@^1.0.1, for-in@^1.0.2:
+for-in@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
  integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=

-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
 forever-agent@~0.6.1:
  version "0.6.1"
  resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@ -1310,7 +1236,7 @@ fs.realpath@^1.0.0:
  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
  integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=

-fsevents@^1.0.0, fsevents@^1.2.2:
+fsevents@^1.2.2:
  version "1.2.4"
  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
  integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
@ -1318,6 +1244,14 @@ fsevents@^1.0.0, fsevents@^1.2.2:
    nan "^2.9.2"
    node-pre-gyp "^0.10.0"

+fsevents@^1.2.7:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
+  integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
+  dependencies:
+    nan "^2.9.2"
+    node-pre-gyp "^0.10.0"
+
 gauge@~2.7.3:
  version "2.7.4"
  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@ -1354,21 +1288,6 @@ getpass@^0.1.1:
  dependencies:
    assert-plus "^1.0.0"

-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
 glob-parent@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@ -1563,7 +1482,7 @@ inflight@^1.0.4:
    once "^1.3.0"
    wrappy "1"

-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
  version "2.0.3"
  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
  integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@ -1653,18 +1572,6 @@ is-descriptor@^1.0.0, is-descriptor@^1.0.2:
    is-data-descriptor "^1.0.0"
    kind-of "^6.0.2"

-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
-  dependencies:
-    is-primitive "^2.0.0"
-
 is-extendable@^0.1.0, is-extendable@^0.1.1:
  version "0.1.1"
  resolved "https://registry.yarnpkg.com/is-extendable/-/is-extendable-0.1.1.tgz#62b110e289a471418e3ec36a617d472e301dfc89"
@ -1677,11 +1584,6 @@ is-extendable@^1.0.1:
  dependencies:
    is-plain-object "^2.0.4"

-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
 is-extglob@^2.1.0, is-extglob@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
@ -1699,13 +1601,6 @@ is-fullwidth-code-point@^2.0.0:
  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
  integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=

-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
-  dependencies:
-    is-extglob "^1.0.0"
-
 is-glob@^3.1.0:
  version "3.1.0"
  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a"
@ -1725,13 +1620,6 @@ is-number@^0.1.1:
  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
  integrity sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=

-is-number@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
-  integrity sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=
-  dependencies:
-    kind-of "^3.0.2"
-
 is-number@^3.0.0:
  version "3.0.0"
  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@ -1739,11 +1627,6 @@ is-number@^3.0.0:
  dependencies:
    kind-of "^3.0.2"

-is-number@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
-  integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
-
 is-path-cwd@^1.0.0:
  version "1.0.0"
  resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@ -1770,16 +1653,6 @@ is-plain-object@^2.0.1, is-plain-object@^2.0.3, is-plain-object@^2.0.4:
  dependencies:
    isobject "^3.0.1"

-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
 is-stream@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@ -2086,11 +1959,6 @@ map-visit@^1.0.0:
  dependencies:
    object-visit "^1.0.0"

-math-random@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
-  integrity sha1-izqsWIuKZuSXXjzepn97sylgH6w=
-
 media-typer@0.3.0:
  version "0.3.0"
  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
@ -2103,25 +1971,6 @@ mem@^1.1.0:
  dependencies:
    mimic-fn "^1.0.0"

-micromatch@^2.1.5:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
-  dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
-
 micromatch@^3.1.10, micromatch@^3.1.4:
  version "3.1.10"
  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
@ -2295,13 +2144,18 @@ normalize-package-data@^2.3.2:
    semver "2 || 3 || 4 || 5"
    validate-npm-package-license "^3.0.1"

-normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-path@^2.1.1:
  version "2.1.1"
  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
  dependencies:
    remove-trailing-separator "^1.0.1"

+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
 npm-bundled@^1.0.1:
  version "1.0.5"
  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
@ -2373,14 +2227,6 @@ object-visit@^1.0.0:
  dependencies:
    isobject "^3.0.0"

-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
 object.pick@^1.3.0:
  version "1.3.0"
  resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@ -2483,16 +2329,6 @@ pako@~1.0.2:
  resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.8.tgz#6844890aab9c635af868ad5fecc62e8acbba3ea4"
  integrity sha512-6i0HVbUfcKaTv+EG8ZTr75az7GFXcLYk9UyLEg7Notv/Ma+z/UG3TCoz6GiNeOrn1E/e63I0X/Hpw18jHOTUnA==

-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
 parse-json@^2.2.0:
  version "2.2.0"
  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
@ -2588,11 +2424,6 @@ posix-character-classes@^0.1.0:
  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=

-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
-
 process-nextick-args@~1.0.6:
  version "1.0.7"
  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
@ -2674,15 +2505,6 @@ qs@6.5.2, qs@~6.5.2:
  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==

-randomatic@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.1.0.tgz#36f2ca708e9e567f5ed2ec01949026d50aa10116"
-  integrity sha512-KnGPVE0lo2WoXxIZ7cPR8YBpiol4gsSuOwDSg410oHh80ZMp5EiypNqL2K4Z77vJn6lB5rap7IkAmcUlalcnBQ==
-  dependencies:
-    is-number "^4.0.0"
-    kind-of "^6.0.0"
-    math-random "^1.0.1"
-
 range-parser@^1.2.0:
  version "1.2.0"
  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
@ -2750,7 +2572,7 @@ readable-stream@~2.0.6:
    string_decoder "~0.10.x"
    util-deprecate "~1.0.1"

-readdirp@^2.0.0:
+readdirp@^2.0.0, readdirp@^2.2.1:
  version "2.2.1"
  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-2.2.1.tgz#0e87622a3325aa33e892285caf8b4e846529a525"
  integrity sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==
@ -2771,13 +2593,6 @@ reflect-metadata@0.1.12, reflect-metadata@^0.1.2:
  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.12.tgz#311bf0c6b63cd782f228a81abe146a2bfa9c56f2"
  integrity sha512-n+IyV+nGz3+0q3/Yf1ra12KpCyi001bi4XFxSjbiWWjfqb52iTTtpGXmCCAOWWIAn9KEuFZKGqBERHmrtScZ3A==

-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
-  dependencies:
-    is-equal-shallow "^0.1.3"
-
 regex-not@^1.0.0, regex-not@^1.0.2:
  version "1.0.2"
  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@ -2801,7 +2616,7 @@ repeat-string@^0.2.2:
  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
  integrity sha1-x6jTI2BoNiBZp+RlH8aITosftK4=

-repeat-string@^1.5.2, repeat-string@^1.6.1:
+repeat-string@^1.6.1:
  version "1.6.1"
  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
  integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
@ -2888,6 +2703,13 @@ rxjs@6.3.3:
  dependencies:
    tslib "^1.9.0"

+rxjs@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.2, 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"
@ -3463,7 +3285,7 @@ unset-value@^1.0.0:
    has-value "^0.3.1"
    isobject "^3.0.0"

-upath@^1.0.5:
+upath@^1.0.5, upath@^1.1.0:
  version "1.1.0"
  resolved "https://registry.yarnpkg.com/upath/-/upath-1.1.0.tgz#35256597e46a581db4793d0ce47fa9aebfc9fabd"
  integrity sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==
--- a/integration/bazel/test/e2e/BUILD.bazel
+++ b/integration/bazel/test/e2e/BUILD.bazel
@ -1,5 +1,5 @@
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
-load("@angular//:index.bzl", "protractor_web_test_suite")
+load("@npm_angular_bazel//:index.bzl", "protractor_web_test_suite")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")

 ts_library(
    name = "e2e",
--- a/integration/bazel/yarn.lock
+++ b/integration/bazel/yarn.lock
@ -2,24 +2,24 @@
 # yarn lockfile v1


-"@bazel/bazel-darwin_x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.20.0.tgz#648d61c32a3c5fccb7bf70b753071b6e54b11f21"
-  integrity sha512-zeoeVK504341GfnaxdaB4pFzQV0YOK1HLiYj3/ocamPFxAJRh9abvKB8iOpqD5Oal0j7VsINxnXCjovp9a4urA==
+"@bazel/bazel-darwin_x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-darwin_x64/-/bazel-darwin_x64-0.22.0.tgz#a2bea5922dba9a32554a218ba4849a200115b248"
+  integrity sha512-LFxkyQgPATeB64z/1IvOWZhK+lc3JVHejbmdo96qB4lsoD8zselvOlgHvVXxlAjRxVZ9mlmXDvDRDyaXyyRdwA==

-"@bazel/bazel-linux_x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.20.0.tgz#2568628a0d0b85dcc69d0ab701b1d6e10551357d"
-  integrity sha512-PpHzoEqfXty8dc1/p1tVFXtbPyrE1n0N79QmYePjJ5mJMyW7uBF/zV4IajYY8+IpJEcDVq5v4BavSexOmVJRmA==
+"@bazel/bazel-linux_x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-linux_x64/-/bazel-linux_x64-0.22.0.tgz#12e5884f2a7b7f3b62afbef9f8da4de0976f3bc8"
+  integrity sha512-xDs8cb2bbGZ9uvzYZOzCVrMBywzRhLj0J/t+py+FYZj+VO5B3wVg9eUf6nWWR0oJ2mzvToI9h31t2tNdqwy2kQ==

-"@bazel/bazel-win32_x64@0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.20.0.tgz#af7d041dae4c066e7aa8618949e2de1aad07495e"
-  integrity sha512-3bqHXFBvLnbvNzr1KCQ1zryTYvHMoQffaWVekbckgPyT2VPEj3abuB91+DrRYmZdPjcgPYnjnyanxZHDkKuF2g==
+"@bazel/bazel-win32_x64@0.22.0":
+  version "0.22.0"
+  resolved "https://registry.yarnpkg.com/@bazel/bazel-win32_x64/-/bazel-win32_x64-0.22.0.tgz#a8a65986639583a8cc7b018e001aedfdafe41b50"
+  integrity sha512-FbJaXVDoCLnpIFLnPHFkQdfriYPXfnfQNuf9EXMliERdRuoeBVbwEZfwcuArxZWNFus7bD8QiTj0XzKVWO+Wbw==

 "@bazel/bazel@file:../../node_modules/@bazel/bazel":
-  version "0.20.0"
+  version "0.22.0"
  optionalDependencies:
-    "@bazel/bazel-darwin_x64" "0.20.0"
-    "@bazel/bazel-linux_x64" "0.20.0"
-    "@bazel/bazel-win32_x64" "0.20.0"
+    "@bazel/bazel-darwin_x64" "0.22.0"
+    "@bazel/bazel-linux_x64" "0.22.0"
+    "@bazel/bazel-win32_x64" "0.22.0"
--- a/modules/benchmarks/src/largeform/ng2/BUILD.bazel
+++ b/modules/benchmarks/src/largeform/ng2/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@ -28,7 +28,10 @@ ts_devserver(
    entry_module = "angular/modules/benchmarks/src/largeform/ng2/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/benchmarks/src/largetable/baseline/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/baseline/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
--- a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
--- a/modules/benchmarks/src/largetable/iv/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/iv/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
--- a/modules/benchmarks/src/largetable/ng2/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/ng2/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@ -27,7 +27,10 @@ ts_devserver(
    entry_module = "angular/modules/benchmarks/src/largetable/ng2/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@ -24,7 +24,10 @@ ts_devserver(
    entry_module = "angular/modules/benchmarks/src/largetable/ng2_switch/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/benchmarks/src/largetable/render3/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/render3/BUILD.bazel
@ -1,7 +1,7 @@
 package(default_visibility = ["//visibility:public"])

 load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 ng_module(
@ -24,6 +24,7 @@ ng_rollup_bundle(
    tags = ["ivy-only"],
    deps = [
        ":largetable_lib",
+        "@ngdeps//rxjs",
    ],
 )

--- a/modules/benchmarks/src/tree/baseline/BUILD.bazel
+++ b/modules/benchmarks/src/tree/baseline/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
--- a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel
+++ b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
--- a/modules/benchmarks/src/tree/iv/BUILD.bazel
+++ b/modules/benchmarks/src/tree/iv/BUILD.bazel
@ -1,4 +1,4 @@
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
--- a/modules/benchmarks/src/tree/ng1/BUILD.bazel
+++ b/modules/benchmarks/src/tree/ng1/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
--- a/modules/benchmarks/src/tree/ng2/BUILD.bazel
+++ b/modules/benchmarks/src/tree/ng2/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@ -27,7 +27,10 @@ ts_devserver(
    entry_module = "angular/modules/benchmarks/src/tree/ng2/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel
+++ b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@ -22,7 +22,10 @@ ts_devserver(
    entry_module = "angular/modules/benchmarks/src/tree/ng2_next/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    deps = [":ng2_next"],
 )

--- a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel
+++ b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@ -22,7 +22,10 @@ ts_devserver(
    entry_module = "angular/modules/benchmarks/src/tree/ng2_static/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel
+++ b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@ -24,7 +24,10 @@ ts_devserver(
    entry_module = "angular/modules/benchmarks/src/tree/ng2_switch/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/benchmarks/src/tree/render3/BUILD.bazel
+++ b/modules/benchmarks/src/tree/render3/BUILD.bazel
@ -1,7 +1,7 @@
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

 load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

 ng_module(
@ -23,6 +23,7 @@ ng_rollup_bundle(
    tags = ["ivy-only"],
    deps = [
        ":tree_lib",
+        "@ngdeps//rxjs",
    ],
 )

--- a/modules/benchmarks/src/tree/render3_function/BUILD.bazel
+++ b/modules/benchmarks/src/tree/render3_function/BUILD.bazel
@ -1,4 +1,4 @@
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("//tools:defaults.bzl", "ts_library")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")

@ -20,7 +20,10 @@ ts_devserver(
    entry_module = "angular/modules/benchmarks/src/tree/render3_function/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    deps = [":render3_function_lib"],
 )

--- a/modules/playground/src/animate/BUILD.bazel
+++ b/modules/playground/src/animate/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

--- a/modules/playground/src/async/BUILD.bazel
+++ b/modules/playground/src/async/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -21,7 +21,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/async/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/benchpress/BUILD.bazel
+++ b/modules/playground/src/benchpress/BUILD.bazel
@ -1,4 +1,4 @@
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

--- a/modules/playground/src/gestures/BUILD.bazel
+++ b/modules/playground/src/gestures/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

--- a/modules/playground/src/hello_world/BUILD.bazel
+++ b/modules/playground/src/hello_world/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -21,7 +21,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/hello_world/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/http/BUILD.bazel
+++ b/modules/playground/src/http/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -14,6 +14,7 @@ ng_module(
        "//packages/http",
        "//packages/platform-browser",
        "//packages/platform-browser-dynamic",
+        "@ngdeps//rxjs",
    ],
 )

@ -23,7 +24,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/http/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/jsonp/BUILD.bazel
+++ b/modules/playground/src/jsonp/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -23,7 +23,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/jsonp/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/key_events/BUILD.bazel
+++ b/modules/playground/src/key_events/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -21,7 +21,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/key_events/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/model_driven_forms/BUILD.bazel
+++ b/modules/playground/src/model_driven_forms/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -22,7 +22,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/model_driven_forms/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/order_management/BUILD.bazel
+++ b/modules/playground/src/order_management/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -22,7 +22,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/order_management/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/person_management/BUILD.bazel
+++ b/modules/playground/src/person_management/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -22,7 +22,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/person_management/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/relative_assets/BUILD.bazel
+++ b/modules/playground/src/relative_assets/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -30,7 +30,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/relative_assets/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/routing/BUILD.bazel
+++ b/modules/playground/src/routing/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -15,6 +15,7 @@ ng_module(
        "//packages/platform-browser",
        "//packages/platform-browser-dynamic",
        "//packages/router",
+        "@ngdeps//rxjs",
    ],
 )

--- a/modules/playground/src/sourcemap/BUILD.bazel
+++ b/modules/playground/src/sourcemap/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -25,7 +25,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/sourcemap/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/svg/BUILD.bazel
+++ b/modules/playground/src/svg/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -21,7 +21,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/svg/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/template_driven_forms/BUILD.bazel
+++ b/modules/playground/src/template_driven_forms/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -22,7 +22,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/template_driven_forms/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/todo/BUILD.bazel
+++ b/modules/playground/src/todo/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

--- a/modules/playground/src/upgrade/BUILD.bazel
+++ b/modules/playground/src/upgrade/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ts_library")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -21,7 +21,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/upgrade/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/modules/playground/src/web_workers/animations/BUILD.bazel
+++ b/modules/playground/src/web_workers/animations/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

--- a/modules/playground/src/web_workers/images/BUILD.bazel
+++ b/modules/playground/src/web_workers/images/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

--- a/modules/playground/src/web_workers/input/BUILD.bazel
+++ b/modules/playground/src/web_workers/input/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -27,7 +27,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/web_workers/input/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"],
    deps = [":input"],
 )
--- a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel
+++ b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -27,7 +27,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/web_workers/kitchen_sink/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"],
    deps = [":kitchen_sink"],
 )
--- a/modules/playground/src/web_workers/message_broker/BUILD.bazel
+++ b/modules/playground/src/web_workers/message_broker/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -27,7 +27,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/web_workers/message_broker/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"],
    deps = [":message_broker"],
 )
--- a/modules/playground/src/web_workers/router/BUILD.bazel
+++ b/modules/playground/src/web_workers/router/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -15,6 +15,7 @@ ng_module(
        "//packages/platform-webworker",
        "//packages/platform-webworker-dynamic",
        "//packages/router",
+        "@ngdeps//rxjs",
    ],
 )

@ -29,7 +30,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/web_workers/router/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"],
    deps = [":router"],
 )
--- a/modules/playground/src/web_workers/todo/BUILD.bazel
+++ b/modules/playground/src/web_workers/todo/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -30,7 +30,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/web_workers/todo/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = ["@ngdeps//node_modules/zone.js:dist/zone.js"],
    deps = [":todo"],
 )
--- a/modules/playground/src/zippy_component/BUILD.bazel
+++ b/modules/playground/src/zippy_component/BUILD.bazel
@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")

 package(default_visibility = ["//modules/playground:__subpackages__"])

@ -22,7 +22,10 @@ ts_devserver(
    entry_module = "angular/modules/playground/src/zippy_component/index",
    index_html = "index.html",
    port = 4200,
-    scripts = ["@ngdeps//node_modules/tslib:tslib.js"],
+    scripts = [
+        "@ngdeps//node_modules/tslib:tslib.js",
+        "//tools/rxjs:rxjs_umd_modules",
+    ],
    static_files = [
        "@ngdeps//node_modules/zone.js:dist/zone.js",
        "@ngdeps//node_modules/reflect-metadata:Reflect.js",
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "angular-srcs",
-  "version": "7.2.6",
+  "version": "7.2.7",
  "private": true,
  "branchPattern": "2.0.*",
  "description": "Angular - a web framework for modern web apps",
@ -35,8 +35,8 @@
    "@angular-devkit/build-optimizer": "^0.12.2",
    "@angular-devkit/core": "^7.0.4",
    "@angular-devkit/schematics": "^7.3.0-rc.0",
-    "@bazel/karma": "0.23.2",
-    "@bazel/typescript": "0.23.2",
+    "@bazel/karma": "0.25.1",
+    "@bazel/typescript": "0.25.1",
    "@schematics/angular": "^7.0.4",
    "@types/angular": "^1.6.47",
    "@types/base64-js": "1.2.5",
@ -84,6 +84,7 @@
    "rollup": "^1.1.0",
    "rollup-plugin-node-resolve": "^4.0.0",
    "rollup-plugin-sourcemaps": "^0.4.2",
+    "rxjs": "^6.4.0",
    "selenium-webdriver": "3.5.0",
    "shelljs": "^0.8.1",
    "source-map": "^0.6.1",
@ -138,7 +139,6 @@
    "mutation-observer": "^1.0.3",
    "rewire": "2.5.2",
    "rollup-plugin-commonjs": "8.1.0",
-    "rxjs": "^6.3.0",
    "sauce-connect": "https://saucelabs.com/downloads/sc-4.5.1-linux.tar.gz",
    "semver": "5.4.1",
    "tslint": "5.7.0",
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@ -5,7 +5,7 @@ exports_files([
    "tsconfig.json",
 ])

-load("@build_bazel_rules_typescript//:defs.bzl", "ts_config")
+load("@npm_bazel_typescript//:defs.bzl", "ts_config")
 load("//tools:defaults.bzl", "ts_library")

 ts_library(
--- a/packages/bazel/BUILD.bazel
+++ b/packages/bazel/BUILD.bazel
@ -2,17 +2,28 @@ load("//tools:defaults.bzl", "npm_package")

 npm_package(
    name = "npm_package",
-    srcs = [
-        "check_version.js",
-        "package.json",
-        "protractor-utils.js",
+    srcs = glob(
+        ["*"],
+        exclude = ["yarn.lock"],
+    ) + [
        "//packages/bazel/src:package_assets",
        "//packages/bazel/src/builders:package_assets",
+        "//packages/bazel/src/ng_package:package_assets",
+        "//packages/bazel/src/ngc-wrapped:package_assets",
+        "//packages/bazel/src/protractor:package_assets",
        "//packages/bazel/src/schematics:package_assets",
+        "//packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf:package_assets",
    ],
    packages = [
        "//packages/bazel/docs",
    ],
+    replacements = {
+        "(#|\/\/)\\s+BEGIN-DEV-ONLY[\\w\W]+?(#|\/\/)\\s+END-DEV-ONLY": "",
+        "//packages/bazel/": "//",
+        "@ngdeps//": "@npm//",
+        "@angular//:@angular/bazel/ngc-wrapped": "@npm//@angular/bazel/bin:ngc-wrapped",
+        "angular/packages/bazel/": "npm_angular_bazel/",
+    },
    tags = ["release-with-framework"],
    # Do not add more to this list.
    # Dependencies on the full npm_package cause long re-builds.
--- a/packages/bazel/check_version.js
+++ b/packages/bazel/check_version.js
@ -1,73 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-/**
- * @fileoverview This script runs as a postinstall in the published npm packages
- * and checks that the version of the Angular external repository matches that
- * of the published npm package.
- *
- * Note, this check is only performed with bazel managed deps when the yarn or
- * npm install is from a yarn_install or npm_install repository rule. For self
- * managed bazel deps this check is not performed and it is the responsibility
- * of the user to ensure that the versions match.
- */
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const semver = require('semver');
-
-// Version in package.bzl should match the npm package version
-// but this should be tolerant of development stamped versions such as
-// "0.17.0-7-g76dc057"
-const npmPackageVersion = process.env.npm_package_version.split('-')[0];
-
-// If this is a bazel managed deps yarn_install or npm_install then the
-// cwd is $(bazel info
-// output_base)/external/<wksp>/node_modules/@angular/bazel and there should
-// be $(bazel info output_base)/external/<wksp>/internal/generate_build_file.js
-// folder
-function isBazelManagedDeps() {
-  try {
-    fs.statSync('../../../generate_build_file.js');
-    return true;
-  } catch (e) {
-    return false;
-  }
-}
-
-if (isBazelManagedDeps()) {
-  let contents;
-  try {
-    // If this is a yarn_install or npm_install then the cwd is $(bazel info
-    // output_base)/external/<wksp>/node_modules/@angular/bazel so we can look for
-    // the package.json file under $(bazel info
-    // output_base)/external/angular/package.json
-    const packagePath = path.resolve(process.cwd(), '../../../../angular/package.json');
-    contents = require(packagePath);
-  } catch (e) {
-    throw new Error('The angular repository is not installed in your Bazel WORKSPACE file');
-  }
-  if (contents.name !== 'angular-srcs') {
-    throw new Error('Invalid package.json in angular repository');
-  }
-  // Be tolerant of versions such as "0.17.0-7-g76dc057"
-  const angularPackageVersion = contents.version.split('-')[0];
-  // Should match only the major and minor versions
-  const range = `${semver.major(angularPackageVersion)}.${semver.minor(angularPackageVersion)}.x`;
-  if (!semver.satisfies(npmPackageVersion, range)) {
-    throw new Error(
-        `Expected angular npm version ${npmPackageVersion} to satisfy ${range}. ` +
-        `Please update ANGULAR_VERSION in WORKSPACE file to match ${npmPackageVersion}`);
-  }
-} else {
-  // No version check
-  console.warn(`WARNING: With self managed deps you must ensure the @angular/bazel
-npm package version matches the angular repository version.
-Use yarn_install or npm_install for this version to be checked automatically.
-`);
-}
--- a/packages/bazel/package.json
+++ b/packages/bazel/package.json
@ -11,11 +11,17 @@
    "modify_tsconfig": "./src/modify_tsconfig.js"
  },
  "typings": "./src/ngc-wrapped/index.d.ts",
+  "bazelWorkspaces": {
+    "npm_angular_bazel": {
+      "version": "0.0.0-PLACEHOLDER",
+      "rootPath": "."
+    }
+  },
  "dependencies": {
    "@angular-devkit/architect": "^0.10.6",
    "@angular-devkit/core": "^7.0.4",
    "@angular-devkit/schematics": "^7.3.0-rc.0",
-    "@bazel/typescript": "^0.23.2",
+    "@bazel/typescript": "^0.25.1",
    "@schematics/angular": "^7.0.4",
    "@types/node": "6.0.84",
    "semver": "^5.6.0",
@ -34,8 +40,5 @@
  "schematics": "./src/schematics/collection.json",
  "ng-update": {
    "packageGroup": "NG_UPDATE_PACKAGE_GROUP"
-  },
-  "scripts": {
-    "postinstall": "node ./check_version.js"
  }
 }
--- a/packages/bazel/src/BUILD.bazel
+++ b/packages/bazel/src/BUILD.bazel
@ -1,9 +1,8 @@
-package(default_visibility = ["//visibility:public"])
+package(default_visibility = ["//packages/bazel:__subpackages__"])

 filegroup(
    name = "package_assets",
-    srcs = ["modify_tsconfig.js"],
-    visibility = ["//packages/bazel:__subpackages__"],
+    srcs = glob(["*"]),
 )

 # For generating skydoc
@ -22,6 +21,12 @@ nodejs_binary(
    ],
    entry_point = "ngdeps/node_modules/rollup/bin/rollup",
    install_source_map_support = False,
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "empty_node_modules",
+    srcs = [],
 )

 nodejs_binary(
@ -29,4 +34,6 @@ nodejs_binary(
    data = ["modify_tsconfig.js"],
    entry_point = "angular/packages/bazel/src/modify_tsconfig.js",
    install_source_map_support = False,
+    node_modules = ":empty_node_modules",
+    visibility = ["//visibility:public"],
 )
--- a/packages/bazel/src/builders/BUILD.bazel
+++ b/packages/bazel/src/builders/BUILD.bazel
@ -25,7 +25,6 @@ ts_library(
        "@ngdeps//@angular-devkit/architect",
        "@ngdeps//@angular-devkit/core",
        "@ngdeps//@types/node",
-        "@rxjs",
-        "@rxjs//operators",
+        "@ngdeps//rxjs",
    ],
 )
--- a/packages/bazel/src/esm5.bzl
+++ b/packages/bazel/src/esm5.bzl
@ -157,7 +157,7 @@ esm5_outputs_aspect = aspect(
            cfg = "host",
        ),
        "_tsc_wrapped": attr.label(
-            default = Label("@build_bazel_rules_typescript//:@bazel/typescript/tsc_wrapped"),
+            default = Label("@npm//@bazel/typescript/bin:tsc_wrapped"),
            executable = True,
            cfg = "host",
        ),
--- a/packages/bazel/src/external.bzl
+++ b/packages/bazel/src/external.bzl
@ -2,11 +2,11 @@
 """

 load(
-    "@build_bazel_rules_typescript//internal:build_defs.bzl",
+    "@npm_bazel_typescript//internal:build_defs.bzl",
    _tsc_wrapped_tsconfig = "tsc_wrapped_tsconfig",
 )
 load(
-    "@build_bazel_rules_typescript//internal:common/compilation.bzl",
+    "@npm_bazel_typescript//internal:common/compilation.bzl",
    _COMMON_ATTRIBUTES = "COMMON_ATTRIBUTES",
    _COMMON_OUTPUTS = "COMMON_OUTPUTS",
    _DEPS_ASPECTS = "DEPS_ASPECTS",
--- a/packages/bazel/src/ng_package/BUILD.bazel
+++ b/packages/bazel/src/ng_package/BUILD.bazel
@ -1,9 +1,9 @@
 package(default_visibility = ["//visibility:public"])

 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")

-exports_files(["ng_package.bzl"])
+# BEGIN-DEV-ONLY
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")

 ts_library(
    name = "lib",
@ -16,6 +16,7 @@ ts_library(
    ],
 )

+# END-DEV-ONLY
 nodejs_binary(
    name = "packager",
    data = [
@ -25,3 +26,10 @@ nodejs_binary(
    entry_point = "angular/packages/bazel/src/ng_package/packager.js",
    install_source_map_support = False,
 )
+
+exports_files(["ng_package.bzl"])
+
+filegroup(
+    name = "package_assets",
+    srcs = glob(["*.bzl"]) + ["BUILD.bazel"],
+)
--- a/packages/bazel/src/ngc-wrapped/BUILD.bazel
+++ b/packages/bazel/src/ngc-wrapped/BUILD.bazel
@ -1,5 +1,5 @@
 load("@build_bazel_rules_nodejs//:defs.bzl", "nodejs_binary")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")

 ts_library(
    name = "ngc_lib",
@ -32,9 +32,9 @@ nodejs_binary(
    configuration_env_vars = ["compile"],
    data = [
        ":ngc_lib",
-        "@build_bazel_rules_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
        "@ngdeps//source-map-support",
        "@ngdeps//tslib",
+        "@npm_bazel_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
    ],
    entry_point = "angular/packages/bazel/src/ngc-wrapped/index.js",
    visibility = ["//visibility:public"],
@ -49,3 +49,9 @@ nodejs_binary(
    entry_point = "angular/packages/bazel/src/ngc-wrapped/extract_i18n.js",
    visibility = ["//visibility:public"],
 )
+
+filegroup(
+    name = "package_assets",
+    srcs = ["BUILD.bazel"],
+    visibility = ["//packages/bazel:__subpackages__"],
+)
--- a/packages/bazel/src/protractor/BUILD.bazel
+++ b/packages/bazel/src/protractor/BUILD.bazel
@ -4,3 +4,8 @@ exports_files([
    "protractor.conf.js",
    "protractor_web_test.bzl",
 ])
+
+filegroup(
+    name = "package_assets",
+    srcs = glob(["*"]),
+)
--- a/packages/bazel/src/protractor/utils/BUILD.bazel
+++ b/packages/bazel/src/protractor/utils/BUILD.bazel
@ -1,6 +1,6 @@
 package(default_visibility = ["//visibility:public"])

-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")

 ts_library(
    name = "utils",
--- a/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template
+++ b/packages/bazel/src/schematics/bazel-workspace/files/WORKSPACE.template
@ -28,13 +28,6 @@ http_archive(
    strip_prefix = "angular-%s" % ANGULAR_VERSION,
 )

-# RxJS
-RXJS_VERSION = "<%= RXJS_VERSION %>"
-http_archive(
-    name = "rxjs",
-    url = "https://registry.yarnpkg.com/rxjs/-/rxjs-%s.tgz" % RXJS_VERSION,
-    strip_prefix = "package/src",
-)
 <% if (sass) { %>
 # Rules for compiling sass
 RULES_SASS_VERSION = "<%= RULES_SASS_VERSION %>"
@ -60,17 +53,16 @@ yarn_install(
 load("@npm//:install_bazel_dependencies.bzl", "install_bazel_dependencies")
 install_bazel_dependencies()

-load("@build_bazel_rules_karma//:package.bzl", "rules_karma_dependencies")
+load("@npm_bazel_karma//:package.bzl", "rules_karma_dependencies")
 rules_karma_dependencies()

-load("@io_bazel_rules_webtesting//web:repositories.bzl", "browser_repositories", "web_test_repositories")
+load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories")
 web_test_repositories()
-browser_repositories(
-    chromium = True,
-    firefox = True,
-)

-load("@build_bazel_rules_typescript//:defs.bzl", "ts_setup_workspace")
+load("@npm_bazel_karma//:browser_repositories.bzl", "browser_repositories")
+browser_repositories()
+
+load("@npm_bazel_typescript//:defs.bzl", "ts_setup_workspace")
 ts_setup_workspace()
 <% if (sass) { %>
 load("@io_bazel_rules_sass//sass:sass_repositories.bzl", "sass_repositories")
--- a/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template
+++ b/packages/bazel/src/schematics/bazel-workspace/files/e2e/BUILD.bazel.template
@ -1,4 +1,4 @@
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_library")
 load("@angular//:index.bzl", "protractor_web_test_suite")

 ts_library(
@ -22,7 +22,7 @@ ts_library(
 protractor_web_test_suite(
    name = "prodserver_test",
    data = [
-      "@angular//packages/bazel/src/protractor/utils",
+      "@angular//" + "packages/bazel/src/protractor/utils",
      "@npm//protractor",
    ],
    on_prepare = ":protractor.on-prepare.js",
@ -33,7 +33,7 @@ protractor_web_test_suite(
 protractor_web_test_suite(
    name = "devserver_test",
    data = [
-      "@angular//packages/bazel/src/protractor/utils",
+      "@angular//" + "packages/bazel/src/protractor/utils",
      "@npm//protractor",
    ],
    on_prepare = ":protractor.on-prepare.js",
--- a/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template
+++ b/packages/bazel/src/schematics/bazel-workspace/files/src/BUILD.bazel.template
@ -1,10 +1,10 @@
 package(default_visibility = ["//visibility:public"])

 load("@angular//:index.bzl", "ng_module")
-load("@build_bazel_rules_karma//:defs.bzl", "ts_web_test_suite")
+load("@npm_bazel_karma//:defs.bzl", "ts_web_test_suite")
 load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle", "history_server")
 load("@build_bazel_rules_nodejs//internal/web_package:web_package.bzl", "web_package")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver", "ts_library")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver", "ts_library")
 <% if (sass) { %>load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")

 [
@ -16,6 +16,16 @@ sass_binary(
 for x in glob(["**/*.scss"])
 ]
 <% } %>
+
+filegroup(
+    name = "rxjs_umd_modules",
+    srcs = [
+        # do not sort
+        "@npm//node_modules/rxjs:bundles/rxjs.umd.js",
+        ":rxjs_shims.js",
+    ],
+)
+
 ng_module(
    name = "src",
    srcs = glob(
@ -36,13 +46,17 @@ ng_module(
        "@angular//packages/platform-browser",<% if (routing) { %>
        "@angular//packages/router",<% } %>
        "@npm//@types",
+        "@npm//rxjs",
    ],
 )

 rollup_bundle(
    name = "bundle",
    entry_point = "src/main.prod",
-    deps = ["//src"],
+    deps = [
+        "//src",
+        "@npm//rxjs",
+    ],
 )

 web_package(
@ -67,15 +81,14 @@ history_server(
 ts_devserver(
    name = "devserver",
    port = 4200,
-    additional_root_paths = [
-        "npm/node_modules/zone.js/dist",
-        "npm/node_modules/tslib",
-    ],
    entry_module = "<%= utils.underscore(name) %>/src/main.dev",
    serving_path = "/bundle.min.js",
+    scripts = [
+        "@npm//node_modules/tslib:tslib.js",
+        ":rxjs_umd_modules",
+    ],
    static_files = [
        "@npm//node_modules/zone.js:dist/zone.min.js",
-        "@npm//node_modules/tslib:tslib.js",
    ],
    index_html = "index.html",
    deps = [":src"],
@ -120,6 +133,7 @@ ts_web_test_suite(
        "@io_bazel_rules_webtesting//browsers:chromium-local",
    ],
    deps = [
+        ":rxjs_umd_modules",
        ":test_lib",
        "@npm//karma-jasmine",
    ],
--- a/packages/bazel/src/schematics/bazel-workspace/files/src/rxjs_shims.js.template
+++ b/packages/bazel/src/schematics/bazel-workspace/files/src/rxjs_shims.js.template
@ -0,0 +1,32 @@
+/**
+ * @fileoverview Provides named UMD shims for `rxjs/operators` and `rxjs/testing`.
+ * This file should be included in the "scripts" of a "ts_devserver"
+ * rule and the "deps" of a "ts_web_test_suite" rule.
+ */
+// rxjs/operators
+(function(factory) {
+  if (typeof module === 'object' && typeof module.exports === 'object') {
+    var v = factory(require, exports);
+    if (v !== undefined) module.exports = v;
+  } else if (typeof define === 'function' && define.amd) {
+    define('rxjs/operators', ['exports', 'rxjs'], factory);
+  }
+})(function(exports, rxjs) {
+  'use strict';
+  Object.keys(rxjs.operators).forEach(function(key) { exports[key] = rxjs.operators[key]; });
+  Object.defineProperty(exports, '__esModule', {value: true});
+});
+
+// rxjs/testing
+(function(factory) {
+  if (typeof module === 'object' && typeof module.exports === 'object') {
+    var v = factory(require, exports);
+    if (v !== undefined) module.exports = v;
+  } else if (typeof define === 'function' && define.amd) {
+    define('rxjs/testing', ['exports', 'rxjs'], factory);
+  }
+})(function(exports, rxjs) {
+  'use strict';
+  Object.keys(rxjs.testing).forEach(function(key) { exports[key] = rxjs.testing[key]; });
+  Object.defineProperty(exports, '__esModule', {value: true});
+});
--- a/packages/bazel/src/schematics/bazel-workspace/index.ts
+++ b/packages/bazel/src/schematics/bazel-workspace/index.ts
@ -90,7 +90,6 @@ export default function(options: BazelWorkspaceOptions): Rule {
      'RULES_NODEJS_VERSION': '0.18.6',
      'RULES_NODEJS_SHA256': '1416d03823fed624b49a0abbd9979f7c63bbedfd37890ddecedd2fe25cccebc6',
      'ANGULAR_VERSION': existingVersions.Angular || clean(latestVersions.Angular),
-      'RXJS_VERSION': existingVersions.RxJs || clean(latestVersions.RxJs),
      // TODO(kyliau): Consider moving this to latest-versions.ts
      'RULES_SASS_VERSION': '1.15.1',
    };
--- a/packages/bazel/src/schematics/ng-new/index.ts
+++ b/packages/bazel/src/schematics/ng-new/index.ts
@ -43,8 +43,8 @@ function addDevDependenciesToPackageJson(options: Schema) {
      // TODO(kyliau): Consider moving this to latest-versions.ts
      '@bazel/bazel': '^0.22.1',
      '@bazel/ibazel': '^0.9.0',
-      '@bazel/karma': '^0.23.2',
-      '@bazel/typescript': '^0.23.2',
+      '@bazel/karma': '^0.25.1',
+      '@bazel/typescript': '^0.25.1',
    };

    const recorder = host.beginUpdate(packageJson);
--- a/packages/bazel/test/ngc-wrapped/BUILD.bazel
+++ b/packages/bazel/test/ngc-wrapped/BUILD.bazel
@ -32,7 +32,7 @@ jasmine_node_test(
        "//packages/bazel/test/ngc-wrapped/empty:empty_tsconfig.json",
        "//packages/bazel/test/ngc-wrapped/empty:tsconfig.json",
        "//packages/private/testing",
-        "@build_bazel_rules_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
+        "@npm_bazel_typescript//third_party/github.com/bazelbuild/bazel/src/main/protobuf:worker_protocol.proto",
    ],
 )

--- a/packages/bazel/test/protractor-2/BUILD.bazel
+++ b/packages/bazel/test/protractor-2/BUILD.bazel
@ -1,5 +1,5 @@
 load("//packages/bazel:index.bzl", "protractor_web_test_suite")
-load("@build_bazel_rules_typescript//:defs.bzl", "ts_devserver")
+load("@npm_bazel_typescript//:defs.bzl", "ts_devserver")
 load("@build_bazel_rules_nodejs//:defs.bzl", "rollup_bundle")
 load("//tools:defaults.bzl", "ts_library")
 load("//tools/http-server:http_server.bzl", "http_server")
--- a/packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD.bazel
+++ b/packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf/BUILD.bazel
@ -0,0 +1,11 @@
+# Fetched from https://github.com/bazelbuild/bazel/blob/master/src/main/protobuf/worker_protocol.proto
+licenses(["notice"])
+
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "package_assets",
+    srcs = glob(["*"]),
+)
+
+exports_files(["worker_protocol.proto"])
--- a/packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf/LICENSE
+++ b/packages/bazel/third_party/github.com/bazelbuild/bazel/src/main/protobuf/LICENSE
@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ben Lesh	cb339b87f3	release: cut the v7.2.7 release	2019-02-26 16:20:57 -08:00
George Kalpakas	fdcf877f83	fix(core): traverse and sanitize content of unsafe elements (#28804 ) In the past, the sanitizer would remove unsafe elements, but still traverse and sanitize (and potentially preserve) their content. This was problematic in the case of `<style></style>` tags, whose content would be converted to HTML text nodes. In order to fix this, the sanitizer's behavior was changed in #25879 to ignore the content of _all_ unsafe elements. While this fixed the problem with `<style></style>` tags, it unnecessarily removed the contents for _any_ unsafe element. This was an unneeded breaking change. This commit partially restores the old sanitizer behavior (namely traversing content of unsafe elements), but introduces a list of elements whose content should not be traversed if the elements themselves are considered unsafe. Currently, this list contains `style`, `script` and `template`. Related to #25879 and #26007. Fixes #28427 PR Close #28804	2019-02-26 13:32:10 -08:00
Filipe Silva	5b5b9897c9	ci: add workspace prereq job to saucelabs_tests (#28973 ) Port of https://github.com/angular/angular/pull/28939, followup to https://github.com/angular/angular/pull/28965. PR Close #28973	2019-02-26 08:40:44 -08:00
George Kalpakas	0e7365724e	docs: re-phrase note in architecture guide for clarity (#28543 ) PR Close #28543	2019-02-26 08:39:17 -08:00
Author Name	4ef1a3cd97	docs: add Leonardo Zizzamia to GDE resources (#25935 ) PR Close #25935	2019-02-25 14:07:56 -08:00
Nikita Poltoratsky	38b5ed05ea	docs: add Nebular to UI Components section in resources (#28838 ) PR Close #28838	2019-02-25 12:54:58 -08:00
nchetankumar	642c015f23	docs: modify the descendant spelling and remove multiple times parent's word (#27886 ) PR Close #27886	2019-02-25 12:54:29 -08:00
Brandon	0977d95802	docs(core): export the `...Decorator` interfaces to ensure they are documented (#28836 ) (#28961 ) If an interface is not exported publicly from its package, then the doc-gen does not see it, and so cannot include it in the generated documentation. This was the case for a number of `...Decorator` interfaces, such as `PipeDecorator` and `InputDecorator. This commit adds these interfaces to the public export to fix this problem. PR Close #28836 PR Close #28961	2019-02-25 12:53:50 -08:00
Filipe Silva	d374787db6	ci: add bazel_repository_cache to CircleCI workspace (#28935 ) (#28965 ) PR Close #28935 PR Close #28965	2019-02-25 10:24:34 -08:00
Filipe Silva	a634deb885	ci: rename install job to setup (#28935 ) (#28965 ) Followup to https://github.com/angular/angular/pull/28928#pullrequestreview-207023800 PR Close #28935 PR Close #28965	2019-02-25 10:24:34 -08:00
Filipe Silva	bcbd7ed8f0	ci: share data between jobs using workspaces (#28928 ) (#28965 ) PR Close #28928 PR Close #28965	2019-02-25 10:24:34 -08:00
Mikhail Tatsky	f7de2be3f3	docs: add FancyGrid to resources page (#28949 ) PR Close #28949	2019-02-25 10:23:34 -08:00
Camille Roux	1e97d511c7	docs: add Human Coders trainings in resources.json (#28840 ) PR Close #28840	2019-02-25 10:23:01 -08:00
softchris	7e1e00c21e	docs: add ngVikings 2019 to events page (#28501 ) PR Close #28501	2019-02-25 10:22:28 -08:00
Rick Katka	481f4b7412	docs: Updated TOH Heros documentation (#28347 ) Updated the TOH Heros documentation to specify that the ng cli now generates 4 files PR Close #28347	2019-02-25 10:21:45 -08:00
Sarun Intaralawan	4bc0084e5a	docs(router): reword relativeLinkResolution docs to not mention version numbers (#26991 ) PR Close #26991	2019-02-22 14:35:55 -08:00
Greg Magolan	b6864494a1	fix(bazel): pin browser repositories using @npm_bazel_karma//:browser_repositories.bzl in bazel schematics (#28896 ) PR Close #28896	2019-02-22 12:19:00 -08:00
Greg Magolan	0021437ee1	build: fixes (#28896 ) PR Close #28896	2019-02-22 12:19:00 -08:00
Greg Magolan	d91ecd2c8b	build: update to rules_typescript 0.25.1 (#28896 ) * build_bazel_rules_typescript renamed to npm_bazel_typescript * build_bazel_rules_karma renamed to npm_bazel_karma * browser_repositories.bzl removed and now using @npm_bazel_karma//:browser_repositories.bzl * includes some fixes for future ts_library devmode es2015 support but some failure still remain when devmode is es2015 so this PR keeps it as es5 using the bazelOptions.devmodeTargetOverride tsconfig setting PR Close #28896	2019-02-22 12:18:59 -08:00
Keen Yee Liau	d0018e6bf6	fix(language-service): Fix completions for input/output with alias (#28904 ) This PR fixes a bug in autocompletion for @Input/@Output decorator with an alias. The current implementation ignores the alias. Credit for this work is attributed to @edgardmessias The original work fixed the bug, but was lacking test. PR Close #27959 PR Close #28904	2019-02-22 12:02:18 -08:00
Oscar Busk	587ca854cc	docs: clarify documentation about listening to progress events (#28892 ) PR Close #28892	2019-02-22 10:50:43 -08:00
Paul Gschwendtner	8b9f03d9fa	ci: run saucelabs legacy tests every hour (#28903 ) Initially when we introduced the cronjob for Saucelabs, we specified that the tests should run every 4h. Since the caretaker needs more recent results when merging PRs or before creating a release, we should run the saucelabs tests every hour. This still ensures that PRs are not affected by Saucelabs flakiness or incidents, and the caretaker can also react better to real browser failures (and isn't blocked on a 4h time frame) PR Close #28903	2019-02-22 09:52:06 -08:00
Daniel Ruf	40f1f94fe0	refactor: remove unused and duplicate CSS properties from styleguide examples (#28252 ) PR Close #28252	2019-02-22 09:51:36 -08:00
Jeferson Duwe	2270467d60	docs: fix ngSwitch example (#28899 ) docs: fix ngSwitch example remove the predix "app-" from the confuse emotion ngSwitchCase. PR Close #28899	2019-02-22 08:54:00 -08:00
Igor Minar	8efda5b353	feat(docs-infra): add meta[name]=Description to angular.io's index.html (#28916 ) This change makes angular.io more user and SEO friendly according to web.dev. See: https://web.dev/discoverable/write-descriptive-text PR Close #28916	2019-02-21 23:27:29 -08:00
Igor Minar	7b7f2d9c1b	fix(docs-infra): add [lang] attribute to index.html of angular.io (#28916 ) It's the right thing to do, and improves accessiblity. See: https://dequeuniversity.com/rules/axe/3.1/html-has-lang?application=lighthouse PR Close #28916	2019-02-21 23:27:28 -08:00
Igor Minar	c469e25cf2	fix(docs-infra): set the default html title to 'Angular' (#28916 ) This removes the annoying flicker while the app is loading. Also: it's just Angular. PR Close #28916	2019-02-21 23:27:28 -08:00
Igor Minar	a21cde2960	style(docs-infra): reformat using vscode html formatter (#28916 ) Makes it easier to keep on editing and reformatting the file. PR Close #28916	2019-02-21 23:27:28 -08:00
Filipe Silva	9b774348b3	ci: update circleci post checkout to v2 syntax (#28472 ) The `post` key is part of the CircleCI 1.0 syntax is not available in the 2.0 syntax. PR Close #28472	2019-02-21 22:18:22 -08:00
Vani	ce219ccfa2	docs(common): update docs for HttpClient methods (#26143 ) PR Close #26143	2019-02-21 20:56:13 -08:00
Greg Magolan	53bbb01047	build(bazel): cleanup the jasmine bootstrap code (#28906 ) PR Close #28906	2019-02-21 17:59:18 -08:00
Greg Magolan	c6741bf36a	build: no //package/bazel/src/api-extractor on the patch branch (#28901 ) PR Close #28901	2019-02-21 17:54:04 -08:00
Alex Eagle	cc06bf50f3	build: Add .bzl/BUILD files to @angular/bazel package (#28901 ) It's now possible to use it as a hybrid package in latest rules_nodejs, so no WORKSPACE dep is needed PR Close #28901	2019-02-21 17:53:56 -08:00
Greg Magolan	21e78ad022	build: no //package/bazel/src/api-extractor on the patch branch (#28901 ) PR Close #28901	2019-02-21 16:34:37 -08:00
Alex Eagle	05e855092b	build: Add .bzl/BUILD files to @angular/bazel package (#28901 ) It's now possible to use it as a hybrid package in latest rules_nodejs, so no WORKSPACE dep is needed PR Close #28901	2019-02-21 16:34:37 -08:00
George Kalpakas	2817764433	ci: make yarn globally available and independent of `$BASH_ENV` (#28889 ) Previously, our yarn (which overwrote the pre-installed yarn on the docker image) was only available through `$BASH_ENV` (as an exported function). This caused it to be undefined for commands executed in other shells (e.g. via Node.js' `child_process.spawn()` unless explicitly configuring it to run with `bash`). This commit fixes this by making our yarn version available globally via a symlink (`/usr/local/bin/yarn`). (This was accidentally broken in #28839.) PR Close #28889	2019-02-21 12:37:53 -08:00
Kapunahele Wong	145639d0f8	docs: edit resources description (#28764 ) PR Close #28764	2019-02-21 12:34:06 -08:00
Greg Magolan	3eb327b67b	build(bazel): do not build rxjs from source under Bazel (#28869 ) PR Close #28869	2019-02-21 08:05:25 -08:00
Paul Gschwendtner	be6af26dc1	ci: run saucelabs unit tests as cronjob (#28787 ) We no longer want to run Saucelabs for every PR/commit because Saucelabs has been very flaky recently and it blocks most of the PRs with a flaky failing state that we cannot fix most of the time due to upstream Saucelabs failures/incidents. Since real browsers tests rarely catch browser-specific failures (same as in Material), we should only run Saucelabs in a cronjob on the upstream branches. This still ensures/guarantees our browser compatibility, but makes our CI more stable and the PR workflow more productive. PR Close #28787	2019-02-20 16:47:31 -08:00
Paul Gschwendtner	637e81e9bb	build: remove legacy-unit-tests-local job (#28703 ) Since all unit tests are now run with Bazel, we can remove the local legacy unit tests job. We still need to keep the Saucelabs legacy job until we can run all of these web unit tests with Saucelabs and Bazel. PR Close #28703	2019-02-20 16:31:50 -08:00
Paul Gschwendtner	abc3cbb33f	build: run example unit tests with bazel (#28703 ) With #28402 we updated the `examples` package to be built and tested with Bazel. This PR was only intended for the e2e integration tests, and there still seem to be a few unit tests that need to be migrated to Bazel until we can remove the legacy local unit tests job. PR Close #28703	2019-02-20 16:31:50 -08:00
Igor Minar	27eb8f2723	build: update deps in ./scripts/release/post-check The versions were off and @angular/http dep was missing.	2019-02-20 13:14:33 -08:00