From c4335e2817672d2da86dde5db6e4be494c50128e Mon Sep 17 00:00:00 2001
From: Greg Magolan <gmagolan@gmail.com>
Date: Fri, 22 Nov 2019 13:12:05 -0800
Subject: [PATCH] build: update to nodejs rules 0.41.0 (#33996)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This bring is changes to the @nodejs repository required for https://github.com/angular/angular/pull/33927. See release notes for more details: https://github.com/bazelbuild/rules_nodejs/releases/tag/0.41.0.

rules_nodejs is approaching 1.0 and breaking changes for that release are being made more frequently. In this release, the ts_devserver API changed and it no longer injects html script tags into a provided index.html file. The diff on this commit is large as this breaking change affects quite a few tests.

Also note that we don’t update @angular/bazel schematics and integration/bazel as 0.41.0 is not a recommended update for angular users yet due to the breaking changes in ts_devserver & web_package (now named pkg_web). When a suitable plain npm package that is in progress is finished then it will be possible to easily replace the html injection functionality removed from ts_devserver & pkg_web.

PR Close #33996
---
 WORKSPACE                                     |   6 +-
 .../benchmarks/src/class_bindings/BUILD.bazel |   8 +-
 .../benchmarks/src/class_bindings/index.html  |   2 +
 .../benchmarks/src/expanding_rows/BUILD.bazel |  19 +-
 .../benchmarks/src/expanding_rows/index.html  |   3 +
 .../benchmarks/src/largeform/ng2/BUILD.bazel  |  10 +-
 .../benchmarks/src/largeform/ng2/index.html   |   3 +
 .../src/largetable/baseline/BUILD.bazel       |   2 +-
 .../src/largetable/baseline/index.html        |   3 +
 .../largetable/incremental_dom/BUILD.bazel    |   2 +-
 .../src/largetable/incremental_dom/index.html |   4 +
 .../benchmarks/src/largetable/iv/BUILD.bazel  |   4 +-
 .../benchmarks/src/largetable/iv/index.html   |   3 +
 .../benchmarks/src/largetable/ng2/BUILD.bazel |   8 +-
 .../benchmarks/src/largetable/ng2/index.html  |   3 +
 .../src/largetable/ng2_switch/BUILD.bazel     |  10 +-
 .../src/largetable/ng2_switch/index.html      |   3 +
 .../src/largetable/render3/BUILD.bazel        |   2 +-
 .../src/largetable/render3/index.html         |   3 +-
 .../benchmarks/src/tree/baseline/BUILD.bazel  |   2 +-
 .../benchmarks/src/tree/baseline/index.html   |   3 +
 .../src/tree/incremental_dom/BUILD.bazel      |   2 +-
 .../src/tree/incremental_dom/index.html       |   4 +
 modules/benchmarks/src/tree/iv/BUILD.bazel    |   4 +-
 modules/benchmarks/src/tree/iv/index.html     |   3 +
 modules/benchmarks/src/tree/ng1/BUILD.bazel   |   6 +-
 modules/benchmarks/src/tree/ng1/index.html    |   3 +
 modules/benchmarks/src/tree/ng2/BUILD.bazel   |   8 +-
 modules/benchmarks/src/tree/ng2/index.html    |   3 +
 .../benchmarks/src/tree/ng2_next/BUILD.bazel  |   2 +-
 .../benchmarks/src/tree/ng2_next/index.html   |   3 +
 .../src/tree/ng2_static/BUILD.bazel           |  10 +-
 .../benchmarks/src/tree/ng2_static/index.html |   3 +
 .../src/tree/ng2_switch/BUILD.bazel           |  10 +-
 .../benchmarks/src/tree/ng2_switch/index.html |   3 +
 .../benchmarks/src/tree/render3/BUILD.bazel   |   6 +-
 .../benchmarks/src/tree/render3/index.html    |   2 +
 .../src/tree/render3_function/BUILD.bazel     |   2 +-
 .../src/tree/render3_function/index.html      |   3 +
 modules/benchmarks/src/views/BUILD.bazel      |   5 +-
 .../playground/e2e_test/sourcemap/BUILD.bazel |  15 +-
 modules/playground/src/animate/BUILD.bazel    |   2 +-
 modules/playground/src/async/BUILD.bazel      |  10 +-
 modules/playground/src/async/index.html       |   3 +
 modules/playground/src/benchpress/BUILD.bazel |   2 +-
 modules/playground/src/gestures/BUILD.bazel   |  10 +-
 modules/playground/src/gestures/index.html    |   3 +
 .../playground/src/hello_world/BUILD.bazel    |  10 +-
 modules/playground/src/hello_world/index.html |   3 +
 modules/playground/src/http/BUILD.bazel       |  10 +-
 modules/playground/src/http/index.html        |   3 +
 modules/playground/src/jsonp/BUILD.bazel      |  10 +-
 modules/playground/src/jsonp/index.html       |   3 +
 modules/playground/src/key_events/BUILD.bazel |  10 +-
 modules/playground/src/key_events/index.html  |   3 +
 .../src/model_driven_forms/BUILD.bazel        |  10 +-
 .../src/model_driven_forms/index.html         |   3 +
 .../src/order_management/BUILD.bazel          |  10 +-
 .../src/order_management/index.html           |   3 +
 .../src/person_management/BUILD.bazel         |  10 +-
 .../src/person_management/index.html          |   3 +
 .../src/relative_assets/BUILD.bazel           |  12 +-
 .../playground/src/relative_assets/index.html |   3 +
 modules/playground/src/routing/BUILD.bazel    |   8 +-
 modules/playground/src/sourcemap/BUILD.bazel  |  10 +-
 modules/playground/src/sourcemap/index.html   |   3 +
 modules/playground/src/svg/BUILD.bazel        |  10 +-
 modules/playground/src/svg/index.html         |   3 +
 .../src/template_driven_forms/BUILD.bazel     |  10 +-
 .../src/template_driven_forms/index.html      |   3 +
 modules/playground/src/todo/BUILD.bazel       |  11 +-
 modules/playground/src/todo/index.html        |   3 +
 modules/playground/src/upgrade/BUILD.bazel    |  12 +-
 modules/playground/src/upgrade/index.html     |   3 +
 .../src/web_workers/animations/BUILD.bazel    |  12 +-
 .../src/web_workers/images/BUILD.bazel        |  24 +-
 .../src/web_workers/images/index.html         |   5 +
 .../src/web_workers/input/BUILD.bazel         |  20 +-
 .../src/web_workers/input/index.html          |   3 +
 .../src/web_workers/kitchen_sink/BUILD.bazel  |  20 +-
 .../src/web_workers/kitchen_sink/index.html   |   3 +
 .../web_workers/message_broker/BUILD.bazel    |  20 +-
 .../src/web_workers/message_broker/index.html |   3 +
 .../src/web_workers/router/BUILD.bazel        |  20 +-
 .../src/web_workers/router/index.html         |   3 +
 .../src/web_workers/todo/BUILD.bazel          |  22 +-
 .../src/web_workers/todo/index.html           |   3 +
 .../src/zippy_component/BUILD.bazel           |  10 +-
 .../playground/src/zippy_component/index.html |   3 +
 package.json                                  |  25 +-
 packages/examples/common/BUILD.bazel          |   8 +-
 packages/examples/core/BUILD.bazel            |  12 +-
 packages/examples/forms/BUILD.bazel           |   8 +-
 packages/examples/index.html                  |   3 +
 .../router/activated-route/BUILD.bazel        |   2 +-
 .../examples/service-worker/push/BUILD.bazel  |  12 +-
 .../registration-options/BUILD.bazel          |  12 +-
 packages/examples/upgrade/upgrade_example.bzl |   9 +-
 yarn.lock                                     | 286 ++++++------------
 99 files changed, 484 insertions(+), 476 deletions(-)

diff --git a/WORKSPACE b/WORKSPACE
index dc8fcedab1..cb8d456b02 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -8,8 +8,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch rules_nodejs so we can install our npm dependencies
 http_archive(
     name = "build_bazel_rules_nodejs",
-    sha256 = "9901bc17138a79135048fb0c107ee7a56e91815ec6594c08cb9a17b80276d62b",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.40.0/rules_nodejs-0.40.0.tar.gz"],
+    sha256 = "8dc1466f8563f3aa4ac7ab7aa3c96651eb7764108219f40b2d1c918e1a81c601",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/0.41.0/rules_nodejs-0.41.0.tar.gz"],
 )
 
 # Check the bazel version and download npm dependencies
@@ -29,7 +29,7 @@ Try running `yarn bazel` instead.
     minimum_bazel_version = "1.1.0",
 )
 
