From 79a0d007b4e892dd988a8ef697e6d3436ea8391c Mon Sep 17 00:00:00 2001 From: Greg Magolan Date: Wed, 8 Jan 2020 11:09:36 -0800 Subject: [PATCH] build: derive ts_library dep from jasmine_node_test boostrap label if it ends in `_es5` (#34589) PR Close #34589 --- packages/animations/browser/test/BUILD.bazel | 1 - packages/animations/test/BUILD.bazel | 1 - packages/bazel/src/schematics/BUILD.bazel | 1 - packages/benchpress/test/BUILD.bazel | 1 - packages/common/http/test/BUILD.bazel | 1 - packages/common/http/testing/test/BUILD.bazel | 1 - packages/common/test/BUILD.bazel | 1 - packages/common/upgrade/test/BUILD.bazel | 1 - .../bazel/injectable_def/app/test/BUILD.bazel | 1 - .../bazel/injector_def/ivy_build/app/test/BUILD.bazel | 1 - packages/compiler-cli/test/BUILD.bazel | 4 ---- packages/compiler-cli/test/diagnostics/BUILD.bazel | 2 -- packages/compiler-cli/test/metadata/BUILD.bazel | 1 - packages/compiler-cli/test/transformers/BUILD.bazel | 1 - packages/compiler/test/BUILD.bazel | 1 - packages/compiler/test/css_parser/BUILD.bazel | 1 - packages/compiler/test/expression_parser/BUILD.bazel | 1 - packages/compiler/test/ml_parser/BUILD.bazel | 1 - packages/compiler/test/render3/BUILD.bazel | 1 - packages/compiler/test/selector/BUILD.bazel | 1 - packages/core/test/BUILD.bazel | 1 - packages/core/test/acceptance/BUILD.bazel | 1 - packages/core/test/render3/BUILD.bazel | 1 - packages/core/test/render3/ivy/BUILD.bazel | 1 - packages/core/test/strict_types/BUILD.bazel | 1 - packages/core/test/view/BUILD.bazel | 1 - packages/examples/core/BUILD.bazel | 1 - packages/examples/core/testing/ts/BUILD.bazel | 1 - packages/forms/test/BUILD.bazel | 1 - packages/http/test/BUILD.bazel | 1 - packages/localize/schematics/ng-add/BUILD.bazel | 1 - packages/platform-browser-dynamic/test/BUILD.bazel | 1 - packages/platform-browser/animations/test/BUILD.bazel | 1 - packages/platform-browser/test/BUILD.bazel | 1 - packages/platform-server/test/BUILD.bazel | 1 - packages/platform-webworker/test/BUILD.bazel | 1 - packages/router/test/BUILD.bazel | 1 - packages/router/test/aot_ngsummary_test/BUILD.bazel | 1 - packages/service-worker/config/test/BUILD.bazel | 1 - packages/service-worker/test/BUILD.bazel | 1 - packages/zone.js/test/BUILD.bazel | 6 ------ tools/defaults.bzl | 5 +++++ 42 files changed, 5 insertions(+), 50 deletions(-) diff --git a/packages/animations/browser/test/BUILD.bazel b/packages/animations/browser/test/BUILD.bazel index ef3d1cbad56..2dbee71f518 100644 --- 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", ], ) diff --git a/packages/animations/test/BUILD.bazel b/packages/animations/test/BUILD.bazel index 1c885f37c92..46aab594984 100644 --- 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", ], ) diff --git a/packages/bazel/src/schematics/BUILD.bazel b/packages/bazel/src/schematics/BUILD.bazel index 27920ea2b32..af016fc6ee9 100644 --- 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", ], ) diff --git a/packages/benchpress/test/BUILD.bazel b/packages/benchpress/test/BUILD.bazel index cd8a741505e..6b46415e574 100644 --- 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", ], ) diff --git a/packages/common/http/test/BUILD.bazel b/packages/common/http/test/BUILD.bazel index 8d8dacf4cf1..3448e1a0d52 100644 --- 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", ], ) diff --git a/packages/common/http/testing/test/BUILD.bazel b/packages/common/http/testing/test/BUILD.bazel index 7f62aa25d02..0e2c33b509e 100644 --- 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", ], ) diff --git a/packages/common/test/BUILD.bazel b/packages/common/test/BUILD.bazel index 45b9e870f3f..050ff558e73 100644 --- 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", ], ) diff --git a/packages/common/upgrade/test/BUILD.bazel b/packages/common/upgrade/test/BUILD.bazel index c53d69ac1c4..48d0de53d1c 100644 --- 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", ], ) diff --git a/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel b/packages/compiler-cli/integrationtest/bazel/injectable_def/app/test/BUILD.bazel index 3db9a33de53..0cb9a2f5b1e 100644 --- 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", ], ) diff --git 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 index c11eb186391..a2b69470bd4 100644 --- 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", ], ) diff --git a/packages/compiler-cli/test/BUILD.bazel b/packages/compiler-cli/test/BUILD.bazel index 85c573e16a9..776e7a86844 100644 --- 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", ], ) diff --git a/packages/compiler-cli/test/diagnostics/BUILD.bazel b/packages/compiler-cli/test/diagnostics/BUILD.bazel index c03ed465aa6..9c4dab93e3d 100644 --- 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", ], ) diff --git a/packages/compiler-cli/test/metadata/BUILD.bazel b/packages/compiler-cli/test/metadata/BUILD.bazel index db6e8a9b73c..9217416353f 100644 --- 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", ], ) diff --git a/packages/compiler-cli/test/transformers/BUILD.bazel b/packages/compiler-cli/test/transformers/BUILD.bazel index c399ce8a37f..dd82f46edc8 100644 --- 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", ], ) diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel index 3c97fe87533..1310243b86a 100644 --- 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", ], diff --git a/packages/compiler/test/css_parser/BUILD.bazel b/packages/compiler/test/css_parser/BUILD.bazel index c8d2ef5cfb4..13f19b83301 100644 --- 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", ], ) diff --git a/packages/compiler/test/expression_parser/BUILD.bazel b/packages/compiler/test/expression_parser/BUILD.bazel index 42fe916bcb7..0fbe4b2e00f 100644 --- 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", ], ) diff --git a/packages/compiler/test/ml_parser/BUILD.bazel b/packages/compiler/test/ml_parser/BUILD.bazel index 6a87c182117..9df32dcf0b6 100644 --- 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", ], ) diff --git a/packages/compiler/test/render3/BUILD.bazel b/packages/compiler/test/render3/BUILD.bazel index a3a15407058..8288257e9f5 100644 --- 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", ], ) diff --git a/packages/compiler/test/selector/BUILD.bazel b/packages/compiler/test/selector/BUILD.bazel index 278775f1f6e..c120ec74cc0 100644 --- 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", ], ) diff --git a/packages/core/test/BUILD.bazel b/packages/core/test/BUILD.bazel index ed342c93ded..ba26a009e5a 100644 --- 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", ], diff --git a/packages/core/test/acceptance/BUILD.bazel b/packages/core/test/acceptance/BUILD.bazel index 2d3cebbe46a..b77a9a01694 100644 --- 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", ], diff --git a/packages/core/test/render3/BUILD.bazel b/packages/core/test/render3/BUILD.bazel index 26b42ba24e4..4886dc17ac2 100644 --- 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", ], diff --git a/packages/core/test/render3/ivy/BUILD.bazel b/packages/core/test/render3/ivy/BUILD.bazel index 9df434c2f11..3982b9357a9 100644 --- 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", ], ) diff --git a/packages/core/test/strict_types/BUILD.bazel b/packages/core/test/strict_types/BUILD.bazel index ca42c4422d2..3af746a3410 100644 --- 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", ], ) diff --git a/packages/core/test/view/BUILD.bazel b/packages/core/test/view/BUILD.bazel index 7430f863105..1c7e9196225 100644 --- 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", ], ) diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel index 676348c8842..8ee6574f023 100644 --- 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", ], ) diff --git a/packages/examples/core/testing/ts/BUILD.bazel b/packages/examples/core/testing/ts/BUILD.bazel index 29f080aa20b..d845f648ea0 100644 --- 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", ], ) diff --git a/packages/forms/test/BUILD.bazel b/packages/forms/test/BUILD.bazel index 46856c94d92..78ee356406b 100644 --- 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", ], ) diff --git a/packages/http/test/BUILD.bazel b/packages/http/test/BUILD.bazel index 1b9289ca124..687e2704593 100644 --- 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", ], ) diff --git a/packages/localize/schematics/ng-add/BUILD.bazel b/packages/localize/schematics/ng-add/BUILD.bazel index f8ea99bcca1..280203d6173 100644 --- 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", ], ) diff --git a/packages/platform-browser-dynamic/test/BUILD.bazel b/packages/platform-browser-dynamic/test/BUILD.bazel index 60b5585f226..32868366f6a 100644 --- 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", ], ) diff --git a/packages/platform-browser/animations/test/BUILD.bazel b/packages/platform-browser/animations/test/BUILD.bazel index 9d1294b6771..2c1e3eee747 100644 --- 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", ], ) diff --git a/packages/platform-browser/test/BUILD.bazel b/packages/platform-browser/test/BUILD.bazel index 5be864c4d9a..cc0013e90bd 100644 --- 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", ], ) diff --git a/packages/platform-server/test/BUILD.bazel b/packages/platform-server/test/BUILD.bazel index 74332f4c22f..8c6469cacee 100644 --- 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", ], ) diff --git a/packages/platform-webworker/test/BUILD.bazel b/packages/platform-webworker/test/BUILD.bazel index 9d0bf6d0a2d..21b87b2f082 100644 --- 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", ], ) diff --git a/packages/router/test/BUILD.bazel b/packages/router/test/BUILD.bazel index abdb280aa7d..9a26fa7611f 100644 --- 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", ], ) diff --git a/packages/router/test/aot_ngsummary_test/BUILD.bazel b/packages/router/test/aot_ngsummary_test/BUILD.bazel index eddda991176..f21ff919143 100644 --- 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", ], ) diff --git a/packages/service-worker/config/test/BUILD.bazel b/packages/service-worker/config/test/BUILD.bazel index 42e7996c1d4..77339927785 100644 --- 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", ], ) diff --git a/packages/service-worker/test/BUILD.bazel b/packages/service-worker/test/BUILD.bazel index 3713e69aa90..4786be9ee6f 100644 --- 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", ], ) diff --git a/packages/zone.js/test/BUILD.bazel b/packages/zone.js/test/BUILD.bazel index 50ae11d47aa..b9da4f94664 100644 --- 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( diff --git a/tools/defaults.bzl b/tools/defaults.bzl index 307de073730..f320891c0e6 100644 --- 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,