build: derive ts_library dep from jasmine_node_test boostrap label if it ends in `_es5` (#34736)

PR Close #34736
2020-01-08 11:09:36 -08:00 · 2020-01-08 11:09:36 -08:00 · a28c02bf89
parent 1e3f41be8f
commit a28c02bf89
42 changed files with 5 additions and 50 deletions
--- a/packages/animations/browser/test/BUILD.bazel
+++ b/packages/animations/browser/test/BUILD.bazel
@ -19,7 +19,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/animations/test/BUILD.bazel
+++ b/packages/animations/test/BUILD.bazel
@ -16,7 +16,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/bazel/src/schematics/BUILD.bazel
+++ b/packages/bazel/src/schematics/BUILD.bazel
@ -17,6 +17,5 @@ jasmine_node_test(
        "//packages/bazel/src/schematics/ng-add:test",
        "//packages/bazel/src/schematics/ng-new:test",
        "//packages/bazel/src/schematics/utility:test",
-        "//tools/testing:node",
    ],
 )
--- a/packages/benchpress/test/BUILD.bazel
+++ b/packages/benchpress/test/BUILD.bazel
@ -20,7 +20,6 @@ jasmine_node_test(
        ":test_lib",
        "//packages/benchpress",
        "//packages/core/testing",
-        "//tools/testing:node",
        "@npm//protractor",
    ],
 )
--- a/packages/common/http/test/BUILD.bazel
+++ b/packages/common/http/test/BUILD.bazel
@ -22,7 +22,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/common/http/testing/test/BUILD.bazel
+++ b/packages/common/http/testing/test/BUILD.bazel
@ -20,7 +20,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/common/test/BUILD.bazel
+++ b/packages/common/test/BUILD.bazel
@ -27,7 +27,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/common/upgrade/test/BUILD.bazel
+++ b/packages/common/upgrade/test/BUILD.bazel
@ -19,6 +19,5 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )
--- a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel
@ -27,6 +27,5 @@ jasmine_node_test(
        "//packages/platform-server",
        "//packages/platform-server/testing",
        "//packages/private/testing",
-        "//tools/testing:node",
    ],
 )
--- a/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel
+++ b/packages/compiler-cli/integrationtest/bazel/injector_def/ivy_build/app/test/BUILD.bazel
@ -28,6 +28,5 @@ jasmine_node_test(
    ],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )
--- a/packages/compiler-cli/test/BUILD.bazel
+++ b/packages/compiler-cli/test/BUILD.bazel
@ -53,7 +53,6 @@ jasmine_node_test(
        ":extract_i18n_lib",
        "//packages/common:npm_package",
        "//packages/core",
-        "//tools/testing:node",
        "@npm//minimist",
    ],
 )
@ -91,7 +90,6 @@ jasmine_node_test(
    deps = [
        ":ngc_lib",
        "//packages/core",
-        "//tools/testing:node",
        "@npm//minimist",
        "@npm//rxjs",
        "@npm//tsickle",
@ -123,7 +121,6 @@ jasmine_node_test(
    deps = [
        ":perform_watch_lib",
        "//packages/core",
-        "//tools/testing:node",
    ],
 )

@ -150,6 +147,5 @@ jasmine_node_test(
    deps = [
        ":perform_compile_lib",
        "//packages/core",
-        "//tools/testing:node",
    ],
 )
--- a/packages/compiler-cli/test/diagnostics/BUILD.bazel
+++ b/packages/compiler-cli/test/diagnostics/BUILD.bazel
@ -28,7 +28,6 @@ jasmine_node_test(
    deps = [
        ":check_types_lib",
        "//packages/core",
-        "//tools/testing:node",
    ],
 )

@ -48,6 +47,5 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":typescript_version_lib",
-        "//tools/testing:node",
    ],
 )
