diff --git a/WORKSPACE b/WORKSPACE
index 642adf416f6..667244a9a32 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -80,7 +80,7 @@ yarn_install(
         "//:.yarnrc",
         "//:tools/npm-patches/@bazel+jasmine+5.8.1.patch",
         "//tools:postinstall-patches.js",
-        "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-b2cec2dcba358f9dc7111800a3d65738f57abe8f.patch",
+        "//tools/esm-interop:patches/npm/@angular+build-tooling+0.0.0-e0ec7b60641d7f6369be45d8d02663fd50f320be.patch",
         "//tools/esm-interop:patches/npm/@bazel+concatjs+5.8.1.patch",
         "//tools/esm-interop:patches/npm/@bazel+esbuild+5.7.1.patch",
         "//tools/esm-interop:patches/npm/@bazel+protractor+5.7.1.patch",
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
index 151719f625d..fed621db50a 100644
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@@ -45,6 +45,28 @@ filegroup(
     srcs = ["//packages/%s:files_for_docgen" % entrypoint for entrypoint in DOCS_ENTRYPOINTS],
 )
 
+# This target captures common dependencies needed for all `generate_api_docs` targets
+# throughout Angular's public API surface.
+filegroup(
+    name = "common_files_and_deps_for_docs",
+    srcs = [
+        "//packages:types",
+        "//packages/common:files_for_docgen",
+        "//packages/common/http:files_for_docgen",
+        "//packages/core:files_for_docgen",
+        "//packages/core/primitives/signals:files_for_docgen",
+        "//packages/core/src/compiler:files_for_docgen",
+        "//packages/core/src/di/interface:files_for_docgen",
+        "//packages/core/src/interface:files_for_docgen",
+        "//packages/core/src/reflection:files_for_docgen",
+        "//packages/core/src/util:files_for_docgen",
+        "//packages/platform-browser:files_for_docgen",
+        "//packages/platform-browser-dynamic:files_for_docgen",
+        "//packages/zone.js/lib:zone_d_ts",
+        "@npm//rxjs",
+    ],
+)
+
 generate_api_manifest(
     name = "docs_api_manifest",
     srcs = [
diff --git a/packages/animations/BUILD.bazel b/packages/animations/BUILD.bazel
index 55c512ef9f9..e63546ad0d4 100644
--- a/packages/animations/BUILD.bazel
+++ b/packages/animations/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_module", "ng_package")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -75,7 +74,11 @@ filegroup(
 
 generate_api_docs(
     name = "animations_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+        "//packages/common:files_for_docgen",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/animations",
 )
diff --git a/packages/animations/browser/BUILD.bazel b/packages/animations/browser/BUILD.bazel
index a7b6a5cb760..3e912ab45f0 100644
--- a/packages/animations/browser/BUILD.bazel
+++ b/packages/animations/browser/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -29,7 +28,11 @@ filegroup(
 
 generate_api_docs(
     name = "animations_browser_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+        "//packages/animations:files_for_docgen",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/animations/browser",
 )
diff --git a/packages/animations/browser/testing/BUILD.bazel b/packages/animations/browser/testing/BUILD.bazel
index 2d6634b683e..16d7b247234 100644
--- a/packages/animations/browser/testing/BUILD.bazel
+++ b/packages/animations/browser/testing/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -24,7 +23,10 @@ filegroup(
 
 generate_api_docs(
     name = "animations_browser_testing_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/animations/browser/testing",
 )
diff --git a/packages/common/BUILD.bazel b/packages/common/BUILD.bazel
index 092f1a8742c..0a44be4dd49 100644
--- a/packages/common/BUILD.bazel
+++ b/packages/common/BUILD.bazel
@@ -1,7 +1,6 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
 load("//packages/common/locales:index.bzl", "generate_base_currencies_file")
-load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_module", "ng_package")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -100,7 +99,12 @@ filegroup(
 
 generate_api_docs(
     name = "common_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+        "//packages/platform-browser:files_for_docgen",
+        "//packages/platform-browser-dynamic:files_for_docgen",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/common",
 )
diff --git a/packages/common/http/BUILD.bazel b/packages/common/http/BUILD.bazel
index 5585c5f64a1..a8162d6d453 100644
--- a/packages/common/http/BUILD.bazel
+++ b/packages/common/http/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "api_golden_test", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "api_golden_test", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -40,7 +39,11 @@ api_golden_test(
 
 generate_api_docs(
     name = "http_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+        "//packages/common:files_for_docgen",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/common/http",
 )
diff --git a/packages/common/testing/BUILD.bazel b/packages/common/testing/BUILD.bazel
index bb74d9b1ebd..781151bb3a5 100644
--- a/packages/common/testing/BUILD.bazel
+++ b/packages/common/testing/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -25,7 +24,10 @@ filegroup(
 
 generate_api_docs(
     name = "common_testing_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/common/testing",
 )
diff --git a/packages/common/upgrade/BUILD.bazel b/packages/common/upgrade/BUILD.bazel
index c5c06cec201..cfd81a6a0cb 100644
--- a/packages/common/upgrade/BUILD.bazel
+++ b/packages/common/upgrade/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -31,7 +30,10 @@ filegroup(
 
 generate_api_docs(
     name = "common_upgrade_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/common/upgrade",
 )
diff --git a/packages/core/BUILD.bazel b/packages/core/BUILD.bazel
index 3a47b54e044..3f63b10d8ee 100644
--- a/packages/core/BUILD.bazel
+++ b/packages/core/BUILD.bazel
@@ -136,7 +136,9 @@ filegroup(
 
 generate_api_docs(
     name = "core_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/core",
 )
diff --git a/packages/core/primitives/signals/BUILD.bazel b/packages/core/primitives/signals/BUILD.bazel
index 431698c01ec..437b4504443 100644
--- a/packages/core/primitives/signals/BUILD.bazel
+++ b/packages/core/primitives/signals/BUILD.bazel
@@ -28,4 +28,5 @@ filegroup(
         "*.ts",
         "src/**/*.ts",
     ]),
+    visibility = ["//visibility:public"],
 )
diff --git a/packages/core/rxjs-interop/BUILD.bazel b/packages/core/rxjs-interop/BUILD.bazel
index fbf973fa1f5..29f4320222c 100644
--- a/packages/core/rxjs-interop/BUILD.bazel
+++ b/packages/core/rxjs-interop/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -26,11 +25,17 @@ filegroup(
         "*.ts",
         "src/**/*.ts",
     ]) + ["PACKAGE.md"],
+    visibility = ["//visibility:public"],
 )
 
 generate_api_docs(
     name = "core_rxjs-interop_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+        "//packages/common:files_for_docgen",
+        "//packages/common/http:files_for_docgen",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/core/rxjs-interop",
 )
diff --git a/packages/core/src/compiler/BUILD.bazel b/packages/core/src/compiler/BUILD.bazel
index a52bf8ac545..7e37047c7df 100644
--- a/packages/core/src/compiler/BUILD.bazel
+++ b/packages/core/src/compiler/BUILD.bazel
@@ -30,4 +30,5 @@ filegroup(
     srcs = glob([
         "*.ts",
     ]),
+    visibility = ["//visibility:public"],
 )
diff --git a/packages/core/src/di/interface/BUILD.bazel b/packages/core/src/di/interface/BUILD.bazel
index 471b884116a..e7853656a94 100644
--- a/packages/core/src/di/interface/BUILD.bazel
+++ b/packages/core/src/di/interface/BUILD.bazel
@@ -32,4 +32,5 @@ filegroup(
     srcs = glob([
         "*.ts",
     ]),
+    visibility = ["//visibility:public"],
 )
diff --git a/packages/core/src/interface/BUILD.bazel b/packages/core/src/interface/BUILD.bazel
index d1e6bf7c674..9495d9e9b75 100644
--- a/packages/core/src/interface/BUILD.bazel
+++ b/packages/core/src/interface/BUILD.bazel
@@ -26,4 +26,5 @@ filegroup(
     srcs = glob([
         "*.ts",
     ]),
+    visibility = ["//visibility:public"],
 )
diff --git a/packages/core/src/reflection/BUILD.bazel b/packages/core/src/reflection/BUILD.bazel
index 84962192bcb..7939478ddad 100644
--- a/packages/core/src/reflection/BUILD.bazel
+++ b/packages/core/src/reflection/BUILD.bazel
@@ -30,4 +30,5 @@ filegroup(
     srcs = glob([
         "*.ts",
     ]),
+    visibility = ["//visibility:public"],
 )
diff --git a/packages/core/src/util/BUILD.bazel b/packages/core/src/util/BUILD.bazel
index 54aa00fbbb7..d6fcfdd961c 100644
--- a/packages/core/src/util/BUILD.bazel
+++ b/packages/core/src/util/BUILD.bazel
@@ -33,4 +33,5 @@ filegroup(
     srcs = glob([
         "**/*.ts",
     ]),
+    visibility = ["//visibility:public"],
 )
diff --git a/packages/core/testing/BUILD.bazel b/packages/core/testing/BUILD.bazel
index 8957135f779..3be96e7e52b 100644
--- a/packages/core/testing/BUILD.bazel
+++ b/packages/core/testing/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -26,11 +25,15 @@ filegroup(
         "*.ts",
         "src/**/*.ts",
     ]) + ["PACKAGE.md"],
+    visibility = ["//visibility:public"],
 )
 
 generate_api_docs(
     name = "core_testing_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/core/testing",
 )
diff --git a/packages/elements/BUILD.bazel b/packages/elements/BUILD.bazel
index 4cd9d19fde5..763e987d734 100644
--- a/packages/elements/BUILD.bazel
+++ b/packages/elements/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -58,7 +57,10 @@ filegroup(
 
 generate_api_docs(
     name = "elements_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/elements",
 )
diff --git a/packages/forms/BUILD.bazel b/packages/forms/BUILD.bazel
index e95f149a646..ec6c6ca0071 100644
--- a/packages/forms/BUILD.bazel
+++ b/packages/forms/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_module", "ng_package")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -72,7 +71,10 @@ filegroup(
 
 generate_api_docs(
     name = "forms_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/forms",
 )
diff --git a/packages/localize/BUILD.bazel b/packages/localize/BUILD.bazel
index 42fdc4736c7..6b306d71f90 100644
--- a/packages/localize/BUILD.bazel
+++ b/packages/localize/BUILD.bazel
@@ -1,6 +1,5 @@
-load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_package", "ts_library")
+load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_package", "ts_library")
 load("//packages/bazel:index.bzl", "types_bundle")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -82,7 +81,10 @@ filegroup(
 
 generate_api_docs(
     name = "localize_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/localize",
 )
diff --git a/packages/platform-browser-dynamic/BUILD.bazel b/packages/platform-browser-dynamic/BUILD.bazel
index 3c5e67a7cbb..348556abd8f 100644
--- a/packages/platform-browser-dynamic/BUILD.bazel
+++ b/packages/platform-browser-dynamic/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -64,7 +63,10 @@ filegroup(
 
 generate_api_docs(
     name = "platform-browser_dynamic_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/platform-browser-dynamic",
 )
diff --git a/packages/platform-browser-dynamic/testing/BUILD.bazel b/packages/platform-browser-dynamic/testing/BUILD.bazel
index 5516a629fae..c0fa3b50622 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", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -29,7 +28,10 @@ filegroup(
 
 generate_api_docs(
     name = "platform-browser_dynamic_testing_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/platform-browser-dynamic/testing",
 )
diff --git a/packages/platform-browser/BUILD.bazel b/packages/platform-browser/BUILD.bazel
index ad5f67479e0..e9caf33e53d 100644
--- a/packages/platform-browser/BUILD.bazel
+++ b/packages/platform-browser/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_module", "ng_package", "tsec_test")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package", "tsec_test")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -85,7 +84,10 @@ filegroup(
 
 generate_api_docs(
     name = "platform-browser_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/platform-browser",
 )
diff --git a/packages/platform-browser/animations/BUILD.bazel b/packages/platform-browser/animations/BUILD.bazel
index 9257d202e02..ba77776e8d4 100644
--- a/packages/platform-browser/animations/BUILD.bazel
+++ b/packages/platform-browser/animations/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module", "tsec_test")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module", "tsec_test")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -38,7 +37,10 @@ filegroup(
 
 generate_api_docs(
     name = "platform-browser_animations_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/platform-browser/animations",
 )
diff --git a/packages/platform-browser/testing/BUILD.bazel b/packages/platform-browser/testing/BUILD.bazel
index 76a0309a99c..8339803bee7 100644
--- a/packages/platform-browser/testing/BUILD.bazel
+++ b/packages/platform-browser/testing/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -28,7 +27,10 @@ filegroup(
 
 generate_api_docs(
     name = "platform-browser_testing_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/platform-browser/testing",
 )
diff --git a/packages/platform-server/BUILD.bazel b/packages/platform-server/BUILD.bazel
index 5a49e4bd73c..e1430726a88 100644
--- a/packages/platform-server/BUILD.bazel
+++ b/packages/platform-server/BUILD.bazel
@@ -1,6 +1,5 @@
 load("@build_bazel_rules_nodejs//:index.bzl", "js_library")
-load("//tools:defaults.bzl", "api_golden_test_npm_package", "esbuild", "ng_module", "ng_package", "tsec_test")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "api_golden_test_npm_package", "esbuild", "generate_api_docs", "ng_module", "ng_package", "tsec_test")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -100,7 +99,10 @@ filegroup(
 
 generate_api_docs(
     name = "platform-server_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/platform-server",
 )
diff --git a/packages/platform-server/testing/BUILD.bazel b/packages/platform-server/testing/BUILD.bazel
index f81828dccc6..7ad75ce764e 100644
--- a/packages/platform-server/testing/BUILD.bazel
+++ b/packages/platform-server/testing/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -26,7 +25,10 @@ filegroup(
 
 generate_api_docs(
     name = "platform-server_testing_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/platform-server/testing",
 )
diff --git a/packages/router/BUILD.bazel b/packages/router/BUILD.bazel
index 2c8d7319197..f591ae6ab0c 100644
--- a/packages/router/BUILD.bazel
+++ b/packages/router/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_module", "ng_package")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -78,7 +77,13 @@ filegroup(
 
 generate_api_docs(
     name = "router_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+        "//packages/common:files_for_docgen",
+        "//packages/common/http:files_for_docgen",
+        "@npm//@types/dom-view-transitions",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/router",
 )
diff --git a/packages/router/testing/BUILD.bazel b/packages/router/testing/BUILD.bazel
index 6c1cea2c0ab..37367fd29b7 100644
--- a/packages/router/testing/BUILD.bazel
+++ b/packages/router/testing/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -28,7 +27,10 @@ filegroup(
 
 generate_api_docs(
     name = "router_testing_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/router/testing",
 )
diff --git a/packages/router/upgrade/BUILD.bazel b/packages/router/upgrade/BUILD.bazel
index 1d95c84cd04..3b64c409088 100644
--- a/packages/router/upgrade/BUILD.bazel
+++ b/packages/router/upgrade/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -31,7 +30,10 @@ filegroup(
 
 generate_api_docs(
     name = "router_upgrade_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/router/upgrade",
 )
diff --git a/packages/service-worker/BUILD.bazel b/packages/service-worker/BUILD.bazel
index 0adf2c963fb..644cc516fd5 100644
--- a/packages/service-worker/BUILD.bazel
+++ b/packages/service-worker/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -81,7 +80,10 @@ filegroup(
 
 generate_api_docs(
     name = "service-worker_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/service-worker",
 )
diff --git a/packages/upgrade/BUILD.bazel b/packages/upgrade/BUILD.bazel
index 4a48f7e4e68..1633a1da9ed 100644
--- a/packages/upgrade/BUILD.bazel
+++ b/packages/upgrade/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "api_golden_test_npm_package", "ng_module", "ng_package")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -63,7 +62,10 @@ filegroup(
 
 generate_api_docs(
     name = "upgrade_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/upgrade",
 )
diff --git a/packages/upgrade/static/BUILD.bazel b/packages/upgrade/static/BUILD.bazel
index 96d1bb3fb6a..8a4ae4f005d 100644
--- a/packages/upgrade/static/BUILD.bazel
+++ b/packages/upgrade/static/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -30,7 +29,11 @@ filegroup(
 
 generate_api_docs(
     name = "upgrade_static_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+        "//packages/upgrade:files_for_docgen",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/upgrade/static",
 )
diff --git a/packages/upgrade/static/testing/BUILD.bazel b/packages/upgrade/static/testing/BUILD.bazel
index 1925f8525c4..b84415f58ac 100644
--- a/packages/upgrade/static/testing/BUILD.bazel
+++ b/packages/upgrade/static/testing/BUILD.bazel
@@ -1,5 +1,4 @@
-load("//tools:defaults.bzl", "ng_module")
-load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", "generate_api_docs")
+load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -29,7 +28,10 @@ filegroup(
 
 generate_api_docs(
     name = "upgrade_static_testing_docs",
-    srcs = [":files_for_docgen"],
+    srcs = [
+        ":files_for_docgen",
+        "//packages:common_files_and_deps_for_docs",
+    ],
     entry_point = ":index.ts",
     module_name = "@angular/upgrade/static/testing",
 )
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
index 49fdf23755e..c726c244812 100644
--- a/tools/defaults.bzl
+++ b/tools/defaults.bzl
@@ -20,6 +20,7 @@ load("@npm//@angular/build-tooling/bazel/spec-bundling:index.bzl", "spec_bundle"
 load("@npm//tsec:index.bzl", _tsec_test = "tsec_test")
 load("//packages/bazel:index.bzl", _ng_module = "ng_module", _ng_package = "ng_package")
 load("//tools/esm-interop:index.bzl", "enable_esm_node_module_loader", _nodejs_binary = "nodejs_binary", _nodejs_test = "nodejs_test")
+load("@npm//@angular/build-tooling/bazel/api-gen:generate_api_docs.bzl", _generate_api_docs = "generate_api_docs")
 
 _DEFAULT_TSCONFIG_TEST = "//packages:tsconfig-test"
 _INTERNAL_NG_MODULE_COMPILER = "//packages/bazel/src/ngc-wrapped"
@@ -613,3 +614,24 @@ def esbuild(args = None, **kwargs):
         },
         **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
+    )
diff --git a/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-b2cec2dcba358f9dc7111800a3d65738f57abe8f.patch b/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-e0ec7b60641d7f6369be45d8d02663fd50f320be.patch
similarity index 100%
rename from tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-b2cec2dcba358f9dc7111800a3d65738f57abe8f.patch
rename to tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-e0ec7b60641d7f6369be45d8d02663fd50f320be.patch