-check_rules_nodejs_version(minimum_version_string = "0.40.0")
+check_rules_nodejs_version(minimum_version_string = "0.41.0")
 
 # Setup the Node.js toolchain
 node_repositories(
diff --git a/modules/benchmarks/src/class_bindings/BUILD.bazel b/modules/benchmarks/src/class_bindings/BUILD.bazel
index c50b483053..da268c4048 100644
--- a/modules/benchmarks/src/class_bindings/BUILD.bazel
+++ b/modules/benchmarks/src/class_bindings/BUILD.bazel
@@ -41,12 +41,10 @@ ng_rollup_bundle(
 
 ts_devserver(
     name = "prodserver",
-    index_html = "index.html",
+    bootstrap = ["//packages/zone.js/dist:zone.js"],
     port = 4200,
-    static_files = [
-        ":bundle.min_debug.es2015.js",
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["index.html"],
+    deps = [":bundle.min_debug.es2015.js"],
 )
 
 benchmark_test(
diff --git a/modules/benchmarks/src/class_bindings/index.html b/modules/benchmarks/src/class_bindings/index.html
index 372f1a3209..6eb604d1a5 100644
--- a/modules/benchmarks/src/class_bindings/index.html
+++ b/modules/benchmarks/src/class_bindings/index.html
@@ -20,6 +20,8 @@
   <h1>Class Binding Benchmark</h1>
   <app-component>Loading...</app-component>
 
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 
 </html>
\ No newline at end of file
diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel
index 19ba89b5a4..281e9180f9 100644
--- a/modules/benchmarks/src/expanding_rows/BUILD.bazel
+++ b/modules/benchmarks/src/expanding_rows/BUILD.bazel
@@ -42,31 +42,22 @@ ng_rollup_bundle(
 
 ts_devserver(
     name = "prodserver",
-    index_html = "index.html",
+    bootstrap = ["//packages/zone.js/dist:zone.js"],
     port = 4200,
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-    ],
-    deps = [
-        ":bundle.min_debug.es2015.js",
-    ],
+    static_files = ["index.html"],
+    deps = [":bundle.min_debug.es2015.js"],
 )
 
 ts_devserver(
     name = "devserver",
+    bootstrap = ["//packages/zone.js/dist:zone.js"],
     entry_module = "angular/modules/benchmarks/src/expanding_rows/index_aot",
-    # Uncomment this to run devserver. This is due to limitation of ts_devserver
-    # that produces `index.html` by default so there cannot be two ts_devserver
-    # rules in a single Bazel package.
-    # index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["index.html"],
     deps = [":application_lib"],
 )
 
diff --git a/modules/benchmarks/src/expanding_rows/index.html b/modules/benchmarks/src/expanding_rows/index.html
index 802754abdd..7102757bd9 100644
--- a/modules/benchmarks/src/expanding_rows/index.html
+++ b/modules/benchmarks/src/expanding_rows/index.html
@@ -12,6 +12,9 @@
   <div id="rendererMode">...</div>
 
   <benchmark-root>Loading...</benchmark-root>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 
 </html>
diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel
index 59f0413ccd..de2ec488c9 100644
--- a/modules/benchmarks/src/largeform/ng2/BUILD.bazel
+++ b/modules/benchmarks/src/largeform/ng2/BUILD.bazel
@@ -26,17 +26,17 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "//packages/zone.js/dist:zone.js",
+    ],
     entry_module = "angular/modules/benchmarks/src/largeform/ng2/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["index.html"],
     tags = ["fixme-ivy-aot"],
     deps = [":ng2"],
 )
diff --git a/modules/benchmarks/src/largeform/ng2/index.html b/modules/benchmarks/src/largeform/ng2/index.html
index 8e327a95d3..5387a847f9 100644
--- a/modules/benchmarks/src/largeform/ng2/index.html
+++ b/modules/benchmarks/src/largeform/ng2/index.html
@@ -19,5 +19,8 @@
   <div>
     <app id="root">Loading...</app>
   </div>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/baseline/BUILD.bazel b/modules/benchmarks/src/largetable/baseline/BUILD.bazel
index 8fda5883d9..a6736eb2a8 100644
--- a/modules/benchmarks/src/largetable/baseline/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/baseline/BUILD.bazel
@@ -17,8 +17,8 @@ ts_library(
 ts_devserver(
     name = "devserver",
     entry_module = "angular/modules/benchmarks/src/largetable/baseline/index",
-    index_html = "index.html",
     port = 4200,
+    static_files = ["index.html"],
     deps = [":baseline"],
 )
 
diff --git a/modules/benchmarks/src/largetable/baseline/index.html b/modules/benchmarks/src/largetable/baseline/index.html
index 0095fb92ec..24c77dec65 100644
--- a/modules/benchmarks/src/largetable/baseline/index.html
+++ b/modules/benchmarks/src/largetable/baseline/index.html
@@ -28,5 +28,8 @@
   <div>
     <largetable id="root">Loading...</largetable>
   </div>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel
index 37bc3ec86b..09d3bf1f9f 100644
--- a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel
@@ -17,9 +17,9 @@ ts_library(
 ts_devserver(
     name = "devserver",
     entry_module = "angular/modules/benchmarks/src/largetable/incremental_dom/index",
-    index_html = "index.html",
     port = 4200,
     static_files = [
+        "index.html",
         "@npm//:node_modules/incremental-dom/dist/incremental-dom.js",
     ],
     deps = [":incremental_dom"],
diff --git a/modules/benchmarks/src/largetable/incremental_dom/index.html b/modules/benchmarks/src/largetable/incremental_dom/index.html
index b2a38bcca1..14ecfe9469 100644
--- a/modules/benchmarks/src/largetable/incremental_dom/index.html
+++ b/modules/benchmarks/src/largetable/incremental_dom/index.html
@@ -28,5 +28,9 @@
   <div>
     <largetable id="root"></largetable>
   </div>
+
+  <script src="/npm/node_modules/incremental-dom/dist/incremental-dom.js"></script>
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/iv/BUILD.bazel b/modules/benchmarks/src/largetable/iv/BUILD.bazel
index 841de7c483..95f5fc7c2c 100644
--- a/modules/benchmarks/src/largetable/iv/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/iv/BUILD.bazel
@@ -5,9 +5,9 @@ package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 
 ts_devserver(
     name = "devserver",
-    index_html = "index.html",
+    bootstrap = ["largetable.js"],
     port = 4200,
-    static_files = ["largetable.js"],
+    static_files = ["index.html"],
 )
 
 benchmark_test(
diff --git a/modules/benchmarks/src/largetable/iv/index.html b/modules/benchmarks/src/largetable/iv/index.html
index 77b2962159..0d617977f4 100644
--- a/modules/benchmarks/src/largetable/iv/index.html
+++ b/modules/benchmarks/src/largetable/iv/index.html
@@ -28,5 +28,8 @@
 <div>
   <largetable id="root"></largetable>
 </div>
+
+<!--default load location for ts_devserver-->
+<script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel
index 933b10f7f4..1b9261590c 100644
--- a/modules/benchmarks/src/largetable/ng2/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/ng2/BUILD.bazel
@@ -34,12 +34,10 @@ ng_rollup_bundle(
 
 ts_devserver(
     name = "prodserver",
-    index_html = "index.html",
+    bootstrap = ["//packages/zone.js/dist:zone.js"],
     port = 4200,
-    static_files = [
-        ":bundle.min_debug.es2015.js",
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["index.html"],
+    deps = [":bundle.min_debug.es2015.js"],
 )
 
 benchmark_test(
diff --git a/modules/benchmarks/src/largetable/ng2/index.html b/modules/benchmarks/src/largetable/ng2/index.html
index f854962b57..ae62b58dc7 100644
--- a/modules/benchmarks/src/largetable/ng2/index.html
+++ b/modules/benchmarks/src/largetable/ng2/index.html
@@ -28,5 +28,8 @@
   <div>
     <largetable id="root">Loading...</largetable>
   </div>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel
index a0a4d2e4b0..b396ffd492 100644
--- a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel
@@ -22,17 +22,17 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "//packages/zone.js/dist:zone.js",
+    ],
     entry_module = "angular/modules/benchmarks/src/largetable/ng2_switch/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["index.html"],
     deps = [":ng2_switch"],
 )
 
diff --git a/modules/benchmarks/src/largetable/ng2_switch/index.html b/modules/benchmarks/src/largetable/ng2_switch/index.html
index 5db094975b..598703744a 100644
--- a/modules/benchmarks/src/largetable/ng2_switch/index.html
+++ b/modules/benchmarks/src/largetable/ng2_switch/index.html
@@ -28,5 +28,8 @@
   <div>
     <largetable id="root">Loading...</largetable>
   </div>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel
index 5309500cb3..15cb93b405 100644
--- a/modules/benchmarks/src/largetable/render3/BUILD.bazel
+++ b/modules/benchmarks/src/largetable/render3/BUILD.bazel
@@ -32,8 +32,8 @@ ng_rollup_bundle(
 
 ts_devserver(
     name = "devserver",
-    index_html = "index.html",
     port = 4200,
+    static_files = ["index.html"],
     tags = ["ivy-only"],
     deps = [
         ":bundle.min_debug.js",
diff --git a/modules/benchmarks/src/largetable/render3/index.html b/modules/benchmarks/src/largetable/render3/index.html
index 20848764c7..0f2fb82948 100644
--- a/modules/benchmarks/src/largetable/render3/index.html
+++ b/modules/benchmarks/src/largetable/render3/index.html
@@ -28,6 +28,7 @@
     <largetable id="root"></largetable>
   </div>
 
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
-
 </html>
diff --git a/modules/benchmarks/src/tree/baseline/BUILD.bazel b/modules/benchmarks/src/tree/baseline/BUILD.bazel
index 328724542e..a3060d30cf 100644
--- a/modules/benchmarks/src/tree/baseline/BUILD.bazel
+++ b/modules/benchmarks/src/tree/baseline/BUILD.bazel
@@ -17,8 +17,8 @@ ts_library(
 ts_devserver(
     name = "devserver",
     entry_module = "angular/modules/benchmarks/src/tree/baseline/index",
-    index_html = "index.html",
     port = 4200,
+    static_files = ["index.html"],
     deps = [":baseline"],
 )
 
diff --git a/modules/benchmarks/src/tree/baseline/index.html b/modules/benchmarks/src/tree/baseline/index.html
index 699ec7c6a4..9ea7846230 100644
--- a/modules/benchmarks/src/tree/baseline/index.html
+++ b/modules/benchmarks/src/tree/baseline/index.html
@@ -25,5 +25,8 @@
   <div>
     <tree id="root">Loading...</tree>
   </div>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel
index dc17b18cca..da73f062fe 100644
--- a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel
+++ b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel
@@ -18,9 +18,9 @@ ts_library(
 ts_devserver(
     name = "devserver",
     entry_module = "angular/modules/benchmarks/src/tree/incremental_dom/index",
-    index_html = "index.html",
     port = 4200,
     static_files = [
+        "index.html",
         "@npm//:node_modules/incremental-dom/dist/incremental-dom.js",
     ],
     deps = [":incremental_dom"],
diff --git a/modules/benchmarks/src/tree/incremental_dom/index.html b/modules/benchmarks/src/tree/incremental_dom/index.html
index d7cc5a729e..39b7334c8c 100644
--- a/modules/benchmarks/src/tree/incremental_dom/index.html
+++ b/modules/benchmarks/src/tree/incremental_dom/index.html
@@ -25,5 +25,9 @@
   <div>
     <tree id="root"></tree>
   </div>
+
+  <script src="/npm/node_modules/incremental-dom/dist/incremental-dom.js"></script>
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/iv/BUILD.bazel b/modules/benchmarks/src/tree/iv/BUILD.bazel
index 9452166c28..5873acb827 100644
--- a/modules/benchmarks/src/tree/iv/BUILD.bazel
+++ b/modules/benchmarks/src/tree/iv/BUILD.bazel
@@ -5,9 +5,9 @@ package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 
 ts_devserver(
     name = "devserver",
-    index_html = "index.html",
+    bootstrap = ["tree.js"],
     port = 4200,
-    static_files = ["tree.js"],
+    static_files = ["index.html"],
 )
 
 benchmark_test(
diff --git a/modules/benchmarks/src/tree/iv/index.html b/modules/benchmarks/src/tree/iv/index.html
index 385950f554..3888d84510 100644
--- a/modules/benchmarks/src/tree/iv/index.html
+++ b/modules/benchmarks/src/tree/iv/index.html
@@ -28,5 +28,8 @@
     Change detection runs:<span id="numberOfChecks"></span>
   </div>
   <div id="root"></div>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/ng1/BUILD.bazel b/modules/benchmarks/src/tree/ng1/BUILD.bazel
index 1308536f8a..bced171271 100644
--- a/modules/benchmarks/src/tree/ng1/BUILD.bazel
+++ b/modules/benchmarks/src/tree/ng1/BUILD.bazel
@@ -16,12 +16,10 @@ ts_library(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = ["@npm//:node_modules/angular/angular.js"],
     entry_module = "angular/modules/benchmarks/src/tree/ng1/index",
-    index_html = "index.html",
     port = 4200,
-    static_files = [
-        "@npm//:node_modules/angular/angular.js",
-    ],
+    static_files = ["index.html"],
     deps = [":ng1"],
 )
 
diff --git a/modules/benchmarks/src/tree/ng1/index.html b/modules/benchmarks/src/tree/ng1/index.html
index fd2417335b..c663ad7676 100644
--- a/modules/benchmarks/src/tree/ng1/index.html
+++ b/modules/benchmarks/src/tree/ng1/index.html
@@ -30,5 +30,8 @@
   <div>
     <tree id="root" data="initData">Loading...</tree>
   </div>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel
index c5fe531e3c..33175149f6 100644
--- a/modules/benchmarks/src/tree/ng2/BUILD.bazel
+++ b/modules/benchmarks/src/tree/ng2/BUILD.bazel
@@ -34,12 +34,10 @@ ng_rollup_bundle(
 
 ts_devserver(
     name = "prodserver",
-    index_html = "index.html",
+    bootstrap = ["//packages/zone.js/dist:zone.js"],
     port = 4200,
-    static_files = [
-        ":bundle.min_debug.es2015.js",
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["index.html"],
+    deps = [":bundle.min_debug.es2015.js"],
 )
 
 benchmark_test(
diff --git a/modules/benchmarks/src/tree/ng2/index.html b/modules/benchmarks/src/tree/ng2/index.html
index 77a057eee8..b878697ded 100644
--- a/modules/benchmarks/src/tree/ng2/index.html
+++ b/modules/benchmarks/src/tree/ng2/index.html
@@ -30,5 +30,8 @@
   <div>
     <tree id="root">Loading...</tree>
   </div>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel
index 093e546e79..a0d881191c 100644
--- a/modules/benchmarks/src/tree/ng2_next/BUILD.bazel
+++ b/modules/benchmarks/src/tree/ng2_next/BUILD.bazel
@@ -20,12 +20,12 @@ ts_library(
 ts_devserver(
     name = "devserver",
     entry_module = "angular/modules/benchmarks/src/tree/ng2_next/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
+    static_files = ["index.html"],
     deps = [":ng2_next"],
 )
 
diff --git a/modules/benchmarks/src/tree/ng2_next/index.html b/modules/benchmarks/src/tree/ng2_next/index.html
index a33afdc075..b4770de031 100644
--- a/modules/benchmarks/src/tree/ng2_next/index.html
+++ b/modules/benchmarks/src/tree/ng2_next/index.html
@@ -30,5 +30,8 @@
   <div>
     <tree id="root">Loading...</tree>
   </div>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel
index c9766d7240..55b8eca884 100644
--- a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel
+++ b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel
@@ -19,17 +19,17 @@ ts_library(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "//packages/zone.js/dist:zone.js",
+    ],
     entry_module = "angular/modules/benchmarks/src/tree/ng2_static/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["index.html"],
     deps = [":ng2_static"],
 )
 
diff --git a/modules/benchmarks/src/tree/ng2_static/index.html b/modules/benchmarks/src/tree/ng2_static/index.html
index 187d49502d..373b3daf48 100644
--- a/modules/benchmarks/src/tree/ng2_static/index.html
+++ b/modules/benchmarks/src/tree/ng2_static/index.html
@@ -24,5 +24,8 @@
   <div>
     <tree id="root"></tree>
   </div>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel
index 17844d3970..49638ccee8 100644
--- a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel
+++ b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel
@@ -22,17 +22,17 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "//packages/zone.js/dist:zone.js",
+    ],
     entry_module = "angular/modules/benchmarks/src/tree/ng2_switch/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["index.html"],
     deps = [":ng2_switch"],
 )
 
diff --git a/modules/benchmarks/src/tree/ng2_switch/index.html b/modules/benchmarks/src/tree/ng2_switch/index.html
index 23ece16191..840e4268f9 100644
--- a/modules/benchmarks/src/tree/ng2_switch/index.html
+++ b/modules/benchmarks/src/tree/ng2_switch/index.html
@@ -25,5 +25,8 @@
   <div>
     <tree id="root">Loading...</tree>
   </div>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/render3/BUILD.bazel b/modules/benchmarks/src/tree/render3/BUILD.bazel
index 6f22d21252..004e5728ed 100644
--- a/modules/benchmarks/src/tree/render3/BUILD.bazel
+++ b/modules/benchmarks/src/tree/render3/BUILD.bazel
@@ -31,12 +31,10 @@ ng_rollup_bundle(
 
 ts_devserver(
     name = "devserver",
-    index_html = "index.html",
     port = 4200,
+    static_files = ["index.html"],
     tags = ["ivy-only"],
-    deps = [
-        ":bundle.min_debug.js",
-    ],
+    deps = [":bundle.min_debug.js"],
 )
 
 benchmark_test(
diff --git a/modules/benchmarks/src/tree/render3/index.html b/modules/benchmarks/src/tree/render3/index.html
index 49729f60ed..d70039e5bf 100644
--- a/modules/benchmarks/src/tree/render3/index.html
+++ b/modules/benchmarks/src/tree/render3/index.html
@@ -31,5 +31,7 @@
     <tree id="root"></tree>
   </div>
 
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/render3_function/BUILD.bazel b/modules/benchmarks/src/tree/render3_function/BUILD.bazel
index 4c3380d5be..13ecc192a5 100644
--- a/modules/benchmarks/src/tree/render3_function/BUILD.bazel
+++ b/modules/benchmarks/src/tree/render3_function/BUILD.bazel
@@ -18,12 +18,12 @@ ts_library(
 ts_devserver(
     name = "devserver",
     entry_module = "angular/modules/benchmarks/src/tree/render3_function/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
+    static_files = ["index.html"],
     deps = [":render3_function_lib"],
 )
 
diff --git a/modules/benchmarks/src/tree/render3_function/index.html b/modules/benchmarks/src/tree/render3_function/index.html
index 5b972bc138..3b5d60e300 100644
--- a/modules/benchmarks/src/tree/render3_function/index.html
+++ b/modules/benchmarks/src/tree/render3_function/index.html
@@ -35,5 +35,8 @@
     // TODO(mlaval): remove once we have a proper solution
     ngDevMode = false;
   </script>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/views/BUILD.bazel b/modules/benchmarks/src/views/BUILD.bazel
index aacd52d789..fbd6e94194 100644
--- a/modules/benchmarks/src/views/BUILD.bazel
+++ b/modules/benchmarks/src/views/BUILD.bazel
@@ -38,17 +38,14 @@ ts_devserver(
 
 ts_devserver(
     name = "devserver",
-    data = [
-        "//packages/zone.js/dist:zone.js",
-    ],
     entry_module = "angular/modules/benchmarks/src/views/index",
-    index_html = "index.html",
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     serving_path = "/index.js",
     static_files = [
+        "//packages/zone.js/dist:zone.js",
         "index.html",
     ],
     deps = [":application_lib"],
diff --git a/modules/playground/e2e_test/sourcemap/BUILD.bazel b/modules/playground/e2e_test/sourcemap/BUILD.bazel
index 943adc8d2a..2ee1cb2304 100644
--- a/modules/playground/e2e_test/sourcemap/BUILD.bazel
+++ b/modules/playground/e2e_test/sourcemap/BUILD.bazel
@@ -1,11 +1,24 @@
 load("//modules/playground/e2e_test:example_test.bzl", "example_test")
 
+filegroup(
+    name = "protractor_web_test_data_workaroud",
+    srcs = ["//modules/playground/src/sourcemap:index.ts"],
+)
+# Work-around for protractor_web_test data not allowing files.
+# TODO(gregmagolan): remove this work-around once this is fixed in rules_nodejs
+# ```
+# ERROR: /Users/greg/google/angular-2/modules/playground/e2e_test/sourcemap/BUILD.bazel:8:1:
+# in data attribute of _protractor_web_test rule //modules/playground/e2e_test/sourcemap:protractor_tests_wrapped_test:
+# source file '//modules/playground/src/sourcemap:index.ts' is misplaced here (expected no files). Since this rule was
+# created by the macro 'example_test', the error might have been caused by the macro implementation
+# ```
+
 example_test(
     name = "sourcemap",
     srcs = glob(["**/*.ts"]),
     data = [
+        ":protractor_web_test_data_workaroud",
         "//modules/playground/src/sourcemap",
-        "//modules/playground/src/sourcemap:index.ts",
     ],
     server = "//modules/playground/src/sourcemap:devserver",
 )
diff --git a/modules/playground/src/animate/BUILD.bazel b/modules/playground/src/animate/BUILD.bazel
index 0accbfa6ac..a6fdeba3a7 100644
--- a/modules/playground/src/animate/BUILD.bazel
+++ b/modules/playground/src/animate/BUILD.bazel
@@ -21,10 +21,10 @@ ng_module(
 ts_devserver(
     name = "devserver",
     entry_module = "angular/modules/playground/src/animate/index",
-    index_html = "index.html",
     port = 4200,
     scripts = ["@npm//:node_modules/tslib/tslib.js"],
     static_files = [
+        "index.html",
         "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
diff --git a/modules/playground/src/async/BUILD.bazel b/modules/playground/src/async/BUILD.bazel
index 2fd9313899..166b3a72b5 100644
--- a/modules/playground/src/async/BUILD.bazel
+++ b/modules/playground/src/async/BUILD.bazel
@@ -18,16 +18,16 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/async/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
+    static_files = ["index.html"],
     deps = [":async"],
 )
diff --git a/modules/playground/src/async/index.html b/modules/playground/src/async/index.html
index 5d56cfbef2..bd41bbbabe 100644
--- a/modules/playground/src/async/index.html
+++ b/modules/playground/src/async/index.html
@@ -8,5 +8,8 @@
   <async-app>
     Loading...
   </async-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/benchpress/BUILD.bazel b/modules/playground/src/benchpress/BUILD.bazel
index 5c51cf1ce6..c165b20a2b 100644
--- a/modules/playground/src/benchpress/BUILD.bazel
+++ b/modules/playground/src/benchpress/BUILD.bazel
@@ -4,6 +4,6 @@ package(default_visibility = ["//modules/playground:__subpackages__"])
 
 ts_devserver(
     name = "devserver",
-    index_html = "index.html",
     port = 4200,
+    static_files = ["index.html"],
 )
diff --git a/modules/playground/src/gestures/BUILD.bazel b/modules/playground/src/gestures/BUILD.bazel
index 8d64d4e81a..74cb0c81b6 100644
--- a/modules/playground/src/gestures/BUILD.bazel
+++ b/modules/playground/src/gestures/BUILD.bazel
@@ -20,14 +20,14 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    entry_module = "angular/modules/playground/src/gestures/index",
-    index_html = "index.html",
-    port = 4200,
-    scripts = ["@npm//:node_modules/tslib/tslib.js"],
-    static_files = [
+    bootstrap = [
         "@npm//:node_modules/hammerjs/hammer.js",
         "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
+    entry_module = "angular/modules/playground/src/gestures/index",
+    port = 4200,
+    scripts = ["@npm//:node_modules/tslib/tslib.js"],
+    static_files = ["index.html"],
     deps = [":gestures"],
 )
diff --git a/modules/playground/src/gestures/index.html b/modules/playground/src/gestures/index.html
index fe941f1e00..342ab8c867 100644
--- a/modules/playground/src/gestures/index.html
+++ b/modules/playground/src/gestures/index.html
@@ -14,5 +14,8 @@
   </head>
 <body>
   <gestures-app></gestures-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/hello_world/BUILD.bazel b/modules/playground/src/hello_world/BUILD.bazel
index f58f8bfb91..48f63bd7ff 100644
--- a/modules/playground/src/hello_world/BUILD.bazel
+++ b/modules/playground/src/hello_world/BUILD.bazel
@@ -18,16 +18,16 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/hello_world/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
+    static_files = ["index.html"],
     deps = [":hello_world"],
 )
diff --git a/modules/playground/src/hello_world/index.html b/modules/playground/src/hello_world/index.html
index 3bac186b20..78c716ad57 100644
--- a/modules/playground/src/hello_world/index.html
+++ b/modules/playground/src/hello_world/index.html
@@ -5,5 +5,8 @@
   <hello-app>
     Loading...
   </hello-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/http/BUILD.bazel b/modules/playground/src/http/BUILD.bazel
index 95cbf53ae6..b7f17f4e6c 100644
--- a/modules/playground/src/http/BUILD.bazel
+++ b/modules/playground/src/http/BUILD.bazel
@@ -20,17 +20,19 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    data = ["people.json"],
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/http/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "people.json",
+        "index.html",
     ],
     deps = [":http"],
 )
diff --git a/modules/playground/src/http/index.html b/modules/playground/src/http/index.html
index 229d9303f3..3c4fb428ea 100644
--- a/modules/playground/src/http/index.html
+++ b/modules/playground/src/http/index.html
@@ -5,5 +5,8 @@
   <http-app>
     Loading...
   </http-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/jsonp/BUILD.bazel b/modules/playground/src/jsonp/BUILD.bazel
index 04ac7c119e..b297bc05d9 100644
--- a/modules/playground/src/jsonp/BUILD.bazel
+++ b/modules/playground/src/jsonp/BUILD.bazel
@@ -19,17 +19,19 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    data = ["people.json"],
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/jsonp/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "people.json",
+        "index.html",
     ],
     deps = [":jsonp"],
 )
diff --git a/modules/playground/src/jsonp/index.html b/modules/playground/src/jsonp/index.html
index 5ea6a289d7..ba606cc404 100644
--- a/modules/playground/src/jsonp/index.html
+++ b/modules/playground/src/jsonp/index.html
@@ -5,5 +5,8 @@
   <jsonp-app>
     Loading...
   </jsonp-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/key_events/BUILD.bazel b/modules/playground/src/key_events/BUILD.bazel
index f893575e6b..c12742c8dc 100644
--- a/modules/playground/src/key_events/BUILD.bazel
+++ b/modules/playground/src/key_events/BUILD.bazel
@@ -18,16 +18,16 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/key_events/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
+    static_files = ["index.html"],
     deps = [":key_events"],
 )
diff --git a/modules/playground/src/key_events/index.html b/modules/playground/src/key_events/index.html
index 99d1babc80..75b61536af 100644
--- a/modules/playground/src/key_events/index.html
+++ b/modules/playground/src/key_events/index.html
@@ -20,5 +20,8 @@
   <key-events-app>
     Loading...
   </key-events-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/model_driven_forms/BUILD.bazel b/modules/playground/src/model_driven_forms/BUILD.bazel
index f7116d62fe..4dc39bce98 100644
--- a/modules/playground/src/model_driven_forms/BUILD.bazel
+++ b/modules/playground/src/model_driven_forms/BUILD.bazel
@@ -19,16 +19,16 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/model_driven_forms/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
+    static_files = ["index.html"],
     deps = [":model_driven_forms"],
 )
diff --git a/modules/playground/src/model_driven_forms/index.html b/modules/playground/src/model_driven_forms/index.html
index fcc8603b8d..6cdb44f8d1 100644
--- a/modules/playground/src/model_driven_forms/index.html
+++ b/modules/playground/src/model_driven_forms/index.html
@@ -13,5 +13,8 @@
   <reactive-forms>
     Loading...
   </reactive-forms>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/order_management/BUILD.bazel b/modules/playground/src/order_management/BUILD.bazel
index c53cf7af57..65f58a5d4a 100644
--- a/modules/playground/src/order_management/BUILD.bazel
+++ b/modules/playground/src/order_management/BUILD.bazel
@@ -19,16 +19,16 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/order_management/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
+    static_files = ["index.html"],
     deps = [":order_management"],
 )
diff --git a/modules/playground/src/order_management/index.html b/modules/playground/src/order_management/index.html
index 21a1f48317..19dcd4822a 100644
--- a/modules/playground/src/order_management/index.html
+++ b/modules/playground/src/order_management/index.html
@@ -13,5 +13,8 @@
   <order-management-app>
     Loading...
   </order-management-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/person_management/BUILD.bazel b/modules/playground/src/person_management/BUILD.bazel
index ea1d37098f..8630d830fe 100644
--- a/modules/playground/src/person_management/BUILD.bazel
+++ b/modules/playground/src/person_management/BUILD.bazel
@@ -19,16 +19,16 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/person_management/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
+    static_files = ["index.html"],
     deps = [":person_management"],
 )
diff --git a/modules/playground/src/person_management/index.html b/modules/playground/src/person_management/index.html
index 13569410aa..36cd2ed1da 100644
--- a/modules/playground/src/person_management/index.html
+++ b/modules/playground/src/person_management/index.html
@@ -13,5 +13,8 @@
   <person-management-app>
     Loading...
   </person-management-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/relative_assets/BUILD.bazel b/modules/playground/src/relative_assets/BUILD.bazel
index 238d01e783..9925256103 100644
--- a/modules/playground/src/relative_assets/BUILD.bazel
+++ b/modules/playground/src/relative_assets/BUILD.bazel
@@ -27,20 +27,20 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    data = [
-        "app/style.css",
-        "app/tpl.html",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     entry_module = "angular/modules/playground/src/relative_assets/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "app/style.css",
+        "app/tpl.html",
+        "index.html",
     ],
     deps = [":relative_assets"],
 )
diff --git a/modules/playground/src/relative_assets/index.html b/modules/playground/src/relative_assets/index.html
index 2bebbe2b2e..7d3e6aec96 100644
--- a/modules/playground/src/relative_assets/index.html
+++ b/modules/playground/src/relative_assets/index.html
@@ -5,5 +5,8 @@
   <relative-app>
     Loading...
   </relative-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/routing/BUILD.bazel b/modules/playground/src/routing/BUILD.bazel
index 03eea1f732..cf0f917b28 100644
--- a/modules/playground/src/routing/BUILD.bazel
+++ b/modules/playground/src/routing/BUILD.bazel
@@ -21,7 +21,8 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    data = [
+    port = 4200,
+    static_files = [
         # This is temporarily needed because Angular imports from "rxjs/operators/index", while
         # there is only one RxJS UMD bundle that re-exports everything at the root.
         "//modules/playground:systemjs-rxjs-operators.js",
@@ -29,15 +30,12 @@ ts_devserver(
         "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
         "@npm//:node_modules/tslib/tslib.js",
         "//packages/zone.js/dist:zone.js",
-    ] + glob(["**/*.css"]),
-    port = 4200,
-    static_files = [
         "index.html",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
         "@npm//:node_modules/systemjs/dist/system.js",
         "//modules/playground:systemjs-config.js",
         "load-app.js",
-    ],
+    ] + glob(["**/*.css"]),
     deps = [
         ":routing",
         "//packages/zone.js/lib",
diff --git a/modules/playground/src/sourcemap/BUILD.bazel b/modules/playground/src/sourcemap/BUILD.bazel
index e354347ccc..7fc97f6af6 100644
--- a/modules/playground/src/sourcemap/BUILD.bazel
+++ b/modules/playground/src/sourcemap/BUILD.bazel
@@ -22,16 +22,16 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/sourcemap/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
+    static_files = ["index.html"],
     deps = [":sourcemap"],
 )
diff --git a/modules/playground/src/sourcemap/index.html b/modules/playground/src/sourcemap/index.html
index b16b2d6006..3a4d06e7df 100644
--- a/modules/playground/src/sourcemap/index.html
+++ b/modules/playground/src/sourcemap/index.html
@@ -10,5 +10,8 @@
   Please look into the console and check whether the stack trace is mapped
   via source maps!
   </p>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/svg/BUILD.bazel b/modules/playground/src/svg/BUILD.bazel
index 95092d0e47..5ac742e3bf 100644
--- a/modules/playground/src/svg/BUILD.bazel
+++ b/modules/playground/src/svg/BUILD.bazel
@@ -18,16 +18,16 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/svg/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
+    static_files = ["index.html"],
     deps = [":svg"],
 )
diff --git a/modules/playground/src/svg/index.html b/modules/playground/src/svg/index.html
index fb0d1490d9..b44ec42036 100644
--- a/modules/playground/src/svg/index.html
+++ b/modules/playground/src/svg/index.html
@@ -5,5 +5,8 @@
   <svg-app>
     Loading...
   </svg-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/template_driven_forms/BUILD.bazel b/modules/playground/src/template_driven_forms/BUILD.bazel
index 88132dfd8e..28f3848c6d 100644
--- a/modules/playground/src/template_driven_forms/BUILD.bazel
+++ b/modules/playground/src/template_driven_forms/BUILD.bazel
@@ -19,16 +19,16 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/template_driven_forms/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
+    static_files = ["index.html"],
     deps = [":template_driven_forms"],
 )
diff --git a/modules/playground/src/template_driven_forms/index.html b/modules/playground/src/template_driven_forms/index.html
index 76bb1fdb79..575ce42592 100644
--- a/modules/playground/src/template_driven_forms/index.html
+++ b/modules/playground/src/template_driven_forms/index.html
@@ -13,5 +13,8 @@
   <template-driven-forms>
     Loading...
   </template-driven-forms>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/todo/BUILD.bazel b/modules/playground/src/todo/BUILD.bazel
index b8d249af06..73033a2d00 100644
--- a/modules/playground/src/todo/BUILD.bazel
+++ b/modules/playground/src/todo/BUILD.bazel
@@ -22,14 +22,13 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    data = glob(["**/*.css"]),
-    entry_module = "angular/modules/playground/src/todo/index",
-    index_html = "index.html",
-    port = 4200,
-    scripts = ["@npm//:node_modules/tslib/tslib.js"],
-    static_files = [
+    bootstrap = [
         "//packages/zone.js/dist:zone.js",
         "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
+    entry_module = "angular/modules/playground/src/todo/index",
+    port = 4200,
+    scripts = ["@npm//:node_modules/tslib/tslib.js"],
+    static_files = ["index.html"] + glob(["**/*.css"]),
     deps = [":todo"],
 )
diff --git a/modules/playground/src/todo/index.html b/modules/playground/src/todo/index.html
index 9a519073ef..602a1dd375 100644
--- a/modules/playground/src/todo/index.html
+++ b/modules/playground/src/todo/index.html
@@ -7,5 +7,8 @@
   <todo-app>
     Loading...
   </todo-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/upgrade/BUILD.bazel b/modules/playground/src/upgrade/BUILD.bazel
index f96ebaba95..764deb64fb 100644
--- a/modules/playground/src/upgrade/BUILD.bazel
+++ b/modules/playground/src/upgrade/BUILD.bazel
@@ -18,17 +18,17 @@ ts_library(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "@npm//:node_modules/angular/angular.js",
+    ],
     entry_module = "angular/modules/playground/src/upgrade/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-        "@npm//:node_modules/angular/angular.js",
-    ],
+    static_files = ["index.html"],
     deps = [":upgrade"],
 )
diff --git a/modules/playground/src/upgrade/index.html b/modules/playground/src/upgrade/index.html
index 0851d9079d..d2dac5b130 100644
--- a/modules/playground/src/upgrade/index.html
+++ b/modules/playground/src/upgrade/index.html
@@ -16,5 +16,8 @@
     <hr>
     <span class="greeting">Greetings from {{name}}!</span>
   </upgrade-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/web_workers/animations/BUILD.bazel b/modules/playground/src/web_workers/animations/BUILD.bazel
index 9bfcf4870f..be7e5c1bfd 100644
--- a/modules/playground/src/web_workers/animations/BUILD.bazel
+++ b/modules/playground/src/web_workers/animations/BUILD.bazel
@@ -19,16 +19,16 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    data = [
+    entry_module = "angular/modules/playground/src/web_workers/animations/index",
+    port = 4200,
+    scripts = ["@npm//:node_modules/tslib/tslib.js"],
+    static_files = [
         "loader.js",
         "//modules/playground/src/web_workers:worker-config",
         "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
         "@npm//:node_modules/tslib/tslib.js",
+        "index.html",
+        "//packages/zone.js/dist:zone.js",
     ],
-    entry_module = "angular/modules/playground/src/web_workers/animations/index",
-    index_html = "index.html",
-    port = 4200,
-    scripts = ["@npm//:node_modules/tslib/tslib.js"],
-    static_files = ["//packages/zone.js/dist:zone.js"],
     deps = [":animations"],
 )
diff --git a/modules/playground/src/web_workers/images/BUILD.bazel b/modules/playground/src/web_workers/images/BUILD.bazel
index e456bd3b8f..e614a44c16 100644
--- a/modules/playground/src/web_workers/images/BUILD.bazel
+++ b/modules/playground/src/web_workers/images/BUILD.bazel
@@ -22,23 +22,23 @@ ts_devserver(
     name = "devserver",
     # Workaround for: https://github.com/bazelbuild/rules_typescript/issues/409
     additional_root_paths = ["angular"],
-    data = [
-        "//modules/playground/src/web_workers:worker-config",
-        "@npm//:node_modules/base64-js/base64js.min.js",
-        "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
-        "@npm//:node_modules/tslib/tslib.js",
-        "loader.js",
-    ] + glob(["**/*.css"]),
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/jquery/dist/jquery.min.js",
+        "@npm//:node_modules/materialize-css/dist/js/materialize.min.js",
+    ],
     entry_module = "angular/modules/playground/src/web_workers/images/index",
-    index_html = "index.html",
     port = 4200,
     scripts = ["@npm//:node_modules/tslib/tslib.js"],
     static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/materialize-css/dist/js/materialize.min.js",
+        "@npm//:node_modules/base64-js/base64js.min.js",
+        "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
+        "@npm//:node_modules/tslib/tslib.js",
         "@npm//:node_modules/materialize-css/dist/css/materialize.min.css",
-        "@npm//:node_modules/jquery/dist/jquery.min.js",
+        "loader.js",
+        "index.html",
+        "//modules/playground/src/web_workers:worker-config",
         "//third_party/github.com/google/material-design-icons",
-    ],
+    ] + glob(["**/*.css"]),
     deps = [":images"],
 )
diff --git a/modules/playground/src/web_workers/images/index.html b/modules/playground/src/web_workers/images/index.html
index bb31e90ca4..10a95905bc 100644
--- a/modules/playground/src/web_workers/images/index.html
+++ b/modules/playground/src/web_workers/images/index.html
@@ -1,8 +1,13 @@
 <html>
   <head>
     <link rel="stylesheet" href="image_demo.css" />
+    <link rel="stylesheet" href="/npm/node_modules/materialize-css/dist/css/materialize.min.css">
+    <link rel="stylesheet" href="/third_party/github.com/google/material-design-icons/material-icons.css"></head>
   </head>
   <body>
     <image-demo></image-demo>
+
+    <!--default load location for ts_devserver-->
+    <script src="/_/ts_scripts.js"></script>
   </body>
 </html>
diff --git a/modules/playground/src/web_workers/input/BUILD.bazel b/modules/playground/src/web_workers/input/BUILD.bazel
index be129d0319..5b42a0cedf 100644
--- a/modules/playground/src/web_workers/input/BUILD.bazel
+++ b/modules/playground/src/web_workers/input/BUILD.bazel
@@ -18,24 +18,24 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    data = [
-        "loader.js",
-        "//modules/playground/src/web_workers:worker-config",
-        "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
-        "@npm//:node_modules/tslib/tslib.js",
+    bootstrap = [
+        "@npm//:node_modules/systemjs/dist/system.js",
+        "//packages/zone.js/dist:zone.js",
+        "//packages/zone.js/dist:long-stack-trace-zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     entry_module = "angular/modules/playground/src/web_workers/input/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/systemjs/dist/system.js",
-        "//packages/zone.js/dist:zone.js",
-        "//packages/zone.js/dist:long-stack-trace-zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "index.html",
+        "loader.js",
+        "//modules/playground/src/web_workers:worker-config",
+        "//modules/playground:systemjs-config.js",
+        "//modules/playground:systemjs-rxjs-operators.js",
     ],
     deps = [":input"],
 )
diff --git a/modules/playground/src/web_workers/input/index.html b/modules/playground/src/web_workers/input/index.html
index ffa2e1662f..fc89f0ada1 100644
--- a/modules/playground/src/web_workers/input/index.html
+++ b/modules/playground/src/web_workers/input/index.html
@@ -7,5 +7,8 @@
   <input-app>
     Loading...
   </input-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel
index c1823823e7..ccb3e33ebb 100644
--- a/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel
+++ b/modules/playground/src/web_workers/kitchen_sink/BUILD.bazel
@@ -18,24 +18,24 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    data = [
-        "loader.js",
-        "//modules/playground/src/web_workers:worker-config",
-        "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
-        "@npm//:node_modules/tslib/tslib.js",
+    bootstrap = [
+        "@npm//:node_modules/systemjs/dist/system.js",
+        "//packages/zone.js/dist:zone.js",
+        "//packages/zone.js/dist:long-stack-trace-zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     entry_module = "angular/modules/playground/src/web_workers/kitchen_sink/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/systemjs/dist/system.js",
-        "//packages/zone.js/dist:zone.js",
-        "//packages/zone.js/dist:long-stack-trace-zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "index.html",
+        "loader.js",
+        "//modules/playground/src/web_workers:worker-config",
+        "//modules/playground:systemjs-config.js",
+        "//modules/playground:systemjs-rxjs-operators.js",
     ],
     deps = [":kitchen_sink"],
 )
diff --git a/modules/playground/src/web_workers/kitchen_sink/index.html b/modules/playground/src/web_workers/kitchen_sink/index.html
index aab3329a43..441eccc848 100644
--- a/modules/playground/src/web_workers/kitchen_sink/index.html
+++ b/modules/playground/src/web_workers/kitchen_sink/index.html
@@ -20,5 +20,8 @@
   <hello-app>
     Loading...
   </hello-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/web_workers/message_broker/BUILD.bazel b/modules/playground/src/web_workers/message_broker/BUILD.bazel
index 1ffb8bbc75..d2f8d0ff12 100644
--- a/modules/playground/src/web_workers/message_broker/BUILD.bazel
+++ b/modules/playground/src/web_workers/message_broker/BUILD.bazel
@@ -18,24 +18,24 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    data = [
-        "loader.js",
-        "//modules/playground/src/web_workers:worker-config",
-        "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
-        "@npm//:node_modules/tslib/tslib.js",
+    bootstrap = [
+        "@npm//:node_modules/systemjs/dist/system.js",
+        "//packages/zone.js/dist:zone.js",
+        "//packages/zone.js/dist:long-stack-trace-zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     entry_module = "angular/modules/playground/src/web_workers/message_broker/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/systemjs/dist/system.js",
-        "//packages/zone.js/dist:zone.js",
-        "//packages/zone.js/dist:long-stack-trace-zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "index.html",
+        "loader.js",
+        "//modules/playground/src/web_workers:worker-config",
+        "//modules/playground:systemjs-config.js",
+        "//modules/playground:systemjs-rxjs-operators.js",
     ],
     deps = [":message_broker"],
 )
diff --git a/modules/playground/src/web_workers/message_broker/index.html b/modules/playground/src/web_workers/message_broker/index.html
index 61d08aec07..67654ae0d2 100644
--- a/modules/playground/src/web_workers/message_broker/index.html
+++ b/modules/playground/src/web_workers/message_broker/index.html
@@ -7,5 +7,8 @@
   <button type="button" id="send_echo">Send Echo</button>
   <p id="echo_result"></p>
   <p id="ui_result"></p>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/web_workers/router/BUILD.bazel b/modules/playground/src/web_workers/router/BUILD.bazel
index 635c3d8a0b..ec708acc6b 100644
--- a/modules/playground/src/web_workers/router/BUILD.bazel
+++ b/modules/playground/src/web_workers/router/BUILD.bazel
@@ -21,24 +21,24 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    data = [
-        "loader.js",
-        "//modules/playground/src/web_workers:worker-config",
-        "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
-        "@npm//:node_modules/tslib/tslib.js",
+    bootstrap = [
+        "@npm//:node_modules/systemjs/dist/system.js",
+        "//packages/zone.js/dist:zone.js",
+        "//packages/zone.js/dist:long-stack-trace-zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     entry_module = "angular/modules/playground/src/web_workers/router/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/systemjs/dist/system.js",
-        "//packages/zone.js/dist:zone.js",
-        "//packages/zone.js/dist:long-stack-trace-zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "index.html",
+        "loader.js",
+        "//modules/playground/src/web_workers:worker-config",
+        "//modules/playground:systemjs-config.js",
+        "//modules/playground:systemjs-rxjs-operators.js",
     ],
     deps = [":router"],
 )
diff --git a/modules/playground/src/web_workers/router/index.html b/modules/playground/src/web_workers/router/index.html
index 64395a0733..ef9f755df0 100644
--- a/modules/playground/src/web_workers/router/index.html
+++ b/modules/playground/src/web_workers/router/index.html
@@ -3,5 +3,8 @@
   <title>Web Worker Router Example</title>
 <body>
   <app></app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/web_workers/todo/BUILD.bazel b/modules/playground/src/web_workers/todo/BUILD.bazel
index 5cd0b8066c..b57dcce6cb 100644
--- a/modules/playground/src/web_workers/todo/BUILD.bazel
+++ b/modules/playground/src/web_workers/todo/BUILD.bazel
@@ -20,25 +20,25 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
-    data = [
-        "css/main.css",
-        "loader.js",
-        "//modules/playground/src/web_workers:worker-config",
-        "@npm//:node_modules/rxjs/bundles/rxjs.umd.js",
-        "@npm//:node_modules/tslib/tslib.js",
+    bootstrap = [
+        "@npm//:node_modules/systemjs/dist/system.js",
+        "//packages/zone.js/dist:zone.js",
+        "//packages/zone.js/dist:long-stack-trace-zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
     ],
     entry_module = "angular/modules/playground/src/web_workers/todo/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
-        "@npm//:node_modules/systemjs/dist/system.js",
-        "//packages/zone.js/dist:zone.js",
-        "//packages/zone.js/dist:long-stack-trace-zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
+        "index.html",
+        "css/main.css",
+        "loader.js",
+        "//modules/playground/src/web_workers:worker-config",
+        "//modules/playground:systemjs-config.js",
+        "//modules/playground:systemjs-rxjs-operators.js",
     ],
     deps = [":todo"],
 )
diff --git a/modules/playground/src/web_workers/todo/index.html b/modules/playground/src/web_workers/todo/index.html
index e4fac7623f..993450d7de 100644
--- a/modules/playground/src/web_workers/todo/index.html
+++ b/modules/playground/src/web_workers/todo/index.html
@@ -6,5 +6,8 @@
   <todo-app>
     Loading...
   </todo-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/modules/playground/src/zippy_component/BUILD.bazel b/modules/playground/src/zippy_component/BUILD.bazel
index c1e00f6d34..6e067030a2 100644
--- a/modules/playground/src/zippy_component/BUILD.bazel
+++ b/modules/playground/src/zippy_component/BUILD.bazel
@@ -19,16 +19,16 @@ ng_module(
 
 ts_devserver(
     name = "devserver",
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "@npm//:node_modules/reflect-metadata/Reflect.js",
+    ],
     entry_module = "angular/modules/playground/src/zippy_component/index",
-    index_html = "index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "@npm//:node_modules/reflect-metadata/Reflect.js",
-    ],
+    static_files = ["index.html"],
     deps = [":zippy_component"],
 )
diff --git a/modules/playground/src/zippy_component/index.html b/modules/playground/src/zippy_component/index.html
index de656ac666..aec6e425df 100644
--- a/modules/playground/src/zippy_component/index.html
+++ b/modules/playground/src/zippy_component/index.html
@@ -5,5 +5,8 @@
   <zippy-app>
     Loading...
   </zippy-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/package.json b/package.json
index 0f684e884d..6f50d3c31f 100644
--- a/package.json
+++ b/package.json
@@ -41,12 +41,12 @@
     "@angular-devkit/schematics": "^9.0.0-rc.3",
     "@angular/bazel": "file:./tools/npm/@angular_bazel",
     "@babel/core": "^7.6.4",
-    "@bazel/jasmine": "0.40.0",
-    "@bazel/karma": "0.40.0",
-    "@bazel/protractor": "0.40.0",
-    "@bazel/rollup": "0.40.0",
-    "@bazel/terser": "0.40.0",
-    "@bazel/typescript": "0.40.0",
+    "@bazel/jasmine": "0.41.0",
+    "@bazel/karma": "0.41.0",
+    "@bazel/protractor": "0.41.0",
+    "@bazel/rollup": "0.41.0",
+    "@bazel/terser": "0.41.0",
+    "@bazel/typescript": "0.41.0",
     "@microsoft/api-extractor": "^7.3.9",
     "@schematics/angular": "^9.0.0-rc.3",
     "@types/angular": "^1.6.47",
@@ -95,8 +95,12 @@
     "jasmine": "^3.1.0",
     "jasmine-core": "^3.1.0",
     "jquery": "3.0.0",
-    "karma": "^3.1.4",
-    "karma-browserstack-launcher": "^1.3.0",
+    "karma": "~4.1.0",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-firefox-launcher": "^1.2.0",
+    "karma-jasmine": "^2.0.1",
+    "karma-requirejs": "^1.1.0",
+    "karma-sourcemap-loader": "^0.3.7",
     "magic-string": "^0.25.0",
     "materialize-css": "1.0.0",
     "minimist": "1.2.0",
@@ -104,6 +108,7 @@
     "nodejs-websocket": "^1.7.2",
     "protractor": "^5.4.2",
     "reflect-metadata": "^0.1.3",
+    "requirejs": "^2.3.6",
     "rollup": "~1.25.0",
     "rollup-plugin-commonjs": "^10.1.0",
     "rollup-plugin-node-resolve": "^5.2.0",
@@ -155,10 +160,8 @@
     "gulp-tslint": "8.1.2",
     "husky": "^0.14.3",
     "jpm": "1.3.1",
-    "karma-chrome-launcher": "^2.2.0",
-    "karma-jasmine": "^1.1.2",
+    "karma-browserstack-launcher": "^1.3.0",
     "karma-sauce-launcher": "^2.0.2",
-    "karma-sourcemap-loader": "^0.3.7",
     "madge": "0.5.0",
     "mutation-observer": "^1.0.3",
     "rewire": "2.5.2",
diff --git a/packages/examples/common/BUILD.bazel b/packages/examples/common/BUILD.bazel
index d048b59e14..61f14a9ef5 100644
--- a/packages/examples/common/BUILD.bazel
+++ b/packages/examples/common/BUILD.bazel
@@ -37,16 +37,15 @@ ts_library(
 
 ts_devserver(
     name = "devserver",
+    additional_root_paths = ["angular/packages/examples"],
+    bootstrap = ["//packages/zone.js/dist:zone.js"],
     entry_module = "@angular/examples/common/main",
-    index_html = "//packages/examples:index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["//packages/examples:index.html"],
     deps = [":common_examples"],
 )
 
@@ -56,7 +55,6 @@ protractor_web_test_suite(
     server = ":devserver",
     deps = [
         ":common_tests_lib",
-        "@npm//protractor",
         "@npm//selenium-webdriver",
     ],
 )
diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel
index 212ec97079..b1eab62daf 100644
--- a/packages/examples/core/BUILD.bazel
+++ b/packages/examples/core/BUILD.bazel
@@ -53,17 +53,18 @@ ts_library(
 
 ts_devserver(
     name = "devserver",
+    additional_root_paths = ["angular/packages/examples"],
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "//packages/zone.js/dist:task-tracking.js",
+    ],
     entry_module = "@angular/examples/core/main",
-    index_html = "//packages/examples:index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-        "//packages/zone.js/dist:task-tracking.js",
-    ],
+    static_files = ["//packages/examples:index.html"],
     deps = [":core_examples"],
 )
 
@@ -73,7 +74,6 @@ protractor_web_test_suite(
     server = ":devserver",
     deps = [
         ":core_e2e_tests_lib",
-        "@npm//protractor",
         "@npm//selenium-webdriver",
     ],
 )
diff --git a/packages/examples/forms/BUILD.bazel b/packages/examples/forms/BUILD.bazel
index 2166e514bc..d35ffea75b 100644
--- a/packages/examples/forms/BUILD.bazel
+++ b/packages/examples/forms/BUILD.bazel
@@ -37,16 +37,15 @@ ts_library(
 
 ts_devserver(
     name = "devserver",
+    additional_root_paths = ["angular/packages/examples"],
+    bootstrap = ["//packages/zone.js/dist:zone.js"],
     entry_module = "@angular/examples/forms/main",
-    index_html = "//packages/examples:index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
-    static_files = [
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["//packages/examples:index.html"],
     deps = [":forms_examples"],
 )
 
@@ -56,7 +55,6 @@ protractor_web_test_suite(
     server = ":devserver",
     deps = [
         ":forms_e2e_tests_lib",
-        "@npm//protractor",
         "@npm//selenium-webdriver",
     ],
 )
diff --git a/packages/examples/index.html b/packages/examples/index.html
index 7f405e44b9..a54fb2305d 100644
--- a/packages/examples/index.html
+++ b/packages/examples/index.html
@@ -11,5 +11,8 @@
 </head>
 <body>
   <example-app>Loading...</example-app>
+
+  <!--default load location for ts_devserver-->
+  <script src="/_/ts_scripts.js"></script>
 </body>
 </html>
diff --git a/packages/examples/router/activated-route/BUILD.bazel b/packages/examples/router/activated-route/BUILD.bazel
index 9abc261f20..82ad2790f5 100644
--- a/packages/examples/router/activated-route/BUILD.bazel
+++ b/packages/examples/router/activated-route/BUILD.bazel
@@ -23,13 +23,13 @@ ng_module(
 ts_devserver(
     name = "devserver",
     entry_module = "@angular/examples/router/activated-route/main",
-    index_html = "//packages/examples:index.html",
     port = 4200,
     scripts = [
         "@npm//:node_modules/tslib/tslib.js",
         "//tools/rxjs:rxjs_umd_modules",
     ],
     static_files = [
+        "//packages/examples:index.html",
         "//packages/zone.js/dist:zone.js",
     ],
     deps = [":router_activated_route_examples"],
diff --git a/packages/examples/service-worker/push/BUILD.bazel b/packages/examples/service-worker/push/BUILD.bazel
index 32062c838c..4b030cd110 100644
--- a/packages/examples/service-worker/push/BUILD.bazel
+++ b/packages/examples/service-worker/push/BUILD.bazel
@@ -35,17 +35,18 @@ ts_library(
 
 ts_devserver(
     name = "devserver",
+    additional_root_paths = ["angular/packages/examples"],
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "ngsw-worker.js",
+    ],
     entry_module = "@angular/examples/service-worker/push/main",
-    index_html = "//packages/examples:index.html",
     port = 4200,
     scripts = [
         "//tools/rxjs:rxjs_umd_modules",
         "@npm//:node_modules/tslib/tslib.js",
     ],
-    static_files = [
-        "ngsw-worker.js",
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["//packages/examples:index.html"],
     deps = [":sw_push_examples"],
 )
 
@@ -55,7 +56,6 @@ protractor_web_test_suite(
     server = ":devserver",
     deps = [
         ":sw_push_e2e_tests_lib",
-        "@npm//protractor",
         "@npm//selenium-webdriver",
     ],
 )
diff --git a/packages/examples/service-worker/registration-options/BUILD.bazel b/packages/examples/service-worker/registration-options/BUILD.bazel
index 12e392dfd6..2a1142ad90 100644
--- a/packages/examples/service-worker/registration-options/BUILD.bazel
+++ b/packages/examples/service-worker/registration-options/BUILD.bazel
@@ -35,17 +35,18 @@ ts_library(
 
 ts_devserver(
     name = "devserver",
+    additional_root_paths = ["angular/packages/examples"],
+    bootstrap = [
+        "//packages/zone.js/dist:zone.js",
+        "ngsw-worker.js",
+    ],
     entry_module = "@angular/examples/service-worker/registration-options/main",
-    index_html = "//packages/examples:index.html",
     port = 4200,
     scripts = [
         "//tools/rxjs:rxjs_umd_modules",
         "@npm//:node_modules/tslib/tslib.js",
     ],
-    static_files = [
-        "ngsw-worker.js",
-        "//packages/zone.js/dist:zone.js",
-    ],
+    static_files = ["//packages/examples:index.html"],
     deps = [":sw_registration_options_examples"],
 )
 
@@ -55,7 +56,6 @@ protractor_web_test_suite(
     server = ":devserver",
     deps = [
         ":sw_registration_options_e2e_tests_lib",
-        "@npm//protractor",
         "@npm//selenium-webdriver",
     ],
 )
diff --git a/packages/examples/upgrade/upgrade_example.bzl b/packages/examples/upgrade/upgrade_example.bzl
index 8878aa7d8b..b820be769e 100644
--- a/packages/examples/upgrade/upgrade_example.bzl
+++ b/packages/examples/upgrade/upgrade_example.bzl
@@ -45,18 +45,20 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets =
         name = "devserver",
         port = 4200,
         entry_module = entry_module,
-        static_files = [
+        additional_root_paths = ["angular/packages/examples"],
+        bootstrap = [
             "//packages/zone.js/dist:zone.js",
             "@npm//:node_modules/angular/angular.js",
             "@npm//:node_modules/reflect-metadata/Reflect.js",
         ],
-        index_html = "//packages/examples:index.html",
+        static_files = [
+            "//packages/examples:index.html",
+        ] + assets,
         scripts = [
             "@npm//:node_modules/tslib/tslib.js",
             "//tools/rxjs:rxjs_umd_modules",
         ],
         deps = [":%s_sources" % name],
-        data = assets,
     )
 
     protractor_web_test_suite(
@@ -65,7 +67,6 @@ def create_upgrade_example_targets(name, srcs, e2e_srcs, entry_module, assets =
         server = ":devserver",
         deps = [
             ":%s_e2e_lib" % name,
-            "@npm//protractor",
             "@npm//selenium-webdriver",
         ],
     )
diff --git a/yarn.lock b/yarn.lock
index a04b4c8e1c..503ac697cd 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -263,53 +263,41 @@
   resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.10.3.tgz#2e2b8a1d3e885946eac41db2b1aa6801fb319887"
   integrity sha512-v1nXbMTHVlMM4z4uWp6XiRoHAyUlYggF1SOboLLWRp0+D22kWixqArWqnozLw2mOtnxr97BdLjluWiho6A8Hjg==
 
-"@bazel/jasmine@0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.40.0.tgz#50820683e011153737eb3fc451ba5c05cc07034f"
-  integrity sha512-PQzLDu2hhNPNQutgWVTl8KT31QLGS4BJFKR8a3quTxNiZci/mSqJ/sdC9oF61f//vtj46uODesl/BpPZBYAT4g==
+"@bazel/jasmine@0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-0.41.0.tgz#4e9c1622b6ceacdcf12740098d8c99fc3cff6bfb"
+  integrity sha512-vbZaTx05Ab5ZbJ1TDHjwWvtrDYBh4miXVJBdFeSZtquLQ0FQb9iNdMTuDHkEF9aq6nqG+rnjUoQjjmDLC/uRkg==
   dependencies:
     jasmine "~3.4.0"
     jasmine-core "~3.4.0"
     v8-coverage "1.0.9"
 
-"@bazel/karma@0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.40.0.tgz#5d6b669355d173dea02e9b5d21ff41db91ceb3fd"
-  integrity sha512-xRbUU3vg2KUmCTYBkHsvdDEy6vhtmWICiE/s0vikb4c3lCY5UtY/Y9fmoflhNHjOgjnncEFS8J4uMaWn5rZmhg==
+"@bazel/karma@0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@bazel/karma/-/karma-0.41.0.tgz#1ad3b48d8b5cf1e08ed266872c18344c8bd63e94"
+  integrity sha512-L23VC9EUFmrMCYJAT9qPnyezM5IErCJ8URpmXfRo/7IUJ04/l4vQeiyi4iNY7+zw9lbGf2I8seGaPFJrFtxdoQ==
   dependencies:
-    jasmine-core "2.8.0"
-    karma "~4.1.0"
-    karma-chrome-launcher "2.2.0"
-    karma-firefox-launcher "1.1.0"
-    karma-jasmine "2.0.1"
-    karma-requirejs "1.1.0"
-    karma-sauce-launcher "2.0.2"
-    karma-sourcemap-loader "0.3.7"
-    requirejs "2.3.5"
-    semver "5.6.0"
-    tmp "0.0.33"
+    tmp "0.1.0"
 
-"@bazel/protractor@0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.40.0.tgz#0c64ddbf5a063417f43520ec1fed5cbc485792cf"
-  integrity sha512-qio8c8ie6Ajwu6hEs3vYf5+18JvrYH/6bv2b5YcE7HnyQZKGeJCDyTUErIUkCHwq8RsIqpsgxtCj69xmUxZXbw==
-  dependencies:
-    protractor "^5.4.2"
+"@bazel/protractor@0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-0.41.0.tgz#56075a657f236602bd762e712dd42c514baede0c"
+  integrity sha512-sQtAYheBOEcX32BWNyRj5VssCrMbPzEun4x9QPWnoxtBebkxeuZplRjbaoc+PFdVYys+ixwAqTkS49qlV4Ng1w==
 
-"@bazel/rollup@0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-0.40.0.tgz#8ee08e1967c1ff7d549ce81b676872fa7e45afdb"
-  integrity sha512-7ZKzOIfHm0lEc3G/o2ykCZQlc7xcKSHiwIV4GIeaYJIbFUnO/L0cmaWzxOhdlr7NFfTdXcltTFnCrG7wlaad9A==
+"@bazel/rollup@0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@bazel/rollup/-/rollup-0.41.0.tgz#8dfaccc239f3efbae1c816b0ce2aeb6069d23582"
+  integrity sha512-M+ybGfcxTXnAS1QiaijLEfUznNYLA0cqeGXnYHSRrOhq2U7yesfavxbBtfLSKtg32ktmlHts5te8Zg82BS4DPQ==
 
-"@bazel/terser@0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-0.40.0.tgz#e31c76c32055a6bdffc711b05b530ae8df7ed1d5"
-  integrity sha512-XSnoLnB9i+RTJ4T1Tyrq0NMcIStzb9LQ1szMBOkJY4mBTRRNpf8Qnq+k5Vu9YY/dNIKVWtowNYBSWHzxxcL05g==
+"@bazel/terser@0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@bazel/terser/-/terser-0.41.0.tgz#2a0db8985ef2a4d015c3fda16d07c6813b29062a"
+  integrity sha512-NNC3o4yLlVoJgPAG1/6cir+aX3lYSn5ggVzQIDQKZHbePevr8E0PA5SMjthnKp/pQVs5URfZNADdXZnROTeu0w==
 
-"@bazel/typescript@0.40.0":
-  version "0.40.0"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.40.0.tgz#4f70d1365ee28fb8c1fd430a25034b74deecada9"
-  integrity sha512-826LXZYVlvcf9zNNcywzGprMUgCFqcwCeM/VLp+xG8/q6idJpqCBxABfJy2U6iZ8qIg5+wlxgYkOcmAZBfKMfA==
+"@bazel/typescript@0.41.0":
+  version "0.41.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-0.41.0.tgz#b767c4972cc42fd76c118f21e83e98860afdc249"
+  integrity sha512-i+PXf5BR7aUEA49V+D8OatHonNCDm2MhtjFwEJ7yKKLTPEm4riHWSDASNuOi4iAAe+EB8eKe1Fxh8iSjh/hm4A==
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"
@@ -1799,13 +1787,6 @@ brace-expansion@^1.0.0, brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^0.1.2:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
-  integrity sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=
-  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"
@@ -1815,7 +1796,7 @@ braces@^1.8.2:
     preserve "^0.2.0"
     repeat-element "^1.1.2"
 
-braces@^2.3.0, braces@^2.3.1, braces@^2.3.2:
+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==
@@ -2166,24 +2147,23 @@ chokidar@^1.0.0:
     fsevents "^1.0.0"
 
 chokidar@^2.0.3:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
-  integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
   dependencies:
     anymatch "^2.0.0"
-    async-each "^1.0.0"
-    braces "^2.3.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
     glob-parent "^3.1.0"
-    inherits "^2.0.1"
+    inherits "^2.0.3"
     is-binary-path "^1.0.0"
     is-glob "^4.0.0"
-    lodash.debounce "^4.0.8"
-    normalize-path "^2.1.1"
+    normalize-path "^3.0.0"
     path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-    upath "^1.0.5"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
   optionalDependencies:
-    fsevents "^1.2.2"
+    fsevents "^1.2.7"
 
 chokidar@^2.1.1:
   version "2.1.1"
@@ -2219,11 +2199,6 @@ ci-info@^1.0.0:
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.1.3.tgz#710193264bb05c77b8c90d02f5aaf22216a667b2"
   integrity sha512-SK/846h/Rcy8q9Z9CAwGBLfCJ6EkjJWdpelWDufQpqVDYq2Wnnv8zlSO6AMQap02jvhVruKKpEtQOufo3pFhLg==
 
-circular-json@^0.5.5:
-  version "0.5.9"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
-  integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
-
 cjson@^0.3.1:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/cjson/-/cjson-0.3.3.tgz#a92d9c786e5bf9b930806329ee05d5d3261b4afa"
@@ -2504,13 +2479,6 @@ colors@~1.2.1:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc"
   integrity sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==
 
-combine-lists@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
-  integrity sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=
-  dependencies:
-    lodash "^4.5.0"
-
 combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
@@ -2988,7 +2956,12 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js@^2.2.0, core-js@^2.4.0, core-js@^2.4.1:
+core-js@^2.2.0:
+  version "2.6.10"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
+  integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
+
+core-js@^2.4.0, core-js@^2.4.1:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
   integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
@@ -3167,11 +3140,6 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-format@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
-  integrity sha1-YV6CjiM90aubua4JUODOzPpuytg=
-
 date-format@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
@@ -3952,15 +3920,6 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
-expand-braces@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
-  integrity sha1-SIsdHSRRyz06axks/AMPRMWFX+o=
-  dependencies:
-    array-slice "^0.2.3"
-    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"
@@ -3981,14 +3940,6 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
-  integrity sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=
-  dependencies:
-    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"
@@ -4654,7 +4605,7 @@ fsevents@^1.0.0:
     nan "^2.9.2"
     node-pre-gyp "^0.10.0"
 
-fsevents@^1.2.2, fsevents@^1.2.7:
+fsevents@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.7.tgz#4851b664a3783e52003b3c66eb0eee1074933aa4"
   integrity sha512-Pxm6sI2MeBD7RdD12RYsqaP0nMiwx8eZBXCa6z2L+mRHm2DYrOYwihmhjpkdjUHwQhslWQjRpEgNq4XvBmaAuw==
@@ -6099,11 +6050,6 @@ is-npm@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
   integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
 
-is-number@^0.1.1:
-  version "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"
@@ -6373,26 +6319,31 @@ isurl@^1.0.0-alpha5:
     has-to-string-tag-x "^1.2.0"
     is-object "^1.0.1"
 
-jasmine-core@2.8.0, jasmine-core@~2.8.0:
-  version "2.8.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
-  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
-
 jasmine-core@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.1.0.tgz#a4785e135d5df65024dfc9224953df585bd2766c"
   integrity sha1-pHheE11d9lAk38kiSVPfWFvSdmw=
 
-jasmine-core@^3.3, jasmine-core@~3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
-  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
+jasmine-core@^3.3:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.5.0.tgz#132c23e645af96d85c8bca13c8758b18429fc1e4"
+  integrity sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==
+
+jasmine-core@~2.8.0:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
+  integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
 jasmine-core@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.3.0.tgz#dea1cdc634bc93c7e0d4ad27185df30fa971b10e"
   integrity sha512-3/xSmG/d35hf80BEN66Y6g9Ca5l/Isdeg/j6zvbTYlTzeKinzmaTM4p9am5kYqOmE05D7s1t8FGjzdSnbUbceA==
 
+jasmine-core@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.4.0.tgz#2a74618e966026530c3518f03e9f845d26473ce3"
+  integrity sha512-HU/YxV4i6GcmiH4duATwAbJQMlE0MsDIR5XmSVxURxKHn3aGAdbY1/ZJFmVRbKtnLwIxxMJD7gYaPsypcbYimg==
+
 jasmine@2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-2.8.0.tgz#6b089c0a11576b1f16df11b80146d91d4e8b8a3e"
@@ -6744,7 +6695,7 @@ karma-browserstack-launcher@^1.3.0:
     browserstacktunnel-wrapper "~2.0.1"
     q "~1.5.0"
 
-karma-chrome-launcher@2.2.0, karma-chrome-launcher@^2.2.0:
+karma-chrome-launcher@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-2.2.0.tgz#cf1b9d07136cc18fe239327d24654c3dbc368acf"
   integrity sha512-uf/ZVpAabDBPvdPdveyk1EPgbnloPvFFGgmRhYLTDH7gEB4nZdSBk8yTU47w1g/drLSx5uMOkjKk7IWKfWg/+w==
@@ -6752,29 +6703,26 @@ karma-chrome-launcher@2.2.0, karma-chrome-launcher@^2.2.0:
     fs-access "^1.0.0"
     which "^1.2.1"
 
-karma-firefox-launcher@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.1.0.tgz#2c47030452f04531eb7d13d4fc7669630bb93339"
-  integrity sha512-LbZ5/XlIXLeQ3cqnCbYLn+rOVhuMIK9aZwlP6eOLGzWdo1UVp7t6CN3DP4SafiRLjexKwHeKHDm0c38Mtd3VxA==
+karma-firefox-launcher@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/karma-firefox-launcher/-/karma-firefox-launcher-1.2.0.tgz#64fe03dd10300f9754d48f9ebfbf31f6c94a200c"
+  integrity sha512-j9Zp8M8+VLq1nI/5xZGfzeaEPtGQ/vk3G+Y8vpmFWLvKLNZ2TDjD6cu2dUu7lDbu1HXNgatsAX4jgCZTkR9qhQ==
+  dependencies:
+    is-wsl "^2.1.0"
 
-karma-jasmine@2.0.1:
+karma-jasmine@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
   integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
   dependencies:
     jasmine-core "^3.3"
 
-karma-jasmine@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
-  integrity sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=
-
-karma-requirejs@1.1.0:
+karma-requirejs@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/karma-requirejs/-/karma-requirejs-1.1.0.tgz#fddae2cb87d7ebc16fb0222893564d7fee578798"
   integrity sha1-/driy4fX68FvsCIok1ZNf+5Xh5g=
 
-karma-sauce-launcher@2.0.2, karma-sauce-launcher@^2.0.2:
+karma-sauce-launcher@^2.0.2:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/karma-sauce-launcher/-/karma-sauce-launcher-2.0.2.tgz#dbf98e70d86bf287b03a537cf637eb7aefa975c3"
   integrity sha512-jLUFaJhHMcKpxFWUesyWYihzM5FvQiJsDwGcCtKeOy2lsWhkVw0V0Byqb1d+wU6myU1mribBtsIcub23HS4kWA==
@@ -6783,47 +6731,13 @@ karma-sauce-launcher@2.0.2, karma-sauce-launcher@^2.0.2:
     saucelabs "^1.5.0"
     selenium-webdriver "^4.0.0-alpha.1"
 
-karma-sourcemap-loader@0.3.7, karma-sourcemap-loader@^0.3.7:
+karma-sourcemap-loader@^0.3.7:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
   integrity sha1-kTIsd/jxPUb+0GKwQuEAnUxFBdg=
   dependencies:
     graceful-fs "^4.1.2"
 
-karma@^3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-3.1.4.tgz#3890ca9722b10d1d14b726e1335931455788499e"
-  integrity sha512-31Vo8Qr5glN+dZEVIpnPCxEGleqE0EY6CtC2X9TagRV3rRQ3SNrvfhddICkJgUK3AgqpeKSZau03QumTGhGoSw==
-  dependencies:
-    bluebird "^3.3.0"
-    body-parser "^1.16.1"
-    chokidar "^2.0.3"
-    colors "^1.1.0"
-    combine-lists "^1.0.0"
-    connect "^3.6.0"
-    core-js "^2.2.0"
-    di "^0.0.1"
-    dom-serialize "^2.2.0"
-    expand-braces "^0.1.1"
-    flatted "^2.0.0"
-    glob "^7.1.1"
-    graceful-fs "^4.1.2"
-    http-proxy "^1.13.0"
-    isbinaryfile "^3.0.0"
-    lodash "^4.17.5"
-    log4js "^3.0.0"
-    mime "^2.3.1"
-    minimatch "^3.0.2"
-    optimist "^0.6.1"
-    qjobs "^1.1.4"
-    range-parser "^1.2.0"
-    rimraf "^2.6.0"
-    safe-buffer "^5.0.1"
-    socket.io "2.1.1"
-    source-map "^0.6.1"
-    tmp "0.0.33"
-    useragent "2.3.0"
-
 karma@~4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/karma/-/karma-4.1.0.tgz#d07387c9743a575b40faf73e8a3eb5421c2193e1"
@@ -7077,11 +6991,6 @@ lodash._shimkeys@~2.4.1:
   dependencies:
     lodash._objecttypes "~2.4.1"
 
-lodash.debounce@^4.0.8:
-  version "4.0.8"
-  resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
-  integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
-
 lodash.escape@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
@@ -7254,17 +7163,17 @@ lodash@4.17.5:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511"
   integrity sha512-svL3uiZf1RwhH+cWrfZn3A4+U58wbP0tGVTLQPbjplZxZ8ROD9VLuNgsRniTlLe7OlSqR79RUehXgpBW/s0IQw==
 
-lodash@^4.0.0, lodash@^4.14.0, lodash@^4.16.6, lodash@^4.2.1, lodash@^4.5.0, lodash@^4.8.0, lodash@~4.17.2:
+lodash@^4.0.0, lodash@^4.14.0, lodash@^4.16.6, lodash@^4.2.1, lodash@^4.8.0, lodash@~4.17.2:
   version "4.17.10"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7"
   integrity sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==
 
-lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
+lodash@^4.17.10, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0:
   version "4.17.11"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d"
   integrity sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==
 
-lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@~4.17.15:
+lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@~4.17.15:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -7291,17 +7200,6 @@ log-symbols@^3.0.0:
   dependencies:
     chalk "^2.4.2"
 
-log4js@^3.0.0:
-  version "3.0.6"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.6.tgz#e6caced94967eeeb9ce399f9f8682a4b2b28c8ff"
-  integrity sha512-ezXZk6oPJCWL483zj64pNkMuY/NcRX5MPiB0zE6tjZM137aeusrOnW1ecxgF9cmwMWkBMhjteQxBPoZBh9FDxQ==
-  dependencies:
-    circular-json "^0.5.5"
-    date-format "^1.2.0"
-    debug "^3.1.0"
-    rfdc "^1.1.2"
-    streamroller "0.7.0"
-
 log4js@^4.0.0:
   version "4.5.1"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
@@ -9560,11 +9458,6 @@ repeat-element@^1.1.2:
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^0.2.2:
-  version "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:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
@@ -9693,10 +9586,10 @@ require-main-filename@^2.0.0:
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-2.0.0.tgz#d0b329ecc7cc0f61649f62215be69af54aa8989b"
   integrity sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==
 
-requirejs@2.3.5:
-  version "2.3.5"
-  resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.5.tgz#617b9acbbcb336540ef4914d790323a8d4b861b0"
-  integrity sha512-svnO+aNcR/an9Dpi44C7KSAy5fFGLtmPbaaCeQaklUz8BQhS64tWWIIlvEA5jrWICzlO/X9KSzSeXFnZdBu8nw==
+requirejs@^2.3.6:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/requirejs/-/requirejs-2.3.6.tgz#e5093d9601c2829251258c0b9445d4d19fa9e7c9"
+  integrity sha512-ipEzlWQe6RK3jkzikgCupiTbTvm4S0/CAU5GlgptkN5SO6F3u0UD0K18wy6ErDqiCyP4J4YYe1HuAShvsxePLg==
 
 requires-port@1.x.x, requires-port@^1.0.0:
   version "1.0.0"
@@ -9811,11 +9704,6 @@ rewire@2.5.2:
   resolved "https://registry.yarnpkg.com/rewire/-/rewire-2.5.2.tgz#6427de7b7feefa7d36401507eb64a5385bc58dc7"
   integrity sha1-ZCfee3/u+n02QBUH62SlOFvFjcc=
 
-rfdc@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
-  integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
-
 rfdc@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
@@ -10803,16 +10691,6 @@ streamfilter@^1.0.5:
   dependencies:
     readable-stream "^2.0.2"
 
-streamroller@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
-  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
-  dependencies:
-    date-format "^1.2.0"
-    debug "^3.1.0"
-    mkdirp "^0.5.1"
-    readable-stream "^2.3.0"
-
 streamroller@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9"
@@ -11290,6 +11168,13 @@ tmp@0.0.33, tmp@0.0.x, tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.1.0.tgz#ee434a4e22543082e294ba6201dcc6eafefa2877"
+  integrity sha512-J7Z2K08jbGcdA1kkQpJSqLF6T0tdQqpR2pnSUXsIchbPdTI9v3e85cLW0d6WDhwuAleOV71j2xWs8qMPfK7nKw==
+  dependencies:
+    rimraf "^2.6.3"
+
 to-array@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/to-array/-/to-array-0.1.4.tgz#17e6c11f73dd4f3d74cda7a4ff3238e9ad9bf890"
@@ -11707,11 +11592,16 @@ unzip@~0.1.9:
     readable-stream "~1.0.31"
     setimmediate ">= 1.0.1 < 2"
 
-upath@^1.0.5, upath@^1.1.0:
+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==
 
+upath@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/upath/-/upath-1.2.0.tgz#8f66dbcd55a883acdae4408af8b035a5044c1894"
+  integrity sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==
+
 update-notifier@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/update-notifier/-/update-notifier-2.5.0.tgz#d0744593e13f161e406acb1d9408b72cad08aff6"