Skip to content

Commit f3f0769

Browse files
devversionalxhub
authored andcommitted
refactor: update packages/core:{core,src} to ts_project (#61336)
Updates `packages/core:core` and `packages/core/src/...` to `ts_project` of `rules_js`. PR Close #61336
1 parent 0d025c5 commit f3f0769

File tree

21 files changed

+93
-46
lines changed

21 files changed

+93
-46
lines changed

packages/BUILD.bazel

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
22
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
33
load("//:packages.bzl", "DOCS_ENTRYPOINTS")
4-
load("//tools:defaults.bzl", "ts_config", "ts_library")
4+
load("//tools:defaults.bzl", "ts_config")
5+
load("//tools:defaults2.bzl", "ts_project")
56

67
package(default_visibility = ["//visibility:public"])
78

@@ -15,12 +16,23 @@ copy_to_bin(
1516
srcs = ["package.json"],
1617
)
1718

18-
ts_library(
19+
ts_project(
20+
name = "goog_types",
21+
srcs = ["goog.d.ts"],
22+
)
23+
24+
ts_project(
1925
name = "types",
20-
srcs = glob(["*.ts"]),
21-
deps = [
26+
srcs = glob(
27+
["*.ts"],
28+
exclude = ["goog.d.ts"],
29+
),
30+
interop_deps = [
2231
"//packages/zone.js/lib:zone_d_ts",
23-
"@npm//@types/hammerjs",
32+
],
33+
deps = [
34+
":goog_types_rjs",
35+
"//:node_modules/@types/hammerjs",
2436
],
2537
)
2638

packages/bazel/test/ngc-wrapped/BUILD.bazel

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ ts_library(
2121
# .d.ts files (by default, jasmine_node_test would get the .js files).
2222
filegroup(
2323
name = "angular_core",
24-
srcs = ["//packages/core"],
24+
srcs = ["//packages/core:core_rjs"],
25+
output_group = "types",
2526
)
2627

2728
jasmine_node_test(

packages/core/BUILD.bazel

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
load("@build_bazel_rules_nodejs//:index.bzl", "generated_file_test")
22
load("//adev/shared-docs/pipeline/api-gen:generate_api_docs.bzl", "generate_api_docs")
33
load("//packages/common/locales:index.bzl", "generate_base_locale_file")
4-
load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_module", "ng_package", "tsec_test")
4+
load("//tools:defaults.bzl", "api_golden_test", "api_golden_test_npm_package", "ng_package", "tsec_test")
5+
load("//tools:defaults2.bzl", "ng_project")
56

67
package(default_visibility = ["//visibility:public"])
78

@@ -20,27 +21,29 @@ generated_file_test(
2021
generated = ":base_locale_file_generated",
2122
)
2223

23-
ng_module(
24+
ng_project(
2425
name = "core",
2526
srcs = glob(
2627
[
2728
"*.ts",
2829
"src/**/*.ts",
2930
],
3031
),
31-
deps = [
32-
"//packages:types",
32+
interop_deps = [
3333
"//packages/core/primitives/di",
3434
"//packages/core/primitives/dom-navigation",
3535
"//packages/core/primitives/event-dispatch",
36-
"//packages/core/primitives/signals",
37-
"//packages/core/src/compiler",
38-
"//packages/core/src/di/interface",
39-
"//packages/core/src/interface",
40-
"//packages/core/src/reflection",
41-
"//packages/core/src/util",
4236
"//packages/zone.js/lib:zone_d_ts",
43-
"@npm//rxjs",
37+
],
38+
deps = [
39+
"//:node_modules/rxjs",
40+
"//packages:goog_types_rjs",
41+
"//packages/core/primitives/signals:signals_rjs",
42+
"//packages/core/src/compiler:compiler_rjs",
43+
"//packages/core/src/di/interface:interface_rjs",
44+
"//packages/core/src/interface:interface_rjs",
45+
"//packages/core/src/reflection:reflection_rjs",
46+
"//packages/core/src/util:util_rjs",
4447
],
4548
)
4649

packages/core/index.ts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,9 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
/* This file is not used to build this module. It is only used during editing
10-
* by the TypeScript language service and during build for verification. `ngc`
11-
* replaces this file with production index.ts when it rewrites private symbol
12-
* names.
13-
*/
9+
// Note: This is needed so that dependent compilations relying on inferred types properly
10+
// emit module names instead of relative imports. Previously, Bazel auto-inserted this.
11+
// TODO: Consider removing this and enforcing proper explicit types.
12+
/// <amd-module name="@angular/core" />
1413

1514
export * from './public_api';

packages/core/primitives/signals/BUILD.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//tools:defaults.bzl", "ts_library", "tsec_test")
1+
load("//tools:defaults.bzl", "tsec_test")
2+
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = [
45
"//packages:__pkg__",
@@ -7,7 +8,7 @@ package(default_visibility = [
78
"//tools/public_api_guard:__pkg__",
89
])
910

10-
ts_library(
11+
ts_project(
1112
name = "signals",
1213
srcs = glob(
1314
[

packages/core/src/compiler/BUILD.bazel

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//tools:defaults.bzl", "ts_library", "tsec_test")
1+
load("//tools:defaults.bzl", "tsec_test")
2+
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = [
45
"//packages:__pkg__",
@@ -7,15 +8,15 @@ package(default_visibility = [
78
"//tools/public_api_guard:__pkg__",
89
])
910

10-
ts_library(
11+
ts_project(
1112
name = "compiler",
1213
srcs = glob(
1314
[
1415
"**/*.ts",
1516
],
1617
),
1718
deps = [
18-
"//packages/core/src/util",
19+
"//packages/core/src/util:util_rjs",
1920
],
2021
)
2122

packages/core/src/di/interface/BUILD.bazel

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
load("//tools:defaults.bzl", "ts_library", "tsec_test")
1+
load("//tools:defaults.bzl", "tsec_test")
2+
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = [
45
"//devtools:__subpackages__",
@@ -7,17 +8,17 @@ package(default_visibility = [
78
"//tools/public_api_guard:__pkg__",
89
])
910

10-
ts_library(
11+
ts_project(
1112
name = "interface",
1213
srcs = glob(
1314
[
1415
"**/*.ts",
1516
],
1617
),
1718
deps = [
18-
"//packages/core/src/interface",
19-
"//packages/core/src/util",
20-
"@npm//rxjs",
19+
"//:node_modules/rxjs",
20+
"//packages/core/src/interface:interface_rjs",
21+
"//packages/core/src/util:util_rjs",
2122
],
2223
)
2324

packages/core/src/i18n/tokens.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9+
/// <reference path="../../../goog.d.ts" />
10+
911
import {InjectionToken} from '../di/injection_token';
1012
import {inject} from '../di/injector_compatibility';
1113
import {InjectFlags} from '../di/interface/injector';

packages/core/src/interface/BUILD.bazel

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
load("//tools:defaults.bzl", "ts_library", "tsec_test")
1+
load("//tools:defaults.bzl", "tsec_test")
2+
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = [
45
"//packages:__pkg__",
56
"//packages/core:__subpackages__",
67
"//tools/public_api_guard:__pkg__",
78
])
89

9-
ts_library(
10+
ts_project(
1011
name = "interface",
1112
srcs = glob(
1213
[

packages/core/src/reflection/BUILD.bazel

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,22 @@
1-
load("//tools:defaults.bzl", "ts_library", "tsec_test")
1+
load("//tools:defaults.bzl", "tsec_test")
2+
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = [
45
"//packages:__pkg__",
56
"//packages/core:__subpackages__",
67
"//tools/public_api_guard:__pkg__",
78
])
89

9-
ts_library(
10+
ts_project(
1011
name = "reflection",
1112
srcs = glob(
1213
[
1314
"**/*.ts",
1415
],
1516
),
1617
deps = [
17-
"//packages/core/src/interface",
18-
"//packages/core/src/util",
18+
"//packages/core/src/interface:interface_rjs",
19+
"//packages/core/src/util:util_rjs",
1920
],
2021
)
2122

0 commit comments

Comments
 (0)