build: move http_server and generate_api_docs into defaults2.bzl (#62878)

josephperrott · thePunderWoman · commit ea1afec1e433 · 2025-07-29T16:53:55.000Z
Move http_server and generate_api_docs into defaults2.bzl as they are rules_js compliant PR Close #62878
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/packages/platform-browser-dynamic/testing/BUILD.bazel b/packages/platform-browser-dynamic/testing/BUILD.bazel
diff --git a/packages/platform-browser/BUILD.bazel b/packages/platform-browser/BUILD.bazel
diff --git a/packages/platform-browser/animations/BUILD.bazel b/packages/platform-browser/animations/BUILD.bazel
diff --git a/packages/platform-browser/testing/BUILD.bazel b/packages/platform-browser/testing/BUILD.bazel
diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/BUILD.bazel
diff --git a/packages/platform-server/testing/BUILD.bazel b/packages/platform-server/testing/BUILD.bazel
diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel
diff --git a/packages/router/testing/BUILD.bazel b/packages/router/testing/BUILD.bazel
diff --git a/packages/router/upgrade/BUILD.bazel b/packages/router/upgrade/BUILD.bazel
diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel
diff --git a/packages/ssr/docs/BUILD.bazel b/packages/ssr/docs/BUILD.bazel
diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel
diff --git a/packages/upgrade/static/BUILD.bazel b/packages/upgrade/static/BUILD.bazel
diff --git a/packages/upgrade/static/testing/BUILD.bazel b/packages/upgrade/static/testing/BUILD.bazel
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
diff --git a/tools/defaults2.bzl b/tools/defaults2.bzl
