build: update to nodejs rules 0.41.0 (#33996)

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
2019-11-22 13:12:05 -08:00
parent 3f68377c3d
commit c4335e2817
99 changed files with 484 additions and 476 deletions
--- 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(
--- 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>
--- 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"],
 )

--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )

--- 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>
--- 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"],
--- 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>
--- 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(
--- 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>
--- 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(
--- 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>
--- 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"],
 )

--- 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>
--- 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",
--- 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>
--- 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"],
 )

--- 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>
--- 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"],
--- 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>
--- 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(
--- 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>
--- 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"],
 )

--- 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>
--- 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(
--- 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>
--- 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"],
 )

--- 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>
--- 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"],
 )

--- 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>
--- 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"],
 )

--- 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>
--- 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(
--- 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>
--- 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"],
 )

--- 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>
--- 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"],
--- 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",
 )
--- 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",
    ],
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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",
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>
--- 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"],
 )
--- 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>