diff --git a/packages/compiler/BUILD.bazel b/packages/compiler/BUILD.bazel
index 993a290899f..d369670877c 100644
--- a/packages/compiler/BUILD.bazel
+++ b/packages/compiler/BUILD.bazel
@@ -1,9 +1,9 @@
-load("//tools:defaults.bzl", "ng_package", "ts_library", "tsec_test")
-load("//tools:defaults2.bzl", "npm_package")
+load("//tools:defaults.bzl", "ng_package", "tsec_test")
+load("//tools:defaults2.bzl", "npm_package", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
-ts_library(
+ts_project(
     name = "compiler",
     srcs = glob(
         [
@@ -37,7 +37,10 @@ ng_package(
         "//integration:__subpackages__",
         "//modules/ssr-benchmarks:__subpackages__",
         "//packages/compiler-cli/integrationtest:__pkg__",
+        "//packages/core/test/bundling:__subpackages__",
+        "//packages/core/test/playground/zone-signal-input:__pkg__",
         "//packages/language-service/test:__pkg__",
+        "@npm//@angular/build-tooling/shared-scripts:__subpackages__",
     ],
     deps = [
         ":compiler",
diff --git a/packages/compiler/test/BUILD.bazel b/packages/compiler/test/BUILD.bazel
index 664f82653d7..c876160c426 100644
--- a/packages/compiler/test/BUILD.bazel
+++ b/packages/compiler/test/BUILD.bazel
@@ -1,4 +1,5 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
+load("//tools:defaults2.bzl", "ts_project")
 
 # Test that should only be run in node
 NODE_ONLY = [
@@ -6,15 +7,14 @@ NODE_ONLY = [
     "aot/**/*.ts",
 ]
 
-ts_library(
+ts_project(
     name = "test_lib",
     testonly = True,
     srcs = glob(
         ["**/*.ts"],
         exclude = NODE_ONLY,
     ),
-    deps = [
-        "//packages:types",
+    interop_deps = [
         "//packages/common",
         "//packages/compiler",
         "//packages/compiler/test/expression_parser/utils",
@@ -26,22 +26,26 @@ ts_library(
         "//packages/platform-browser-dynamic",
         "//packages/platform-browser/testing",
         "//packages/private/testing",
-        "@npm//source-map",
+    ],
+    deps = [
+        "//:node_modules/source-map",
     ],
 )
 
-ts_library(
+ts_project(
     name = "test_node_only_lib",
     testonly = True,
     srcs = glob(
         NODE_ONLY,
     ),
-    deps = [
+    interop_deps = [
         ":test_lib",
         "//packages/compiler",
         "//packages/compiler/test/expression_parser/utils",
         "//packages/core",
-        "@npm//typescript",
+    ],
+    deps = [
+        "//:node_modules/typescript",
     ],
 )
 
diff --git a/packages/compiler/test/expression_parser/BUILD.bazel b/packages/compiler/test/expression_parser/BUILD.bazel
index 6f1263eee60..e27ca61d091 100644
--- a/packages/compiler/test/expression_parser/BUILD.bazel
+++ b/packages/compiler/test/expression_parser/BUILD.bazel
@@ -1,10 +1,11 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
+load("//tools:defaults2.bzl", "ts_project")
 
-ts_library(
+ts_project(
     name = "expression_parser_lib",
     testonly = True,
     srcs = glob(["**/*.ts"]),
-    deps = [
+    interop_deps = [
         "//packages/compiler",
         "//packages/compiler/test/expression_parser/utils",
         "//packages/platform-browser/testing",
diff --git a/packages/compiler/test/expression_parser/utils/BUILD.bazel b/packages/compiler/test/expression_parser/utils/BUILD.bazel
index dbbf4e19949..172ad228f9e 100644
--- a/packages/compiler/test/expression_parser/utils/BUILD.bazel
+++ b/packages/compiler/test/expression_parser/utils/BUILD.bazel
@@ -1,15 +1,15 @@
-load("//tools:defaults.bzl", "ts_library")
+load("//tools:defaults2.bzl", "ts_project")
 
-ts_library(
+ts_project(
     name = "utils",
     testonly = True,
     srcs = glob(
         ["*.ts"],
     ),
+    interop_deps = [
+        "//packages/compiler",
+    ],
     visibility = [
         "//packages/compiler/test:__subpackages__",
     ],
-    deps = [
-        "//packages/compiler",
-    ],
 )
diff --git a/packages/compiler/test/i18n/integration_common.ts b/packages/compiler/test/i18n/integration_common.ts
index c6f8e043cbf..81b3a24e853 100644
--- a/packages/compiler/test/i18n/integration_common.ts
+++ b/packages/compiler/test/i18n/integration_common.ts
@@ -14,7 +14,7 @@ import {HtmlParser} from '../../src/ml_parser/html_parser';
 import {ResourceLoader} from '../../src/resource_loader';
 import {Component, DebugElement, TRANSLATIONS, TRANSLATIONS_FORMAT} from '@angular/core';
 import {ComponentFixture, TestBed} from '@angular/core/testing';
-import {By} from '@angular/platform-browser/src/dom/debug/by';
+import {By} from '@angular/platform-browser';
 import {stringifyElement} from '@angular/private/testing';
 import {expect} from '@angular/private/testing/matchers';
 
diff --git a/packages/compiler/test/integration_spec.ts b/packages/compiler/test/integration_spec.ts
index 4c30b5b267e..37bf4f6b133 100644
--- a/packages/compiler/test/integration_spec.ts
+++ b/packages/compiler/test/integration_spec.ts
@@ -8,7 +8,7 @@
 
 import {Component, Directive, Input} from '@angular/core';
 import {ComponentFixture, TestBed, waitForAsync} from '@angular/core/testing';
-import {By} from '@angular/platform-browser/src/dom/debug/by';
+import {By} from '@angular/platform-browser';
 import {expect} from '@angular/private/testing/matchers';
 
 describe('integration tests', () => {
diff --git a/packages/compiler/test/ml_parser/BUILD.bazel b/packages/compiler/test/ml_parser/BUILD.bazel
index b3b78ab7d7d..d81b3b1d3ac 100644
--- a/packages/compiler/test/ml_parser/BUILD.bazel
+++ b/packages/compiler/test/ml_parser/BUILD.bazel
@@ -1,10 +1,11 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
+load("//tools:defaults2.bzl", "ts_project")
 
-ts_library(
+ts_project(
     name = "ml_parser_lib",
     testonly = True,
     srcs = glob(["**/*.ts"]),
-    deps = [
+    interop_deps = [
         "//packages:types",
         "//packages/compiler",
         "//packages/compiler/test/ml_parser/util",
diff --git a/packages/compiler/test/ml_parser/util/BUILD.bazel b/packages/compiler/test/ml_parser/util/BUILD.bazel
index d93887ffbc1..3c3b1fab432 100644
--- a/packages/compiler/test/ml_parser/util/BUILD.bazel
+++ b/packages/compiler/test/ml_parser/util/BUILD.bazel
@@ -1,12 +1,12 @@
-load("//tools:defaults.bzl", "ts_library")
+load("//tools:defaults2.bzl", "ts_project")
 
-ts_library(
+ts_project(
     name = "util",
     testonly = True,
     srcs = glob(["**/*.ts"]),
-    visibility = ["//visibility:public"],
-    deps = [
+    interop_deps = [
         "//packages:types",
         "//packages/compiler",
     ],
+    visibility = ["//visibility:public"],
 )
diff --git a/packages/compiler/test/render3/BUILD.bazel b/packages/compiler/test/render3/BUILD.bazel
index e6845aa43d8..2ebe53a8e5b 100644
--- a/packages/compiler/test/render3/BUILD.bazel
+++ b/packages/compiler/test/render3/BUILD.bazel
@@ -1,12 +1,13 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test")
+load("//tools:defaults2.bzl", "ts_project")
 
-ts_library(
+ts_project(
     name = "test_lib",
     testonly = True,
     srcs = glob(
         ["**/*.ts"],
     ),
-    deps = [
+    interop_deps = [
         "//packages:types",
         "//packages/compiler",
         "//packages/compiler/test/expression_parser/utils",
diff --git a/packages/compiler/test/selector/BUILD.bazel b/packages/compiler/test/selector/BUILD.bazel
index a8cc08a01ea..66956ea053f 100644
--- a/packages/compiler/test/selector/BUILD.bazel
+++ b/packages/compiler/test/selector/BUILD.bazel
@@ -1,11 +1,11 @@
-load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ts_library")
+load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
+load("//tools:defaults2.bzl", "ts_project")
 
-ts_library(
+ts_project(
     name = "selector_lib",
     testonly = True,
     srcs = glob(["**/*.ts"]),
-    deps = [
-        "//packages:types",
+    interop_deps = [
         "//packages/compiler",
         "//packages/platform-browser/testing",
         "//packages/private/testing",
diff --git a/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-2670abf637fa155971cdd1f7e570a7f234922a65.patch b/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-2670abf637fa155971cdd1f7e570a7f234922a65.patch
index a32d6ec0f19..62d7152cc21 100644
--- a/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-2670abf637fa155971cdd1f7e570a7f234922a65.patch
+++ b/tools/esm-interop/patches/npm/@angular+build-tooling+0.0.0-2670abf637fa155971cdd1f7e570a7f234922a65.patch
@@ -43,7 +43,7 @@ index d6249b8..707ae39 100755
          config_file = ":%s_config_file" % name,
          deps = [
 -            "@npm//@angular/compiler-cli",
-+            "@angular//packages/compiler",
++            "@angular//packages/compiler:npm_package",
 +            "@angular//packages/compiler-cli:npm_package",
              "@npm//@angular/build-tooling/shared-scripts/angular-optimization:js_lib",
          ],
@@ -151,7 +151,7 @@ index b2729ad..80ab926 100755
      deps = [
          "@npm//@angular/build",
 -        "@npm//@angular/compiler-cli",
-+        "@angular//packages/compiler",
++        "@angular//packages/compiler:npm_package",
 +        "@angular//packages/compiler-cli:npm_package",
          "@npm//@babel/core",
          "@npm//@babel/plugin-proposal-async-generator-functions",