--- a/packages/compiler-cli/test/metadata/BUILD.bazel
+++ b/packages/compiler-cli/test/metadata/BUILD.bazel
@ -22,6 +22,5 @@ jasmine_node_test(
    deps = [
        ":test_lib",
        "//packages/core",
-        "//tools/testing:node",
    ],
 )
--- a/packages/compiler-cli/test/transformers/BUILD.bazel
+++ b/packages/compiler-cli/test/transformers/BUILD.bazel
@ -33,7 +33,6 @@ jasmine_node_test(
    deps = [
        ":test_lib",
        "//packages/core",
-        "//tools/testing:node",
        "@npm//source-map",
    ],
 )
--- a/packages/compiler/test/BUILD.bazel
+++ b/packages/compiler/test/BUILD.bazel
@ -83,7 +83,6 @@ jasmine_node_test(
    deps = [
        ":test_lib",
        ":test_node_only_lib",
-        "//tools/testing:node",
        "@npm//base64-js",
        "@npm//source-map",
    ],
--- a/packages/compiler/test/css_parser/BUILD.bazel
+++ b/packages/compiler/test/css_parser/BUILD.bazel
@ -19,7 +19,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":css_parser_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/compiler/test/expression_parser/BUILD.bazel
+++ b/packages/compiler/test/expression_parser/BUILD.bazel
@ -18,7 +18,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":expression_parser_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/compiler/test/ml_parser/BUILD.bazel
+++ b/packages/compiler/test/ml_parser/BUILD.bazel
@ -16,7 +16,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":ml_parser_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/compiler/test/render3/BUILD.bazel
+++ b/packages/compiler/test/render3/BUILD.bazel
@ -21,6 +21,5 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )
--- a/packages/compiler/test/selector/BUILD.bazel
+++ b/packages/compiler/test/selector/BUILD.bazel
@ -20,7 +20,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":selector_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/core/test/BUILD.bazel
+++ b/packages/core/test/BUILD.bazel
@ -67,7 +67,6 @@ jasmine_node_test(
        "//packages/platform-server",
        "//packages/platform-server/testing",
        "//packages/zone.js/lib:zone_d_ts",
-        "//tools/testing:node",
        "@npm//base64-js",
        "@npm//source-map",
    ],
--- a/packages/core/test/acceptance/BUILD.bazel
+++ b/packages/core/test/acceptance/BUILD.bazel
@ -41,7 +41,6 @@ jasmine_node_test(
    deps = [
        ":acceptance_lib",
        "//packages/zone.js/lib:zone_d_ts",
-        "//tools/testing:node",
        "@npm//base64-js",
        "@npm//source-map",
    ],
--- a/packages/core/test/render3/BUILD.bazel
+++ b/packages/core/test/render3/BUILD.bazel
@ -63,7 +63,6 @@ jasmine_node_test(
    name = "render3",
    bootstrap = [":domino_es5"],
    deps = [
-        ":domino",
        ":render3_node_lib",
        "//packages/zone.js/lib",
    ],
--- a/packages/core/test/render3/ivy/BUILD.bazel
+++ b/packages/core/test/render3/ivy/BUILD.bazel
@ -22,7 +22,6 @@ jasmine_node_test(
    ],
    deps = [
        ":ivy_lib",
-        "//packages/core/test/render3:domino",
        "//packages/zone.js/lib",
    ],
 )
--- a/packages/core/test/strict_types/BUILD.bazel
+++ b/packages/core/test/strict_types/BUILD.bazel
@ -27,6 +27,5 @@ jasmine_node_test(
    name = "strict_types",
    deps = [
        ":strict_types_lib",
-        "//tools/testing:node",
    ],
 )
--- a/packages/core/test/view/BUILD.bazel
+++ b/packages/core/test/view/BUILD.bazel
@ -41,7 +41,6 @@ jasmine_node_test(
    deps = [
        ":view_lib",
        ":view_node_only_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/examples/core/BUILD.bazel
+++ b/packages/examples/core/BUILD.bazel
@ -81,6 +81,5 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":core_tests_lib",
-        "//tools/testing:node",
    ],
 )
--- a/packages/examples/core/testing/ts/BUILD.bazel
+++ b/packages/examples/core/testing/ts/BUILD.bazel
@ -18,6 +18,5 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":fake_async_lib",
-        "//tools/testing:node",
    ],
 )
