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

PR Close #34589
This commit is contained in:
Greg Magolan 2020-01-08 11:09:36 -08:00 committed by atscott
parent 67044ef55d
commit 79a0d007b4
42 changed files with 5 additions and 50 deletions

View File

@ -19,7 +19,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -16,7 +16,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -17,6 +17,5 @@ jasmine_node_test(
"//packages/bazel/src/schematics/ng-add:test", "//packages/bazel/src/schematics/ng-add:test",
"//packages/bazel/src/schematics/ng-new:test", "//packages/bazel/src/schematics/ng-new:test",
"//packages/bazel/src/schematics/utility:test", "//packages/bazel/src/schematics/utility:test",
"//tools/testing:node",
], ],
) )

View File

@ -20,7 +20,6 @@ jasmine_node_test(
":test_lib", ":test_lib",
"//packages/benchpress", "//packages/benchpress",
"//packages/core/testing", "//packages/core/testing",
"//tools/testing:node",
"@npm//protractor", "@npm//protractor",
], ],
) )

View File

@ -22,7 +22,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -20,7 +20,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -27,7 +27,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -19,6 +19,5 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -27,6 +27,5 @@ jasmine_node_test(
"//packages/platform-server", "//packages/platform-server",
"//packages/platform-server/testing", "//packages/platform-server/testing",
"//packages/private/testing", "//packages/private/testing",
"//tools/testing:node",
], ],
) )

View File

@ -28,6 +28,5 @@ jasmine_node_test(
], ],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -53,7 +53,6 @@ jasmine_node_test(
":extract_i18n_lib", ":extract_i18n_lib",
"//packages/common:npm_package", "//packages/common:npm_package",
"//packages/core", "//packages/core",
"//tools/testing:node",
"@npm//minimist", "@npm//minimist",
], ],
) )
@ -91,7 +90,6 @@ jasmine_node_test(
deps = [ deps = [
":ngc_lib", ":ngc_lib",
"//packages/core", "//packages/core",
"//tools/testing:node",
"@npm//minimist", "@npm//minimist",
"@npm//rxjs", "@npm//rxjs",
"@npm//tsickle", "@npm//tsickle",
@ -123,7 +121,6 @@ jasmine_node_test(
deps = [ deps = [
":perform_watch_lib", ":perform_watch_lib",
"//packages/core", "//packages/core",
"//tools/testing:node",
], ],
) )
@ -150,6 +147,5 @@ jasmine_node_test(
deps = [ deps = [
":perform_compile_lib", ":perform_compile_lib",
"//packages/core", "//packages/core",
"//tools/testing:node",
], ],
) )

View File

@ -28,7 +28,6 @@ jasmine_node_test(
deps = [ deps = [
":check_types_lib", ":check_types_lib",
"//packages/core", "//packages/core",
"//tools/testing:node",
], ],
) )
@ -48,6 +47,5 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":typescript_version_lib", ":typescript_version_lib",
"//tools/testing:node",
], ],
) )

View File

@ -22,6 +22,5 @@ jasmine_node_test(
deps = [ deps = [
":test_lib", ":test_lib",
"//packages/core", "//packages/core",
"//tools/testing:node",
], ],
) )

View File

@ -33,7 +33,6 @@ jasmine_node_test(
deps = [ deps = [
":test_lib", ":test_lib",
"//packages/core", "//packages/core",
"//tools/testing:node",
"@npm//source-map", "@npm//source-map",
], ],
) )

View File

@ -83,7 +83,6 @@ jasmine_node_test(
deps = [ deps = [
":test_lib", ":test_lib",
":test_node_only_lib", ":test_node_only_lib",
"//tools/testing:node",
"@npm//base64-js", "@npm//base64-js",
"@npm//source-map", "@npm//source-map",
], ],

View File

@ -19,7 +19,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":css_parser_lib", ":css_parser_lib",
"//tools/testing:node",
], ],
) )

View File

@ -18,7 +18,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":expression_parser_lib", ":expression_parser_lib",
"//tools/testing:node",
], ],
) )

View File

@ -16,7 +16,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":ml_parser_lib", ":ml_parser_lib",
"//tools/testing:node",
], ],
) )

View File

@ -21,6 +21,5 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -20,7 +20,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":selector_lib", ":selector_lib",
"//tools/testing:node",
], ],
) )

