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