Skip to content

Commit 8b68d9f

Browse files
committed
build: migrate @angular-devkit/schematics to ts_project
The `@angular-devkit/schematics` package has been migrated to the `rules_js` ts_project rule. The tsconfig path mappings for the `@angular-devkit` scope have also been cleaned up now that all the packages within this scope have been migrated.
1 parent 0581c45 commit 8b68d9f

File tree

7 files changed

+71
-77
lines changed

7 files changed

+71
-77
lines changed

packages/angular_devkit/schematics/BUILD.bazel

Lines changed: 20 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
22
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
3-
load("//tools:defaults.bzl", "pkg_npm", "ts_library")
3+
load("//tools:defaults.bzl", "pkg_npm")
4+
load("//tools:interop.bzl", "ts_project")
45

56
# Copyright Google Inc. All Rights Reserved.
67
#
@@ -12,52 +13,49 @@ licenses(["notice"])
1213

1314
# @angular-devkit/schematics
1415

15-
ts_library(
16+
ts_project(
1617
name = "schematics",
17-
package_name = "@angular-devkit/schematics",
1818
srcs = glob(
1919
include = ["src/**/*.ts"],
2020
exclude = [
2121
"src/**/*_spec.ts",
2222
],
23-
),
23+
) + ["index.ts"],
2424
data = [
2525
"package.json",
2626
],
27-
module_name = "@angular-devkit/schematics",
28-
module_root = "src/index.d.ts",
29-
deps = [
27+
interop_deps = [
3028
"//packages/angular_devkit/core",
3129
"//packages/angular_devkit/core/node", # TODO: get rid of this for 6.0
32-
"@npm//@types/node",
33-
"@npm//jsonc-parser",
34-
"@npm//magic-string",
35-
"@npm//rxjs",
30+
],
31+
module_name = "@angular-devkit/schematics",
32+
deps = [
33+
"//:root_modules/@types/node",
34+
"//:root_modules/jsonc-parser",
35+
"//:root_modules/magic-string",
36+
"//:root_modules/rxjs",
3637
],
3738
)
3839

39-
# @external_begin
40-
41-
ts_library(
40+
ts_project(
4241
name = "schematics_test_lib",
4342
testonly = True,
4443
srcs = glob(["src/**/*_spec.ts"]),
45-
deps = [
46-
":schematics",
44+
interop_deps = [
4745
"//packages/angular_devkit/core",
4846
"//packages/angular_devkit/core/node",
4947
"//packages/angular_devkit/schematics/testing",
50-
"@npm//rxjs",
48+
],
49+
deps = [
50+
":schematics_rjs",
51+
"//:root_modules/@types/jasmine",
52+
"//:root_modules/rxjs",
5153
],
5254
)
5355

5456
jasmine_node_test(
5557
name = "schematics_test",
56-
srcs = [":schematics_test_lib"],
57-
deps = [
58-
"@npm//jasmine",
59-
"@npm//source-map",
60-
],
58+
deps = [":schematics_test_lib"],
6159
)
6260

6361
genrule(
@@ -96,4 +94,3 @@ api_golden_test_npm_package(
9694
npm_package = "angular_cli/packages/angular_devkit/schematics/npm_package",
9795
types = ["@npm//@types/node"],
9896
)
99-
# @external_end
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.dev/license
7+
*/
8+
9+
export * from './src/index';
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults.bzl", "ts_library")
1+
load("//tools:interop.bzl", "ts_project")
22

33
# Copyright Google Inc. All Rights Reserved.
44
#
@@ -8,7 +8,7 @@ licenses(["notice"])
88

99
package(default_visibility = ["//visibility:public"])
1010

11-
ts_library(
11+
ts_project(
1212
name = "tasks",
1313
srcs = glob(
1414
include = ["**/*.ts"],
@@ -18,15 +18,15 @@ ts_library(
1818
],
1919
),
2020
data = ["package.json"],
21-
module_name = "@angular-devkit/schematics/tasks",
22-
module_root = "index.d.ts",
23-
deps = [
21+
interop_deps = [
2422
"//packages/angular_devkit/core",
2523
"//packages/angular_devkit/core/node",
2624
"//packages/angular_devkit/schematics",
27-
"@npm//@types/node",
28-
"@npm//ora",
29-
"@npm//rxjs",
30-
"@npm//typescript",
25+
],
26+
module_name = "@angular-devkit/schematics/tasks",
27+
deps = [
28+
"//:root_modules/@types/node",
29+
"//:root_modules/ora",
30+
"//:root_modules/rxjs",
3131
],
3232
)
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults.bzl", "ts_library")
1+
load("//tools:interop.bzl", "ts_project")
22

33
# Copyright Google Inc. All Rights Reserved.
44
#
@@ -8,22 +8,23 @@ licenses(["notice"])
88

99
package(default_visibility = ["//visibility:public"])
1010

11-
ts_library(
11+
ts_project(
1212
name = "node",
1313
srcs = glob(
1414
include = ["**/*.ts"],
1515
exclude = [
1616
"**/*_spec.ts",
1717
],
1818
),
19-
module_name = "@angular-devkit/schematics/tasks/node",
20-
module_root = "index.d.ts",
21-
deps = [
19+
interop_deps = [
2220
"//packages/angular_devkit/core",
2321
"//packages/angular_devkit/core/node",
2422
"//packages/angular_devkit/schematics",
2523
"//packages/angular_devkit/schematics/tasks",
26-
"@npm//@types/node",
27-
"@npm//rxjs",
24+
],
25+
module_name = "@angular-devkit/schematics/tasks/node",
26+
deps = [
27+
"//:root_modules/@types/node",
28+
"//:root_modules/rxjs",
2829
],
2930
)
Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("//tools:defaults.bzl", "ts_library")
1+
load("//tools:interop.bzl", "ts_project")
22

33
# Copyright Google Inc. All Rights Reserved.
44
#
@@ -8,21 +8,20 @@ licenses(["notice"])
88

99
package(default_visibility = ["//visibility:public"])
1010

11-
ts_library(
11+
ts_project(
1212
name = "testing",
1313
srcs = glob(
1414
include = ["**/*.ts"],
1515
),
1616
data = ["package.json"],
17-
module_name = "@angular-devkit/schematics/testing",
18-
module_root = "index.d.ts",
19-
deps = [
17+
interop_deps = [
2018
"//packages/angular_devkit/core",
2119
"//packages/angular_devkit/schematics",
22-
"//packages/angular_devkit/schematics/tasks",
2320
"//packages/angular_devkit/schematics/tasks/node",
2421
"//packages/angular_devkit/schematics/tools",
25-
"@npm//@types/node",
26-
"@npm//rxjs",
22+
],
23+
module_name = "@angular-devkit/schematics/testing",
24+
deps = [
25+
"//:root_modules/rxjs",
2726
],
2827
)
Lines changed: 17 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
2-
load("//tools:defaults.bzl", "ts_library")
2+
load("//tools:interop.bzl", "ts_project")
33

44
# Copyright Google Inc. All Rights Reserved.
55
#
@@ -9,7 +9,7 @@ licenses(["notice"])
99

1010
package(default_visibility = ["//visibility:public"])
1111

12-
ts_library(
12+
ts_project(
1313
name = "tools",
1414
srcs = glob(
1515
include = ["**/*.ts"],
@@ -19,23 +19,22 @@ ts_library(
1919
],
2020
),
2121
data = ["package.json"],
22-
module_name = "@angular-devkit/schematics/tools",
23-
module_root = "index.d.ts",
24-
deps = [
22+
interop_deps = [
2523
"//packages/angular_devkit/core",
2624
"//packages/angular_devkit/core/node",
2725
"//packages/angular_devkit/schematics",
2826
"//packages/angular_devkit/schematics/tasks",
2927
"//packages/angular_devkit/schematics/tasks/node",
30-
"@npm//@types/node",
31-
"@npm//jsonc-parser",
32-
"@npm//rxjs",
28+
],
29+
module_name = "@angular-devkit/schematics/tools",
30+
deps = [
31+
"//:root_modules/@types/node",
32+
"//:root_modules/jsonc-parser",
33+
"//:root_modules/rxjs",
3334
],
3435
)
3536

36-
# @external_begin
37-
38-
ts_library(
37+
ts_project(
3938
name = "tools_test_lib",
4039
testonly = True,
4140
srcs = glob(
@@ -44,24 +43,22 @@ ts_library(
4443
"test/**/*.ts",
4544
],
4645
),
47-
deps = [
48-
":tools",
46+
interop_deps = [
4947
"//packages/angular_devkit/core",
5048
"//packages/angular_devkit/core/node",
5149
"//packages/angular_devkit/schematics",
5250
"//packages/angular_devkit/schematics/tasks",
5351
"//packages/angular_devkit/schematics/testing",
5452
"//tests/angular_devkit/schematics/tools/file-system-engine-host:file_system_engine_host_test_lib",
55-
"@npm//rxjs",
53+
],
54+
deps = [
55+
":tools_rjs",
56+
"//:root_modules/@types/jasmine",
57+
"//:root_modules/rxjs",
5658
],
5759
)
5860

5961
jasmine_node_test(
6062
name = "tools_test",
61-
srcs = [":tools_test_lib"],
62-
deps = [
63-
"@npm//jasmine",
64-
"@npm//source-map",
65-
],
63+
deps = [":tools_test_lib"],
6664
)
67-
# @external_end

tsconfig.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,9 @@
1616
"rootDir": ".",
1717
"rootDirs": [".", "./dist-schema/bin/"],
1818
"paths": {
19-
"@angular-devkit/core/node": ["./packages/angular_devkit/core/node/index"],
20-
"@angular-devkit/core/node/testing": ["./packages/angular_devkit/core/node/testing/index"],
21-
"@angular-devkit/schematics/tasks": ["./packages/angular_devkit/schematics/tasks/index"],
22-
"@angular-devkit/schematics/tasks/node": [
23-
"./packages/angular_devkit/schematics/tasks/node/index"
24-
],
25-
"@angular-devkit/schematics/tools": ["./packages/angular_devkit/schematics/tools/index"],
26-
"@angular-devkit/schematics/testing": ["./packages/angular_devkit/schematics/testing/index"],
27-
"@angular-devkit/architect/*": ["./packages/angular_devkit/architect/*/index"],
2819
"@angular-devkit/build-webpack": ["./packages/angular_devkit/build_webpack"],
2920
"@angular-devkit/build-angular": ["./packages/angular_devkit/build_angular"],
30-
"@angular-devkit/*": ["./packages/angular_devkit/*/src"],
21+
"@angular-devkit/*": ["./packages/angular_devkit/*/index"],
3122
"@angular/ssr": ["./packages/angular/ssr"],
3223
"@angular/ssr/node": ["./packages/angular/ssr/node"],
3324
"@angular/*": ["./packages/angular/*/src"],

0 commit comments

Comments
 (0)