View File

@ -67,7 +67,6 @@ jasmine_node_test(
"//packages/platform-server", "//packages/platform-server",
"//packages/platform-server/testing", "//packages/platform-server/testing",
"//packages/zone.js/lib:zone_d_ts", "//packages/zone.js/lib:zone_d_ts",
"//tools/testing:node",
"@npm//base64-js", "@npm//base64-js",
"@npm//source-map", "@npm//source-map",
], ],

View File

@ -41,7 +41,6 @@ jasmine_node_test(
deps = [ deps = [
":acceptance_lib", ":acceptance_lib",
"//packages/zone.js/lib:zone_d_ts", "//packages/zone.js/lib:zone_d_ts",
"//tools/testing:node",
"@npm//base64-js", "@npm//base64-js",
"@npm//source-map", "@npm//source-map",
], ],

View File

@ -63,7 +63,6 @@ jasmine_node_test(
name = "render3", name = "render3",
bootstrap = [":domino_es5"], bootstrap = [":domino_es5"],
deps = [ deps = [
":domino",
":render3_node_lib", ":render3_node_lib",
"//packages/zone.js/lib", "//packages/zone.js/lib",
], ],

View File

@ -22,7 +22,6 @@ jasmine_node_test(
], ],
deps = [ deps = [
":ivy_lib", ":ivy_lib",
"//packages/core/test/render3:domino",
"//packages/zone.js/lib", "//packages/zone.js/lib",
], ],
) )

View File

@ -27,6 +27,5 @@ jasmine_node_test(
name = "strict_types", name = "strict_types",
deps = [ deps = [
":strict_types_lib", ":strict_types_lib",
"//tools/testing:node",
], ],
) )

View File

@ -41,7 +41,6 @@ jasmine_node_test(
deps = [ deps = [
":view_lib", ":view_lib",
":view_node_only_lib", ":view_node_only_lib",
"//tools/testing:node",
], ],
) )

View File

@ -81,6 +81,5 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":core_tests_lib", ":core_tests_lib",
"//tools/testing:node",
], ],
) )

View File

@ -18,6 +18,5 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":fake_async_lib", ":fake_async_lib",
"//tools/testing:node",
], ],
) )

View File

@ -23,7 +23,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -23,7 +23,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -46,6 +46,5 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -21,7 +21,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -27,7 +27,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -32,7 +32,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -27,6 +27,5 @@ jasmine_node_test(
], ],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -24,7 +24,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -26,7 +26,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -30,6 +30,5 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":aot_test_lib", ":aot_test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -19,6 +19,5 @@ jasmine_node_test(
":test_lib", ":test_lib",
"//packages/service-worker/config", "//packages/service-worker/config",
"//packages/service-worker/config/testing", "//packages/service-worker/config/testing",
"//tools/testing:node",
], ],
) )

View File

@ -21,7 +21,6 @@ jasmine_node_test(
bootstrap = ["//tools/testing:node_es5"], bootstrap = ["//tools/testing:node_es5"],
deps = [ deps = [
":test_lib", ":test_lib",
"//tools/testing:node",
], ],
) )

View File

@ -206,17 +206,11 @@ jasmine_node_test(
jasmine_node_test( jasmine_node_test(
name = "test_node_error_disable_policy", name = "test_node_error_disable_policy",
bootstrap = [":node_error_disable_policy_entry_point_es5"], bootstrap = [":node_error_disable_policy_entry_point_es5"],
deps = [
":node_error_disable_policy_entry_point",
],
) )
jasmine_node_test( jasmine_node_test(
name = "test_node_error_lazy_policy", name = "test_node_error_lazy_policy",
bootstrap = [":node_error_lazy_policy_entry_point_es5"], bootstrap = [":node_error_lazy_policy_entry_point_es5"],
deps = [
":node_error_lazy_policy_entry_point",
],
) )
ts_library( ts_library(

View File

@ -281,6 +281,11 @@ def jasmine_node_test(bootstrap = [], **kwargs):
for label in bootstrap: for label in bootstrap:
deps += [label] deps += [label]
templated_args += ["--node_options=--require=$(rlocation $(location %s))" % 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( _jasmine_node_test(
deps = deps, deps = deps,