diff --git a/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel b/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel index d79854d2122..55d000013f1 100644 --- a/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel +++ b/modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/defer/baseline/BUILD.bazel b/modules/benchmarks/src/defer/baseline/BUILD.bazel index 35638517b98..15f03185d42 100644 --- a/modules/benchmarks/src/defer/baseline/BUILD.bazel +++ b/modules/benchmarks/src/defer/baseline/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/defer/main/BUILD.bazel b/modules/benchmarks/src/defer/main/BUILD.bazel index 35638517b98..15f03185d42 100644 --- a/modules/benchmarks/src/defer/main/BUILD.bazel +++ b/modules/benchmarks/src/defer/main/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/expanding_rows/BUILD.bazel b/modules/benchmarks/src/expanding_rows/BUILD.bazel index adf8d7d0173..96d33e6222c 100644 --- a/modules/benchmarks/src/expanding_rows/BUILD.bazel +++ b/modules/benchmarks/src/expanding_rows/BUILD.bazel @@ -1,7 +1,6 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") -load("//tools:defaults.bzl", "http_server") -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults2.bzl", "http_server", "ts_project") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/hydration/baseline/BUILD.bazel b/modules/benchmarks/src/hydration/baseline/BUILD.bazel index 909113ee270..f404fb8eed1 100644 --- a/modules/benchmarks/src/hydration/baseline/BUILD.bazel +++ b/modules/benchmarks/src/hydration/baseline/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/hydration/main/BUILD.bazel b/modules/benchmarks/src/hydration/main/BUILD.bazel index 909113ee270..f404fb8eed1 100644 --- a/modules/benchmarks/src/hydration/main/BUILD.bazel +++ b/modules/benchmarks/src/hydration/main/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel b/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel index dece4b65078..6ba70656e2f 100644 --- a/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel +++ b/modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel @@ -1,6 +1,6 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largeform/ng2/BUILD.bazel b/modules/benchmarks/src/largeform/ng2/BUILD.bazel index 349326e9c8d..fdf35dd781b 100644 --- a/modules/benchmarks/src/largeform/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largeform/ng2/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largetable/baseline/BUILD.bazel b/modules/benchmarks/src/largetable/baseline/BUILD.bazel index def862ab443..9438f2ae1a2 100644 --- a/modules/benchmarks/src/largetable/baseline/BUILD.bazel +++ b/modules/benchmarks/src/largetable/baseline/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largetable/ng2/BUILD.bazel b/modules/benchmarks/src/largetable/ng2/BUILD.bazel index 01d7902f031..a25065c374a 100644 --- a/modules/benchmarks/src/largetable/ng2/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel index 8cceea1a651..5029377d69d 100644 --- a/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/largetable/ng2_switch/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/ng_template_outlet_context/ng2/BUILD.bazel b/modules/benchmarks/src/ng_template_outlet_context/ng2/BUILD.bazel index ee6da5ef68c..af32e84474a 100644 --- a/modules/benchmarks/src/ng_template_outlet_context/ng2/BUILD.bazel +++ b/modules/benchmarks/src/ng_template_outlet_context/ng2/BUILD.bazel @@ -1,6 +1,6 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/styling/ng2/BUILD.bazel b/modules/benchmarks/src/styling/ng2/BUILD.bazel index fc239602e14..4c53365962c 100644 --- a/modules/benchmarks/src/styling/ng2/BUILD.bazel +++ b/modules/benchmarks/src/styling/ng2/BUILD.bazel @@ -1,6 +1,6 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/baseline/BUILD.bazel b/modules/benchmarks/src/tree/baseline/BUILD.bazel index 077b0fbf9c2..02856e3ce31 100644 --- a/modules/benchmarks/src/tree/baseline/BUILD.bazel +++ b/modules/benchmarks/src/tree/baseline/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/ng2/BUILD.bazel b/modules/benchmarks/src/tree/ng2/BUILD.bazel index de3452d3ff5..50f93a8774b 100644 --- a/modules/benchmarks/src/tree/ng2/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel index 713e797ea05..193b7341bd2 100644 --- a/modules/benchmarks/src/tree/ng2_static/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_static/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel index 084c515535c..94337dee842 100644 --- a/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel +++ b/modules/benchmarks/src/tree/ng2_switch/BUILD.bazel @@ -1,7 +1,7 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") load("//modules/benchmarks:benchmark_test.bzl", "benchmark_test") load("//modules/benchmarks:e2e_test.bzl", "e2e_test") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/benchmarks:__subpackages__"]) diff --git a/modules/playground/src/animate/BUILD.bazel b/modules/playground/src/animate/BUILD.bazel index 641117d4131..345020e9d20 100644 --- a/modules/playground/src/animate/BUILD.bazel +++ b/modules/playground/src/animate/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/async/BUILD.bazel b/modules/playground/src/async/BUILD.bazel index b2efc668202..86f3639eacb 100644 --- a/modules/playground/src/async/BUILD.bazel +++ b/modules/playground/src/async/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/hello_world/BUILD.bazel b/modules/playground/src/hello_world/BUILD.bazel index a5f43960c1a..de92e40147d 100644 --- a/modules/playground/src/hello_world/BUILD.bazel +++ b/modules/playground/src/hello_world/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/http/BUILD.bazel b/modules/playground/src/http/BUILD.bazel index 8816bb6ee8a..5730c3f1450 100644 --- a/modules/playground/src/http/BUILD.bazel +++ b/modules/playground/src/http/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/jsonp/BUILD.bazel b/modules/playground/src/jsonp/BUILD.bazel index 8816bb6ee8a..5730c3f1450 100644 --- a/modules/playground/src/jsonp/BUILD.bazel +++ b/modules/playground/src/jsonp/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/key_events/BUILD.bazel b/modules/playground/src/key_events/BUILD.bazel index a5f43960c1a..de92e40147d 100644 --- a/modules/playground/src/key_events/BUILD.bazel +++ b/modules/playground/src/key_events/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/sourcemap/BUILD.bazel b/modules/playground/src/sourcemap/BUILD.bazel index 7f5c9b14f78..c8b6d1008a8 100644 --- a/modules/playground/src/sourcemap/BUILD.bazel +++ b/modules/playground/src/sourcemap/BUILD.bazel @@ -1,6 +1,6 @@ load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin") load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/svg/BUILD.bazel b/modules/playground/src/svg/BUILD.bazel index b2efc668202..86f3639eacb 100644 --- a/modules/playground/src/svg/BUILD.bazel +++ b/modules/playground/src/svg/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/template_driven_forms/BUILD.bazel b/modules/playground/src/template_driven_forms/BUILD.bazel index 05cbca8ef4c..53082b36353 100644 --- a/modules/playground/src/template_driven_forms/BUILD.bazel +++ b/modules/playground/src/template_driven_forms/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/todo/BUILD.bazel b/modules/playground/src/todo/BUILD.bazel index 639d4ea0416..494892c1d7b 100644 --- a/modules/playground/src/todo/BUILD.bazel +++ b/modules/playground/src/todo/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/upgrade/BUILD.bazel b/modules/playground/src/upgrade/BUILD.bazel index a876b82d7a7..43e3e29d546 100644 --- a/modules/playground/src/upgrade/BUILD.bazel +++ b/modules/playground/src/upgrade/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/modules/playground/src/zippy_component/BUILD.bazel b/modules/playground/src/zippy_component/BUILD.bazel index 99f6b32bfa0..1f94e870391 100644 --- a/modules/playground/src/zippy_component/BUILD.bazel +++ b/modules/playground/src/zippy_component/BUILD.bazel @@ -1,5 +1,5 @@ load("@rules_angular//src/optimization:index.bzl", "optimize_angular_app") -load("//tools:defaults.bzl", "http_server") +load("//tools:defaults2.bzl", "http_server") package(default_visibility = ["//modules/playground:__subpackages__"]) diff --git a/packages/animations/BUILD.bazel b/packages/animations/BUILD.bazel index 9bf2e3b2a58..78ceaac5419 100644 --- a/packages/animations/BUILD.bazel +++ b/packages/animations/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_package", "ng_project", "npm_package") +load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "npm_package") package(default_visibility = ["//visibility:public"]) diff --git a/packages/animations/browser/BUILD.bazel b/packages/animations/browser/BUILD.bazel index 52ef8f5791a..9d208289925 100644 --- a/packages/animations/browser/BUILD.bazel +++ b/packages/animations/browser/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/animations/browser/testing/BUILD.bazel b/packages/animations/browser/testing/BUILD.bazel index c9f1d1a4e93..22024748a42 100644 --- a/packages/animations/browser/testing/BUILD.bazel +++ b/packages/animations/browser/testing/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/common/BUILD.bazel b/packages/common/BUILD.bazel index 262d5812670..818e7439887 100644 --- a/packages/common/BUILD.bazel +++ b/packages/common/BUILD.bazel @@ -1,6 +1,5 @@ load("//packages/common/locales:index.bzl", "generate_base_currencies_file") -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_package", "ng_project", "npm_package") +load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "npm_package") package(default_visibility = ["//visibility:public"]) diff --git a/packages/common/http/BUILD.bazel b/packages/common/http/BUILD.bazel index 9c7c545773e..201f8501167 100644 --- a/packages/common/http/BUILD.bazel +++ b/packages/common/http/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test", "ng_project") +load("//tools:defaults2.bzl", "api_golden_test", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/common/testing/BUILD.bazel b/packages/common/testing/BUILD.bazel index eb8213aa5c2..7b3570701c8 100644 --- a/packages/common/testing/BUILD.bazel +++ b/packages/common/testing/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/common/upgrade/BUILD.bazel b/packages/common/upgrade/BUILD.bazel index db223456629..ad627d243b4 100644 --- a/packages/common/upgrade/BUILD.bazel +++ b/packages/common/upgrade/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/core/global/BUILD.bazel b/packages/core/global/BUILD.bazel index d050fcf747a..6249da819b1 100644 --- a/packages/core/global/BUILD.bazel +++ b/packages/core/global/BUILD.bazel @@ -1,4 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") +load("//tools:defaults2.bzl", "generate_api_docs") package(default_visibility = ["//visibility:public"]) diff --git a/packages/core/rxjs-interop/BUILD.bazel b/packages/core/rxjs-interop/BUILD.bazel index c259e4adea0..2062694a0ae 100644 --- a/packages/core/rxjs-interop/BUILD.bazel +++ b/packages/core/rxjs-interop/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/core/test/bundling/image-directive/BUILD.bazel b/packages/core/test/bundling/image-directive/BUILD.bazel index c5929402a20..dc3de290ab2 100644 --- a/packages/core/test/bundling/image-directive/BUILD.bazel +++ b/packages/core/test/bundling/image-directive/BUILD.bazel @@ -1,6 +1,5 @@ load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//tools:defaults.bzl", "http_server") -load("//tools:defaults2.bzl", "ng_project", "protractor_web_test_suite", "ts_project") +load("//tools:defaults2.bzl", "http_server", "ng_project", "protractor_web_test_suite", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/core/testing/BUILD.bazel b/packages/core/testing/BUILD.bazel index dfbf5bba330..f9b7a5410d2 100644 --- a/packages/core/testing/BUILD.bazel +++ b/packages/core/testing/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/elements/BUILD.bazel b/packages/elements/BUILD.bazel index 2e317c13508..83206105519 100644 --- a/packages/elements/BUILD.bazel +++ b/packages/elements/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test_npm_package", "ng_package", "ng_project", "npm_package") +load("//tools:defaults2.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "npm_package") package(default_visibility = ["//visibility:public"]) diff --git a/packages/examples/common/BUILD.bazel b/packages/examples/common/BUILD.bazel index b79c7cc6644..7b99851d9ef 100644 --- a/packages/examples/common/BUILD.bazel +++ b/packages/examples/common/BUILD.bazel @@ -1,6 +1,5 @@ load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//tools:defaults.bzl", "http_server") -load("//tools:defaults2.bzl", "ng_project", "protractor_web_test_suite", "ts_project") +load("//tools:defaults2.bzl", "http_server", "ng_project", "protractor_web_test_suite", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/examples/core/BUILD.bazel b/packages/examples/core/BUILD.bazel index 55284ca9693..22c4ce0493b 100644 --- a/packages/examples/core/BUILD.bazel +++ b/packages/examples/core/BUILD.bazel @@ -1,6 +1,5 @@ load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//tools:defaults.bzl", "http_server") -load("//tools:defaults2.bzl", "angular_jasmine_test", "ng_project", "protractor_web_test_suite", "ts_project") +load("//tools:defaults2.bzl", "angular_jasmine_test", "http_server", "ng_project", "protractor_web_test_suite", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/examples/forms/BUILD.bazel b/packages/examples/forms/BUILD.bazel index 61d68882282..ac69ea93b01 100644 --- a/packages/examples/forms/BUILD.bazel +++ b/packages/examples/forms/BUILD.bazel @@ -1,6 +1,5 @@ load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//tools:defaults.bzl", "http_server") -load("//tools:defaults2.bzl", "ng_project", "protractor_web_test_suite", "ts_project") +load("//tools:defaults2.bzl", "http_server", "ng_project", "protractor_web_test_suite", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/examples/router/activated-route/BUILD.bazel b/packages/examples/router/activated-route/BUILD.bazel index 148da047be8..a7274372af6 100644 --- a/packages/examples/router/activated-route/BUILD.bazel +++ b/packages/examples/router/activated-route/BUILD.bazel @@ -1,6 +1,5 @@ load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//tools:defaults.bzl", "http_server") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "http_server", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/examples/service-worker/push/BUILD.bazel b/packages/examples/service-worker/push/BUILD.bazel index a820fc54f73..1cabbec49aa 100644 --- a/packages/examples/service-worker/push/BUILD.bazel +++ b/packages/examples/service-worker/push/BUILD.bazel @@ -1,6 +1,5 @@ load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//tools:defaults.bzl", "http_server") -load("//tools:defaults2.bzl", "ng_project", "protractor_web_test_suite", "ts_project") +load("//tools:defaults2.bzl", "http_server", "ng_project", "protractor_web_test_suite", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/examples/service-worker/registration-options/BUILD.bazel b/packages/examples/service-worker/registration-options/BUILD.bazel index f155eed9d27..d7f0abd3526 100644 --- a/packages/examples/service-worker/registration-options/BUILD.bazel +++ b/packages/examples/service-worker/registration-options/BUILD.bazel @@ -1,6 +1,5 @@ load("@aspect_rules_esbuild//esbuild:defs.bzl", "esbuild") -load("//tools:defaults.bzl", "http_server") -load("//tools:defaults2.bzl", "ng_project", "protractor_web_test_suite", "ts_project") +load("//tools:defaults2.bzl", "http_server", "ng_project", "protractor_web_test_suite", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/examples/upgrade/upgrade_example.bzl b/packages/examples/upgrade/upgrade_example.bzl index dfca59d5fa9..fd86f164394 100644 --- a/packages/examples/upgrade/upgrade_example.bzl +++ b/packages/examples/upgrade/upgrade_example.bzl @@ -1,6 +1,5 @@ load("@devinfra//bazel/esbuild:index.bzl", "esbuild") -load("//tools:defaults.bzl", "http_server") -load("//tools:defaults2.bzl", "ng_project", "protractor_web_test_suite", "ts_project") +load("//tools:defaults2.bzl", "http_server", "ng_project", "protractor_web_test_suite", "ts_project") """ Macro that can be used to create the Bazel targets for an "upgrade" example. Since the diff --git a/packages/forms/BUILD.bazel b/packages/forms/BUILD.bazel index bffcadf094b..b630eb2fe7c 100644 --- a/packages/forms/BUILD.bazel +++ b/packages/forms/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_package", "ng_project", "npm_package") +load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "npm_package") package(default_visibility = ["//visibility:public"]) diff --git a/packages/localize/BUILD.bazel b/packages/localize/BUILD.bazel index 7cec3b040cc..b93e26ff9f8 100644 --- a/packages/localize/BUILD.bazel +++ b/packages/localize/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test_npm_package", "ng_package", "npm_package", "ts_project") +load("//tools:defaults2.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "npm_package", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/localize/src/localize/BUILD.bazel b/packages/localize/src/localize/BUILD.bazel index a113d9e9d95..77d6edf448c 100644 --- a/packages/localize/src/localize/BUILD.bazel +++ b/packages/localize/src/localize/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/platform-browser-dynamic/BUILD.bazel b/packages/platform-browser-dynamic/BUILD.bazel index 1c74b6bae79..3eafae0bd4e 100644 --- a/packages/platform-browser-dynamic/BUILD.bazel +++ b/packages/platform-browser-dynamic/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test_npm_package", "ng_package", "ng_project", "npm_package") +load("//tools:defaults2.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "npm_package") package(default_visibility = ["//visibility:public"]) diff --git a/packages/platform-browser-dynamic/testing/BUILD.bazel b/packages/platform-browser-dynamic/testing/BUILD.bazel index 42b6066bb90..4856bfc67ac 100644 --- a/packages/platform-browser-dynamic/testing/BUILD.bazel +++ b/packages/platform-browser-dynamic/testing/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/platform-browser/BUILD.bazel b/packages/platform-browser/BUILD.bazel index 5b941683c9c..a41f06a549b 100644 --- a/packages/platform-browser/BUILD.bazel +++ b/packages/platform-browser/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_package", "ng_project", "npm_package", "tsec_test") +load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "npm_package", "tsec_test") package(default_visibility = ["//visibility:public"]) diff --git a/packages/platform-browser/animations/BUILD.bazel b/packages/platform-browser/animations/BUILD.bazel index 74bf9890bd7..dca6fca8aa3 100644 --- a/packages/platform-browser/animations/BUILD.bazel +++ b/packages/platform-browser/animations/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project", "tsec_test") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project", "tsec_test") package(default_visibility = ["//visibility:public"]) diff --git a/packages/platform-browser/testing/BUILD.bazel b/packages/platform-browser/testing/BUILD.bazel index 82fb5006957..839b7a4aadc 100644 --- a/packages/platform-browser/testing/BUILD.bazel +++ b/packages/platform-browser/testing/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/BUILD.bazel index e3d3febd229..b76134b4dd5 100644 --- a/packages/platform-server/BUILD.bazel +++ b/packages/platform-server/BUILD.bazel @@ -1,7 +1,6 @@ load("@aspect_rules_js//js:defs.bzl", "js_library") load("@npm2//:rollup/package_json.bzl", rollup = "bin") -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test_npm_package", "ng_package", "ng_project", "npm_package", "tsec_test") +load("//tools:defaults2.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "npm_package", "tsec_test") package(default_visibility = ["//visibility:public"]) diff --git a/packages/platform-server/testing/BUILD.bazel b/packages/platform-server/testing/BUILD.bazel index bd9c292b2db..6ca92979294 100644 --- a/packages/platform-server/testing/BUILD.bazel +++ b/packages/platform-server/testing/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel index 46810c54e0f..4ec962de865 100644 --- a/packages/router/BUILD.bazel +++ b/packages/router/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_package", "ng_project", "npm_package") +load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "npm_package") package(default_visibility = ["//visibility:public"]) diff --git a/packages/router/testing/BUILD.bazel b/packages/router/testing/BUILD.bazel index 4b64b86b239..98d22cef076 100644 --- a/packages/router/testing/BUILD.bazel +++ b/packages/router/testing/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/router/upgrade/BUILD.bazel b/packages/router/upgrade/BUILD.bazel index de6fdf9c242..1cd4140fee3 100644 --- a/packages/router/upgrade/BUILD.bazel +++ b/packages/router/upgrade/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel index 0ba50e03056..fa515818b16 100644 --- a/packages/service-worker/BUILD.bazel +++ b/packages/service-worker/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_package", "ng_project", "ts_config") +load("//tools:defaults2.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "ts_config") package(default_visibility = ["//visibility:public"]) diff --git a/packages/ssr/docs/BUILD.bazel b/packages/ssr/docs/BUILD.bazel index f355b0632ad..fe1be9ad662 100644 --- a/packages/ssr/docs/BUILD.bazel +++ b/packages/ssr/docs/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ts_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ts_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel index 425b69cb567..c40302bf614 100644 --- a/packages/upgrade/BUILD.bazel +++ b/packages/upgrade/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "api_golden_test_npm_package", "ng_package", "ng_project", "npm_package") +load("//tools:defaults2.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ng_project", "npm_package") package(default_visibility = ["//visibility:public"]) diff --git a/packages/upgrade/static/BUILD.bazel b/packages/upgrade/static/BUILD.bazel index 32a1789fb79..f0e5e7bcc50 100644 --- a/packages/upgrade/static/BUILD.bazel +++ b/packages/upgrade/static/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/packages/upgrade/static/testing/BUILD.bazel b/packages/upgrade/static/testing/BUILD.bazel index 58a70d6a2f7..b83e4448a17 100644 --- a/packages/upgrade/static/testing/BUILD.bazel +++ b/packages/upgrade/static/testing/BUILD.bazel @@ -1,5 +1,4 @@ -load("//tools:defaults.bzl", "generate_api_docs") -load("//tools:defaults2.bzl", "ng_project") +load("//tools:defaults2.bzl", "generate_api_docs", "ng_project") package(default_visibility = ["//visibility:public"]) diff --git a/tools/defaults.bzl b/tools/defaults.bzl index fae5fcc19c1..0e13f809815 100644 --- a/tools/defaults.bzl +++ b/tools/defaults.bzl @@ -3,11 +3,8 @@ load("@build_bazel_rules_nodejs//:index.bzl", _pkg_npm = "pkg_npm") load("@devinfra//bazel:extract_js_module_output.bzl", "extract_js_module_output") load("@devinfra//bazel:extract_types.bzl", _extract_types = "extract_types") -load("@devinfra//bazel/http-server:index.bzl", _http_server = "http_server") load("@rules_pkg//:pkg.bzl", "pkg_tar") -load("//adev/shared-docs/pipeline/api-gen:generate_api_docs.bzl", _generate_api_docs = "generate_api_docs") -http_server = _http_server extract_types = _extract_types # Packages which are versioned together on npm @@ -89,24 +86,3 @@ def pkg_npm(name, deps = [], validate = True, **kwargs): tags = ["manual"], visibility = visibility, ) - -def generate_api_docs(**kwargs): - _generate_api_docs( - # We need to specify import mappings for Angular packages that import other Angular - # packages. - import_map = { - # We only need to specify top-level entry-points, and only those that - # are imported from other packages. - "//packages/animations:index.ts": "@angular/animations", - "//packages/common:index.ts": "@angular/common", - "//packages/core:index.ts": "@angular/core", - "//packages/forms:index.ts": "@angular/forms", - "//packages/localize:index.ts": "@angular/localize", - "//packages/platform-browser-dynamic:index.ts": "@angular/platform-browser-dynamic", - "//packages/platform-browser:index.ts": "@angular/platform-browser", - "//packages/platform-server:index.ts": "@angular/platform-server", - "//packages/router:index.ts": "@angular/router", - "//packages/upgrade:index.ts": "@angular/upgrade", - }, - **kwargs - ) diff --git a/tools/defaults2.bzl b/tools/defaults2.bzl index 446d02314ff..e8db3b62e3f 100644 --- a/tools/defaults2.bzl +++ b/tools/defaults2.bzl @@ -4,6 +4,7 @@ load("@aspect_rules_ts//ts:defs.bzl", _ts_config = "ts_config") load("@devinfra//bazel/http-server:index.bzl", _http_server = "http_server") load("@rules_angular//src/ng_project:index.bzl", _ng_project = "ng_project") load("@rules_sass//src:index.bzl", _npm_sass_library = "npm_sass_library", _sass_binary = "sass_binary", _sass_library = "sass_library") +load("//adev/shared-docs/pipeline/api-gen:generate_api_docs.bzl", _generate_api_docs = "generate_api_docs") load("//tools/bazel:api_golden_test.bzl", _api_golden_test = "api_golden_test", _api_golden_test_npm_package = "api_golden_test_npm_package") load("//tools/bazel:esbuild.bzl", _esbuild = "esbuild", _esbuild_checked_in = "esbuild_checked_in") load("//tools/bazel:jasmine_test.bzl", _angular_jasmine_test = "angular_jasmine_test", _jasmine_test = "jasmine_test", _zone_compatible_jasmine_test = "zone_compatible_jasmine_test", _zoneless_jasmine_test = "zoneless_jasmine_test") @@ -121,3 +122,24 @@ def ng_project( tsconfig = tsconfig, **kwargs ) + +def generate_api_docs(**kwargs): + _generate_api_docs( + # We need to specify import mappings for Angular packages that import other Angular + # packages. + import_map = { + # We only need to specify top-level entry-points, and only those that + # are imported from other packages. + "//packages/animations:index.ts": "@angular/animations", + "//packages/common:index.ts": "@angular/common", + "//packages/core:index.ts": "@angular/core", + "//packages/forms:index.ts": "@angular/forms", + "//packages/localize:index.ts": "@angular/localize", + "//packages/platform-browser-dynamic:index.ts": "@angular/platform-browser-dynamic", + "//packages/platform-browser:index.ts": "@angular/platform-browser", + "//packages/platform-server:index.ts": "@angular/platform-server", + "//packages/router:index.ts": "@angular/router", + "//packages/upgrade:index.ts": "@angular/upgrade", + }, + **kwargs + )