build: migrate @schematics/angular to ts_project

The `@schematics/angular` package has been migrated to the `rules_js` ts_project rule.
angular · Dec 23, 2024 · d4a4bc8 · d4a4bc8
1 parent 2888673
commit d4a4bc8
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 30 deletions.
diff --git a/packages/schematics/angular/BUILD.bazel b/packages/schematics/angular/BUILD.bazel
@@ -4,7 +4,8 @@
 # found in the LICENSE file at https://angular.dev/license
 
 load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
-load("//tools:defaults.bzl", "pkg_npm", "ts_library")
+load("//tools:defaults.bzl", "pkg_npm")
+load("//tools:interop.bzl", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
 
 licenses(["notice"])
@@ -35,9 +36,8 @@ ALL_SCHEMA_TARGETS = [
     for (src, name) in ALL_SCHEMA_TARGETS
 ]
 
-ts_library(
+ts_project(
     name = "angular",
-    package_name = "@schematics/angular",
     srcs = glob(
         include = ["**/*.ts"],
         exclude = [
@@ -78,16 +78,18 @@ ts_library(
             "node_modules/**",
         ],
     ),
-    module_name = "@schematics/angular",
-    deps = [
-        "//packages/angular_devkit/core",
+    interop_deps = [
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics/tasks",
-        "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
-        "@npm//@inquirer/prompts",
-        "@npm//@types/node",
-        "@npm//browserslist",
-        "@npm//jsonc-parser",
+    ],
+    module_name = "@schematics/angular",
+    deps = [
+        "//:root_modules/@inquirer/prompts",
+        "//:root_modules/@types/node",
+        "//:root_modules/browserslist",
+        "//:root_modules/jsonc-parser",
+        "//packages/angular_devkit/core:core_rjs",
+        "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript:TypeScript_rjs",
     ],
 )
 
@@ -96,11 +98,11 @@ jasmine_node_test(
     srcs = ["no_typescript_runtime_dep_spec.js"],
     deps = [
         ":angular",
-        "@npm//jasmine",
+        "//:root_modules/@types/jasmine",
     ],
 )
 
-ts_library(
+ts_project(
     name = "angular_test_lib",
     testonly = True,
     srcs = glob(
@@ -113,28 +115,24 @@ ts_library(
             "node_modules/**",
         ],
     ),
-    # @external_begin
-    deps = [
-        ":angular",
-        "//packages/angular_devkit/core",
-        "//packages/angular_devkit/core/node/testing",
+    interop_deps = [
         "//packages/angular_devkit/schematics",
         "//packages/angular_devkit/schematics/tasks",
         "//packages/angular_devkit/schematics/testing",
-        "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
-        "@npm//jsonc-parser",
     ],
-    # @external_end
+    deps = [
+        ":angular_rjs",
+        "//:root_modules/@types/jasmine",
+        "//:root_modules/jsonc-parser",
+        "//packages/angular_devkit/core:core_rjs",
+        "//packages/angular_devkit/core/node/testing:testing_rjs",
+        "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript:TypeScript_rjs",
+    ],
 )
 
 jasmine_node_test(
     name = "angular_test",
     srcs = [":angular_test_lib"],
-    deps = [
-        "//packages/schematics/angular/third_party/github.com/Microsoft/TypeScript",
-        "@npm//jasmine",
-        "@npm//source-map",
-    ],
 )
 
 genrule(

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:defaults.bzl", "ts_library")
+load("//tools:interop.bzl", "ts_project")
 
 # files fetched on 2024-11-28 from
 # https://github.com/microsoft/TypeScript/releases/tag/v5.7.2
@@ -9,13 +9,14 @@ load("//tools:defaults.bzl", "ts_library")
 
 licenses(["notice"])  # Apache 2.0
 
+package(default_visibility = ["//packages/schematics/angular:__subpackages__"])
+
 exports_files([
     "LICENSE",
 ])
 
-ts_library(
+ts_project(
     name = "TypeScript",
     srcs = ["lib/typescript.d.ts"],
     data = ["lib/typescript.js"],
-    visibility = ["//packages/schematics/angular:__subpackages__"],
 )
diff --git a/tsconfig.json b/tsconfig.json
@@ -32,7 +32,8 @@
       "@angular/*": ["./packages/angular/*/src"],
       "@angular/build/private": ["./packages/angular/build/src/private"],
       "@ngtools/webpack": ["./packages/ngtools/webpack/index"],
-      "@schematics/angular": ["./packages/schematics/angular"]
+      "@schematics/angular": ["./packages/schematics/angular"],
+      "@schematics/angular/utility": ["./packages/schematics/angular/utility/index"]
     }
   },
   "exclude": [