Skip to content

Commit dc83b88

Browse files
devversionclydin
authored andcommitted
build: migrate angular_devkit/core to ts_project
Migrates `@angular-devkit/core` to `ts_project`. (cherry picked from commit dfe9c6a)
1 parent bb2e7b5 commit dc83b88

File tree

4 files changed

+44
-36
lines changed

4 files changed

+44
-36
lines changed

packages/angular_devkit/core/BUILD.bazel

Lines changed: 17 additions & 17 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,15 +13,14 @@ licenses(["notice"])
1213

1314
# @angular-devkit/core
1415

15-
ts_library(
16+
ts_project(
1617
name = "core",
17-
package_name = "@angular-devkit/core",
1818
srcs = glob(
1919
include = ["src/**/*.ts"],
2020
exclude = [
2121
"src/**/*_spec.ts",
2222
],
23-
),
23+
) + ["index.ts"],
2424
data = glob(
2525
include = ["**/*.json"],
2626
# NB: we need to exclude the nested node_modules that is laid out by yarn workspaces
@@ -30,16 +30,16 @@ ts_library(
3030
],
3131
),
3232
module_name = "@angular-devkit/core",
33-
module_root = "src/index.d.ts",
3433
deps = [
35-
"@npm//@types/node",
36-
"@npm//@types/picomatch",
37-
"@npm//ajv",
38-
"@npm//ajv-formats",
39-
"@npm//jsonc-parser",
40-
"@npm//picomatch",
41-
"@npm//rxjs",
42-
"@npm//source-map",
34+
"//:root_modules/@types/node",
35+
"//:root_modules/@types/picomatch",
36+
"//:root_modules/@types/jasmine",
37+
"//:root_modules/ajv",
38+
"//:root_modules/ajv-formats",
39+
"//:root_modules/jsonc-parser",
40+
"//:root_modules/picomatch",
41+
"//:root_modules/rxjs",
42+
"//:root_modules/source-map",
4343
# @node_module: typescript:es2015.proxy
4444
# @node_module: typescript:es2015.reflect
4545
# @node_module: typescript:es2015.symbol.wellknown
@@ -49,15 +49,15 @@ ts_library(
4949

5050
# @external_begin
5151

52-
ts_library(
52+
ts_project(
5353
name = "core_test_lib",
5454
testonly = True,
5555
srcs = glob(["src/**/*_spec.ts"]),
5656
data = glob(["src/workspace/json/test/**/*.json"]),
5757
deps = [
58-
":core",
59-
"//packages/angular_devkit/core/node",
60-
"@npm//rxjs",
58+
":core_rjs",
59+
"//:root_modules/rxjs",
60+
"//packages/angular_devkit/core/node:node_rjs",
6161
],
6262
)
6363

packages/angular_devkit/core/index.ts

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';

packages/angular_devkit/core/node/BUILD.bazel

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
# found in the LICENSE file at https://angular.dev/license
55

66
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
7-
load("//tools:defaults.bzl", "ts_library")
7+
load("//tools:interop.bzl", "ts_project")
88

99
licenses(["notice"])
1010

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

13-
ts_library(
13+
ts_project(
1414
name = "node",
1515
srcs = glob(
1616
include = ["**/*.ts"],
@@ -20,18 +20,17 @@ ts_library(
2020
],
2121
),
2222
module_name = "@angular-devkit/core/node",
23-
module_root = "index.d.ts",
2423
deps = [
25-
"//packages/angular_devkit/core",
26-
"@npm//@types/node",
27-
"@npm//chokidar",
28-
"@npm//rxjs",
24+
"//:root_modules/@types/node",
25+
"//:root_modules/chokidar",
26+
"//:root_modules/rxjs",
27+
"//packages/angular_devkit/core:core_rjs",
2928
],
3029
)
3130

3231
# @external_begin
3332

34-
ts_library(
33+
ts_project(
3534
name = "node_test_lib",
3635
testonly = True,
3736
srcs = glob(
@@ -43,9 +42,10 @@ ts_library(
4342
],
4443
),
4544
deps = [
46-
":node",
47-
"//packages/angular_devkit/core",
48-
"@npm//rxjs",
45+
":node_rjs",
46+
"//:root_modules/@types/jasmine",
47+
"//:root_modules/rxjs",
48+
"//packages/angular_devkit/core:core_rjs",
4949
],
5050
)
5151

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,7 +8,7 @@ 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"],
@@ -17,12 +17,11 @@ ts_library(
1717
],
1818
),
1919
module_name = "@angular-devkit/core/node/testing",
20-
module_root = "index.d.ts",
2120
deps = [
22-
"//packages/angular_devkit/core",
23-
"//packages/angular_devkit/core/node",
24-
"@npm//@types/jasmine",
25-
"@npm//@types/node",
26-
"@npm//rxjs",
21+
"//:root_modules/@types/jasmine",
22+
"//:root_modules/@types/node",
23+
"//:root_modules/rxjs",
24+
"//packages/angular_devkit/core:core_rjs",
25+
"//packages/angular_devkit/core/node:node_rjs",
2726
],
2827
)

0 commit comments

Comments
 (0)