--- a/packages/forms/test/BUILD.bazel
+++ b/packages/forms/test/BUILD.bazel
@ -23,7 +23,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/http/test/BUILD.bazel
+++ b/packages/http/test/BUILD.bazel
@ -23,7 +23,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/localize/schematics/ng-add/BUILD.bazel
+++ b/packages/localize/schematics/ng-add/BUILD.bazel
@ -46,6 +46,5 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )
--- a/packages/platform-browser-dynamic/test/BUILD.bazel
+++ b/packages/platform-browser-dynamic/test/BUILD.bazel
@ -21,7 +21,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/platform-browser/animations/test/BUILD.bazel
+++ b/packages/platform-browser/animations/test/BUILD.bazel
@ -27,7 +27,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/platform-browser/test/BUILD.bazel
+++ b/packages/platform-browser/test/BUILD.bazel
@ -32,7 +32,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/platform-server/test/BUILD.bazel
+++ b/packages/platform-server/test/BUILD.bazel
@ -27,6 +27,5 @@ jasmine_node_test(
    ],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )
--- a/packages/platform-webworker/test/BUILD.bazel
+++ b/packages/platform-webworker/test/BUILD.bazel
@ -24,7 +24,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/router/test/BUILD.bazel
+++ b/packages/router/test/BUILD.bazel
@ -26,7 +26,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/router/test/aot_ngsummary_test/BUILD.bazel
+++ b/packages/router/test/aot_ngsummary_test/BUILD.bazel
@ -30,6 +30,5 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":aot_test_lib",
-        "//tools/testing:node",
    ],
 )
--- a/packages/service-worker/config/test/BUILD.bazel
+++ b/packages/service-worker/config/test/BUILD.bazel
@ -19,6 +19,5 @@ jasmine_node_test(
        ":test_lib",
        "//packages/service-worker/config",
        "//packages/service-worker/config/testing",
-        "//tools/testing:node",
    ],
 )
--- a/packages/service-worker/test/BUILD.bazel
+++ b/packages/service-worker/test/BUILD.bazel
@ -21,7 +21,6 @@ jasmine_node_test(
    bootstrap = ["//tools/testing:node_es5"],
    deps = [
        ":test_lib",
-        "//tools/testing:node",
    ],
 )

--- a/packages/zone.js/test/BUILD.bazel
+++ b/packages/zone.js/test/BUILD.bazel
@ -206,17 +206,11 @@ jasmine_node_test(
 jasmine_node_test(
    name = "test_node_error_disable_policy",
    bootstrap = [":node_error_disable_policy_entry_point_es5"],
-    deps = [
-        ":node_error_disable_policy_entry_point",
-    ],
 )

 jasmine_node_test(
    name = "test_node_error_lazy_policy",
    bootstrap = [":node_error_lazy_policy_entry_point_es5"],
-    deps = [
-        ":node_error_lazy_policy_entry_point",
-    ],
 )

 ts_library(
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@ -281,6 +281,11 @@ def jasmine_node_test(bootstrap = [], **kwargs):
    for label in bootstrap:
        deps += [label]
        templated_args += ["--node_options=--require=$(rlocation $(location %s))" % label]
+        if label.endswith("_es5"):
+            # If this label is a filegroup derived from a ts_library then automtically
+            # add the ts_library target (which is the label sans `_es5`) to deps so we pull
+            # in all of its transitive deps
+            deps += [label[:-4]]

    _jasmine_node_test(
        deps = deps,