From 55a0cae73de8db882324f265b49bc0b7a5f68094 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Fri, 22 Nov 2024 16:09:00 +0000 Subject: [PATCH] build: migrate `angular-devkit/architect` to `ts_project` This commit updates the architect devkit package code to use `ts_project`. We specificially don't migrate the jasmine node test yet as we want to experiment further with the incremental migration. --- packages/angular_devkit/architect/BUILD.bazel | 31 +++++++++++-------- packages/angular_devkit/architect/index.ts | 9 ++++++ .../architect/testing/BUILD.bazel | 15 ++++----- 3 files changed, 35 insertions(+), 20 deletions(-) create mode 100644 packages/angular_devkit/architect/index.ts diff --git a/packages/angular_devkit/architect/BUILD.bazel b/packages/angular_devkit/architect/BUILD.bazel index 0a333cecdba1..8d98fd2bf797 100644 --- a/packages/angular_devkit/architect/BUILD.bazel +++ b/packages/angular_devkit/architect/BUILD.bazel @@ -5,7 +5,8 @@ load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package") 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"]) @@ -39,11 +40,11 @@ ts_json_schema( ) # @external_end -ts_library( +ts_project( name = "architect", - package_name = "@angular-devkit/architect", srcs = glob( include = [ + "index.ts", "src/**/*.ts", "builders/*.ts", ], @@ -63,25 +64,29 @@ ts_library( "node_modules/**", ], ), - module_name = "@angular-devkit/architect", - module_root = "src/index.d.ts", - deps = [ + interop_deps = [ "//packages/angular_devkit/core", "//packages/angular_devkit/core/node", - "@npm//@types/node", - "@npm//rxjs", + ], + module_name = "@angular-devkit/architect", + deps = [ + "//:node_modules/@types/node", + "//:node_modules/rxjs", ], ) -ts_library( +ts_project( name = "architect_test_lib", testonly = True, srcs = glob(["src/**/*_spec.ts"]), - deps = [ - ":architect", - "//packages/angular_devkit/architect/testing", + interop_deps = [ "//packages/angular_devkit/core", - "@npm//rxjs", + ], + deps = [ + ":architect_rjs", + "//:node_modules/@types/jasmine", + "//:node_modules/rxjs", + "//packages/angular_devkit/architect/testing:testing_rjs", ], ) diff --git a/packages/angular_devkit/architect/index.ts b/packages/angular_devkit/architect/index.ts new file mode 100644 index 000000000000..e6da94cc7ded --- /dev/null +++ b/packages/angular_devkit/architect/index.ts @@ -0,0 +1,9 @@ +/** + * @license + * Copyright Google LLC All Rights Reserved. + * + * 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 + */ + +export * from './src/index'; diff --git a/packages/angular_devkit/architect/testing/BUILD.bazel b/packages/angular_devkit/architect/testing/BUILD.bazel index 5f27b1748866..0db0d9eb0333 100644 --- a/packages/angular_devkit/architect/testing/BUILD.bazel +++ b/packages/angular_devkit/architect/testing/BUILD.bazel @@ -3,25 +3,26 @@ # 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:defaults.bzl", "ts_library") +load("//tools:interop.bzl", "ts_project") licenses(["notice"]) package(default_visibility = ["//visibility:public"]) -ts_library( +ts_project( name = "testing", srcs = glob( include = ["**/*.ts"], exclude = ["**/*_spec.ts"], ), - module_name = "@angular-devkit/architect/testing", - module_root = "index.d.ts", - deps = [ + interop_deps = [ "//packages/angular_devkit/architect", "//packages/angular_devkit/core", "//packages/angular_devkit/core/node", - "@npm//@types/node", - "@npm//rxjs", + ], + module_name = "@angular-devkit/architect/testing", + deps = [ + "//:node_modules/@types/node", + "//:node_modules/rxjs", ], )