angular · gregmagolan · Nov 22, 2019 · Nov 25, 2019
diff --git 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
@@ -1,7 +1,6 @@
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 
-load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_library")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver", "ts_library")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 ng_module(
@@ -41,12 +40,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
@@ -20,6 +20,8 @@
   <h1>Class Binding Benchmark</h1>
   <app-component>Loading...</app-component>
 
+  <!--load location for ts_devserver-->
+  <script src="/app_bundle.js"></script>
 </body>
 
 </html>
diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel
@@ -1,7 +1,6 @@
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 
-load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_library")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver", "ts_library")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 ng_module(
@@ -42,31 +41,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
@@ -12,6 +12,9 @@ <h1>Change Detection Benchmark</h1>
   <div id="rendererMode">...</div>
 
   <benchmark-root>Loading...</benchmark-root>
+
+  <!--load location for ts_devserver-->
+  <script src="/app_bundle.js"></script>
 </body>
 
 </html>
diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ng_module", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -26,17 +25,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
@@ -19,5 +19,8 @@ <h2>Ng2 Large Form Benchmark</h2>
   <div>
     <app id="root">Loading...</app>
   </div>
+
+  <!--load location for ts_devserver-->
+  <script src="/app_bundle.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/baseline/BUILD.bazel b/modules/benchmarks/src/largetable/baseline/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ts_devserver", "ts_library")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -17,8 +16,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
@@ -28,5 +28,8 @@ <h2>Baseline Largetable Benchmark</h2>
   <div>
     <largetable id="root">Loading...</largetable>
   </div>
+
+  <!--load location for ts_devserver-->
+  <script src="/app_bundle.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel b/modules/benchmarks/src/largetable/incremental_dom/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ts_devserver", "ts_library")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -17,9 +16,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
@@ -28,5 +28,9 @@ <h2>Incremental-Dom Largetable Benchmark</h2>
   <div>
     <largetable id="root"></largetable>
   </div>
+
+  <script src="/npm/node_modules/incremental-dom/dist/incremental-dom.js"></script>
+  <!--load location for ts_devserver-->
+  <script src="/app_bundle.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/iv/BUILD.bazel b/modules/benchmarks/src/largetable/iv/BUILD.bazel
@@ -1,13 +1,13 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 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
@@ -28,5 +28,8 @@ <h2>IV Largetable Benchmark</h2>
 <div>
   <largetable id="root"></largetable>
 </div>
+
+<!--load location for ts_devserver-->
+<script src="/app_bundle.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -34,12 +33,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
@@ -28,5 +28,8 @@ <h2>Ng2 Largetable Benchmark</h2>
   <div>
     <largetable id="root">Loading...</largetable>
   </div>
+
+  <!--load location for ts_devserver-->
+  <script src="/app_bundle.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ng_module", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -22,17 +21,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
@@ -28,5 +28,8 @@ <h2>Ng2 with NgSwitch Largetable Benchmark</h2>
   <div>
     <largetable id="root">Loading...</largetable>
   </div>
+
+  <!--load location for ts_devserver-->
+  <script src="/app_bundle.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/largetable/render3/BUILD.bazel b/modules/benchmarks/src/largetable/render3/BUILD.bazel
@@ -1,7 +1,6 @@
 package(default_visibility = ["//visibility:public"])
 
-load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ng_module", "ng_rollup_bundle", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 ng_module(
@@ -32,8 +31,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
@@ -28,6 +28,7 @@ <h2>Render3 Largetable Benchmark</h2>
     <largetable id="root"></largetable>
   </div>
 
+  <!--load location for ts_devserver-->
+  <script src="/app_bundle.js"></script>
 </body>
-
 </html>
diff --git a/modules/benchmarks/src/tree/baseline/BUILD.bazel b/modules/benchmarks/src/tree/baseline/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ts_devserver", "ts_library")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -17,8 +16,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
@@ -25,5 +25,8 @@ <h2>Baseline Tree Benchmark</h2>
   <div>
     <tree id="root">Loading...</tree>
   </div>
+
+  <!--load location for ts_devserver-->
+  <script src="/app_bundle.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel b/modules/benchmarks/src/tree/incremental_dom/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ts_library")
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ts_devserver", "ts_library")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
@@ -18,9 +17,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
@@ -25,5 +25,9 @@ <h2>Incremental-Dom Tree Benchmark</h2>
   <div>
     <tree id="root"></tree>
   </div>
+
+  <script src="/npm/node_modules/incremental-dom/dist/incremental-dom.js"></script>
+  <!--load location for ts_devserver-->
+  <script src="/app_bundle.js"></script>
 </body>
 </html>
diff --git a/modules/benchmarks/src/tree/iv/BUILD.bazel b/modules/benchmarks/src/tree/iv/BUILD.bazel
@@ -1,13 +1,13 @@
-load("@npm_bazel_typescript//:index.bzl", "ts_devserver")
+load("//tools:defaults.bzl", "ts_devserver")
 load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test")
 
 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(