build: remove ts_project interop

josephperrott · alan-agius4 · commit 9aa49e94c7d4 · 2025-04-23T08:22:16.000+02:00
diff --git a/packages/angular/build/BUILD.bazel b/packages/angular/build/BUILD.bazel
@@ -81,7 +81,6 @@ ts_project(
         "//packages/angular/build:src/builders/ng-packagr/schema.ts",
     ],
     data = RUNTIME_ASSETS,
-    module_name = "@angular/build",
     deps = [
         ":node_modules/@ampproject/remapping",
         ":node_modules/@angular-devkit/architect",
diff --git a/packages/angular/build/private/BUILD.bazel b/packages/angular/build/private/BUILD.bazel
@@ -1,11 +1,10 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
 ts_project(
     name = "private",
     srcs = ["index.ts"],
-    module_name = "@angular/build/private",
     deps = [
         "//packages/angular/build",
     ],
diff --git a/packages/angular/cli/BUILD.bazel b/packages/angular/cli/BUILD.bazel
@@ -43,7 +43,6 @@ ts_project(
         "//packages/angular/cli:src/commands/update/schematic/schema.ts",
     ],
     data = RUNTIME_ASSETS,
-    module_name = "@angular/cli",
     deps = [
         ":node_modules/@angular-devkit/architect",
         ":node_modules/@angular-devkit/core",
diff --git a/packages/angular/create/BUILD.bazel b/packages/angular/create/BUILD.bazel
@@ -22,7 +22,6 @@ ts_project(
         "src/*.ts",
     ]),
     data = RUNTIME_ASSETS,
-    module_name = "@angular/create",
     deps = [
         "//:node_modules/@types/node",
         "//packages/angular/cli:angular-cli",
diff --git a/packages/angular/pwa/BUILD.bazel b/packages/angular/pwa/BUILD.bazel
@@ -32,7 +32,6 @@ ts_project(
         "//packages/angular/pwa:pwa/schema.ts",
     ],
     data = RUNTIME_ASSETS,
-    module_name = "@angular/pwa",
     deps = [
         ":node_modules/@angular-devkit/schematics",
         ":node_modules/@schematics/angular",
diff --git a/packages/angular/ssr/BUILD.bazel b/packages/angular/ssr/BUILD.bazel
@@ -25,7 +25,6 @@ ts_project(
     data = [
         "//packages/angular/ssr/third_party/beasties:beasties_bundled",
     ],
-    module_name = "@angular/ssr",
     source_map = True,
     tsconfig = "//:build-tsconfig-esm",
     deps = [
diff --git a/packages/angular/ssr/node/BUILD.bazel b/packages/angular/ssr/node/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -16,7 +16,6 @@ ts_project(
     ],
     # TODO: Fix strict_deps failure
     ignore_strict_deps = True,
-    module_name = "@angular/ssr/node",
     source_map = True,
     tsconfig = "//:build-tsconfig-esm",
     deps = [
diff --git a/packages/angular/ssr/schematics/BUILD.bazel b/packages/angular/ssr/schematics/BUILD.bazel
@@ -57,7 +57,6 @@ ts_project(
         "//packages/angular/ssr/schematics:" + src.replace(".json", ".ts")
         for (src, _) in ALL_SCHEMA_TARGETS
     ],
-    module_name = "@angular/ssr/schematics",
     deps = [
         "//packages/angular/ssr:node_modules/@angular-devkit/schematics",
         "//packages/angular/ssr:node_modules/@schematics/angular",
diff --git a/packages/angular_devkit/architect/BUILD.bazel b/packages/angular_devkit/architect/BUILD.bazel
@@ -66,7 +66,6 @@ ts_project(
     ],
     # Ensure tests can execute the output JS, relying on schemas/JSON files.
     data = JSON_FILES,
-    module_name = "@angular-devkit/architect",
     deps = [
         ":node_modules/@angular-devkit/core",
         ":node_modules/rxjs",
diff --git a/packages/angular_devkit/architect/node/BUILD.bazel b/packages/angular_devkit/architect/node/BUILD.bazel
@@ -15,7 +15,6 @@ ts_project(
         include = ["**/*.ts"],
         exclude = ["**/*_spec.ts"],
     ),
-    module_name = "@angular-devkit/architect/node",
     deps = [
         "//:node_modules/@types/node",
         "//packages/angular_devkit/architect",
diff --git a/packages/angular_devkit/architect/node/test/BUILD.bazel b/packages/angular_devkit/architect/node/test/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 ts_project(
     name = "test_lib",
diff --git a/packages/angular_devkit/architect/testing/BUILD.bazel b/packages/angular_devkit/architect/testing/BUILD.bazel
@@ -3,7 +3,7 @@
 # Use of this source code is governed by an MIT-style license that can be
 # found in the LICENSE file at https://angular.dev/license
 
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 licenses(["notice"])
 
@@ -15,7 +15,6 @@ ts_project(
         include = ["**/*.ts"],
         exclude = ["**/*_spec.ts"],
     ),
-    module_name = "@angular-devkit/architect/testing",
     deps = [
         "//:node_modules/@types/node",
         "//packages/angular_devkit/architect",
diff --git a/packages/angular_devkit/architect_cli/BUILD.bazel b/packages/angular_devkit/architect_cli/BUILD.bazel
@@ -16,7 +16,6 @@ ts_project(
     srcs = [
         "bin/architect.ts",
     ] + glob(["src/**/*.ts"]),
-    module_name = "@angular-devkit/architect-cli",
     deps = [
         ":node_modules/@angular-devkit/architect",
         ":node_modules/@angular-devkit/core",
diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel
@@ -127,7 +127,6 @@ ts_project(
         "//packages/angular_devkit/build_angular:src/builders/web-test-runner/schema.ts",
     ],
     data = RUNTIME_ASSETS,
-    module_name = "@angular-devkit/build-angular",
     deps = [
         ":node_modules/@ampproject/remapping",
         ":node_modules/@angular-devkit/architect",
diff --git a/packages/angular_devkit/build_webpack/BUILD.bazel b/packages/angular_devkit/build_webpack/BUILD.bazel
@@ -45,7 +45,6 @@ ts_project(
         "//packages/angular_devkit/build_webpack:src/builders/webpack/schema.ts",
     ],
     data = RUNTIME_ASSETS,
-    module_name = "@angular-devkit/build-webpack",
     deps = [
         ":node_modules/@angular-devkit/architect",
         ":node_modules/rxjs",
diff --git a/packages/angular_devkit/core/BUILD.bazel b/packages/angular_devkit/core/BUILD.bazel
@@ -30,7 +30,6 @@ ts_project(
         ],
     ) + ["index.ts"],
     data = RUNTIME_ASSETS,
-    module_name = "@angular-devkit/core",
     deps = [
         ":node_modules/ajv",
         ":node_modules/ajv-formats",
diff --git a/packages/angular_devkit/core/node/BUILD.bazel b/packages/angular_devkit/core/node/BUILD.bazel
@@ -18,7 +18,6 @@ ts_project(
             "**/*_spec.ts",
         ],
     ),
-    module_name = "@angular-devkit/core/node",
     deps = [
         "//:node_modules/@types/node",
         "//packages/angular_devkit/core",
diff --git a/packages/angular_devkit/core/node/testing/BUILD.bazel b/packages/angular_devkit/core/node/testing/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -16,7 +16,6 @@ ts_project(
             "**/*_spec.ts",
         ],
     ),
-    module_name = "@angular-devkit/core/node/testing",
     deps = [
         "//:node_modules/@types/jasmine",
         "//:node_modules/@types/node",
diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel
@@ -25,7 +25,6 @@ ts_project(
     data = [
         "package.json",
     ],
-    module_name = "@angular-devkit/schematics",
     deps = [
         ":node_modules/@angular-devkit/core",
         ":node_modules/jsonc-parser",
diff --git a/packages/angular_devkit/schematics/tasks/BUILD.bazel b/packages/angular_devkit/schematics/tasks/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -18,7 +18,6 @@ ts_project(
         ],
     ),
     data = ["package.json"],
-    module_name = "@angular-devkit/schematics/tasks",
     deps = [
         "//:node_modules/@types/node",
         "//packages/angular_devkit/schematics",
diff --git a/packages/angular_devkit/schematics/tasks/node/BUILD.bazel b/packages/angular_devkit/schematics/tasks/node/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -16,7 +16,6 @@ ts_project(
             "**/*_spec.ts",
         ],
     ),
-    module_name = "@angular-devkit/schematics/tasks/node",
     deps = [
         "//:node_modules/@types/node",
         "//packages/angular_devkit/core",
diff --git a/packages/angular_devkit/schematics/testing/BUILD.bazel b/packages/angular_devkit/schematics/testing/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
@@ -14,7 +14,6 @@ ts_project(
         include = ["**/*.ts"],
     ),
     data = ["package.json"],
-    module_name = "@angular-devkit/schematics/testing",
     deps = [
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics:node_modules/@angular-devkit/core",
diff --git a/packages/angular_devkit/schematics/tools/BUILD.bazel b/packages/angular_devkit/schematics/tools/BUILD.bazel
@@ -18,7 +18,6 @@ ts_project(
         ],
     ),
     data = ["package.json"],
-    module_name = "@angular-devkit/schematics/tools",
     deps = [
         "//:node_modules/@types/node",
         "//packages/angular_devkit/schematics",
diff --git a/packages/angular_devkit/schematics_cli/BUILD.bazel b/packages/angular_devkit/schematics_cli/BUILD.bazel
@@ -44,7 +44,6 @@ ts_project(
         "//packages/angular_devkit/schematics_cli:schematic/schema.ts",
     ],
     data = RUNTIME_ASSETS,
-    module_name = "@angular-devkit/schematics-cli",
     deps = [
         ":node_modules/@angular-devkit/core",
         ":node_modules/@angular-devkit/schematics",
diff --git a/packages/ngtools/webpack/BUILD.bazel b/packages/ngtools/webpack/BUILD.bazel
@@ -29,7 +29,6 @@ ts_project(
     data = [
         "package.json",
     ],
-    module_name = "@ngtools/webpack",
     deps = [
         ":node_modules/webpack",
         "//:node_modules/@angular/compiler-cli",
diff --git a/packages/schematics/angular/BUILD.bazel b/packages/schematics/angular/BUILD.bazel
@@ -95,7 +95,6 @@ ts_project(
         for (src, _) in ALL_SCHEMA_TARGETS
     ],
     data = RUNTIME_ASSETS,
-    module_name = "@schematics/angular",
     deps = [
         ":node_modules/@angular-devkit/core",
         ":node_modules/@angular-devkit/schematics",
diff --git a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/BUILD.bazel b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 # files fetched on 2025-03-03 from
 # https://github.com/microsoft/TypeScript/releases/tag/v5.8.2
diff --git a/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD.bazel b/tests/angular_devkit/schematics/tools/file-system-engine-host/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 # Copyright Google Inc. All Rights Reserved.
 #
diff --git a/tests/legacy-cli/BUILD.bazel b/tests/legacy-cli/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@aspect_bazel_lib//lib:directory_path.bzl", "directory_path")
 load("@npm2//:rollup/package_json.bzl", rollup = "bin")
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 load(":e2e.bzl", "e2e_suites")
 
 package(default_visibility = ["//visibility:public"])
diff --git a/tests/legacy-cli/e2e/initialize/BUILD.bazel b/tests/legacy-cli/e2e/initialize/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/tests/legacy-cli/e2e/setup/BUILD.bazel b/tests/legacy-cli/e2e/setup/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/tests/legacy-cli/e2e/tests/BUILD.bazel b/tests/legacy-cli/e2e/tests/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/tests/legacy-cli/e2e/utils/BUILD.bazel b/tests/legacy-cli/e2e/utils/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//tools:interop.bzl", "ts_project")
+load("//tools:defaults.bzl", "ts_project")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
@@ -1,13 +1,44 @@
 load("@aspect_bazel_lib//lib:copy_to_bin.bzl", _copy_to_bin = "copy_to_bin")
 load("@aspect_rules_jasmine//jasmine:defs.bzl", _jasmine_test = "jasmine_test")
 load("@aspect_rules_js//js:defs.bzl", _js_binary = "js_binary")
+load("@aspect_rules_ts//ts:defs.bzl", _ts_project = "ts_project")
+load("@devinfra//bazel/ts_project:index.bzl", "strict_deps_test")
 load("@rules_angular//src/ng_package:index.bzl", _ng_package = "ng_package")
-load("//tools:interop.bzl", _ts_project = "ts_project")
 load("//tools:substitutions.bzl", "substitutions")
 load("//tools/bazel:npm_package.bzl", _npm_package = "npm_package")
 
-def ts_project(**kwargs):
-    _ts_project(**kwargs)
+def ts_project(
+        name,
+        deps = [],
+        tsconfig = None,
+        testonly = False,
+        visibility = None,
+        ignore_strict_deps = False,
+        **kwargs):
+    if tsconfig == None:
+        tsconfig = "//:test-tsconfig" if testonly else "//:build-tsconfig"
+
+    _ts_project(
+        name = name,
+        testonly = testonly,
+        declaration = True,
+        tsconfig = tsconfig,
+        visibility = visibility,
+        # Use the worker from our own Angular rules, as the default worker
+        # from `rules_ts` is incompatible with TS5+ and abandoned. We need
+        # worker for efficient, fast DX and avoiding Windows no-sandbox issues.
+        supports_workers = 1,
+        tsc_worker = "//tools:vanilla_ts_worker",
+        deps = deps,
+        **kwargs
+    )
+
+    if not ignore_strict_deps:
+        strict_deps_test(
+            name = "%s_strict_deps_test" % name,
+            srcs = kwargs.get("srcs", []),
+            deps = deps,
+        )
 
 def npm_package(**kwargs):
     _npm_package(**kwargs)
diff --git a/tools/interop.bzl b/tools/interop.bzl
