Skip to content

Commit b478a43

Browse files
josephperrottthePunderWoman
authored andcommitted
build: migrate localize package to use rules_js (angular#61613)
Use ts_project to build localize package PR Close angular#61613
1 parent e9fcbb8 commit b478a43

File tree

20 files changed

+130
-87
lines changed

20 files changed

+130
-87
lines changed

packages/compiler-cli/src/ngtsc/file_system/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,3 +35,4 @@ export {
3535
} from './src/types';
3636
export {getSourceFileOrError} from './src/util';
3737
export {createFileSystemTsReadDirectoryFn} from './src/ts_read_directory';
38+
export {InvalidFileSystem} from './src/invalid_file_system';

packages/localize/BUILD.bazel

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

34
package(default_visibility = ["//visibility:public"])
45

5-
ts_library(
6+
ts_project(
67
name = "localize",
78
srcs = glob(
89
[
@@ -12,8 +13,8 @@ ts_library(
1213
),
1314
module_name = "@angular/localize",
1415
deps = [
15-
"//packages/localize/src/localize",
16-
"//packages/localize/src/utils",
16+
"//packages/localize/src/localize:localize_rjs",
17+
"//packages/localize/src/utils:utils_rjs",
1718
],
1819
)
1920

packages/localize/init/BUILD.bazel

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
load("//tools:defaults.bzl", "ts_library")
21
load("//adev/shared-docs/pipeline/api-gen:generate_api_docs.bzl", "generate_api_docs")
2+
load("//tools:defaults2.bzl", "ts_project")
33

44
package(default_visibility = ["//visibility:public"])
55

66
exports_files(["package.json"])
77

8-
ts_library(
8+
ts_project(
99
name = "init",
1010
srcs = glob(
1111
[
1212
"**/*.ts",
1313
],
1414
),
15-
module_name = "@angular/localize/init",
1615
deps = [
17-
"//packages/localize",
18-
"@npm//@types/node",
16+
"//:node_modules/@types/node",
17+
"//packages/localize:localize_rjs",
1918
],
2019
)
2120

packages/localize/schematics/ng-add/BUILD.bazel

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,19 @@
1-
load("//tools:defaults.bzl", "esbuild", "jasmine_node_test", "ts_config", "ts_library")
1+
load("//tools:defaults.bzl", "esbuild", "jasmine_node_test", "ts_library")
2+
load("//tools:defaults2.bzl", "ts_project")
23

34
package(default_visibility = ["//visibility:public"])
45

5-
ts_config(
6-
name = "tsconfig",
7-
src = "tsconfig-build.json",
8-
deps = ["//packages:tsconfig-build.json"],
9-
)
10-
11-
ts_library(
6+
ts_project(
127
name = "ng-add",
138
srcs = [
149
"index.ts",
1510
"schema.d.ts",
1611
],
17-
tsconfig = ":tsconfig",
12+
extends = "//packages:tsconfig_build",
13+
tsconfig = "tsconfig-build.json",
1814
deps = [
19-
"@npm//@angular-devkit/schematics",
20-
"@npm//@schematics/angular",
15+
"//:node_modules/@angular-devkit/schematics",
16+
"//:node_modules/@schematics/angular",
2117
],
2218
)
2319

packages/localize/src/localize/BUILD.bazel

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

34
package(default_visibility = ["//visibility:public"])
45

5-
ts_library(
6+
ts_project(
67
name = "localize",
78
srcs = glob(
89
[
910
"**/*.ts",
1011
],
1112
),
1213
deps = [
13-
"//packages/localize/src/utils",
14-
"@npm//@types/node",
14+
"//:node_modules/@types/node",
15+
"//packages/localize/src/utils:utils_rjs",
1516
],
1617
)
1718

packages/localize/src/localize/test/BUILD.bazel

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

3-
ts_library(
4+
ts_project(
45
name = "test_lib",
56
testonly = True,
67
srcs = glob(
78
["*_spec.ts"],
89
),
9-
deps = [
10+
interop_deps = [
1011
"//packages:types",
11-
"//packages/localize/src/localize",
12+
],
13+
deps = [
14+
"//packages/localize/src/localize:localize_rjs",
1215
],
1316
)
1417

packages/localize/src/utils/BUILD.bazel

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

33
package(default_visibility = ["//visibility:public"])
44

5-
ts_library(
5+
ts_project(
66
name = "utils",
77
srcs = glob(
88
[
99
"*.ts",
1010
"src/**/*.ts",
1111
],
1212
),
13-
deps = [
13+
interop_deps = [
1414
"//packages/compiler",
1515
],
1616
)

packages/localize/src/utils/test/BUILD.bazel

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

3-
ts_library(
4+
ts_project(
45
name = "test_lib",
56
testonly = True,
67
srcs = glob(
78
["**/*_spec.ts"],
89
),
9-
deps = [
10+
interop_deps = [
1011
"//packages:types",
11-
"//packages/localize/src/utils",
12+
],
13+
deps = [
14+
"//packages/localize/src/utils:utils_rjs",
1215
],
1316
)
1417

packages/localize/test/BUILD.bazel

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

3-
ts_library(
4+
ts_project(
45
name = "test_lib",
56
testonly = True,
67
srcs = glob(
78
["**/*_spec.ts"],
89
),
9-
deps = [
10+
interop_deps = [
1011
"//packages:types",
11-
"//packages/localize",
12-
"//packages/localize/init",
13-
"//packages/localize/src/utils",
12+
],
13+
deps = [
14+
"//packages/localize:localize_rjs",
15+
"//packages/localize/init:init_rjs",
16+
"//packages/localize/src/utils:utils_rjs",
1417
],
1518
)
1619

packages/localize/tools/BUILD.bazel

Lines changed: 22 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,35 @@
11
load("@npm//@bazel/esbuild:index.bzl", "esbuild", "esbuild_config")
2-
load("//tools:defaults.bzl", "extract_types", "pkg_npm", "ts_library")
2+
load("//tools:defaults.bzl", "extract_types", "pkg_npm")
3+
load("//tools:defaults2.bzl", "ts_config", "ts_project")
34

4-
ts_library(
5+
ts_config(
6+
name = "tsconfig_build",
7+
src = "tsconfig.json",
8+
deps = [
9+
"//:node_modules/@types/node",
10+
"//packages:tsconfig_build",
11+
],
12+
)
13+
14+
ts_project(
515
name = "tools",
616
srcs = glob(
717
[
818
"**/*.ts",
919
],
1020
),
11-
visibility = ["//packages/localize/tools:__subpackages__"],
12-
deps = [
21+
interop_deps = [
1322
"//packages/compiler",
1423
"//packages/compiler-cli/private",
15-
"//packages/localize",
16-
"@npm//@babel/core",
17-
"@npm//@types/babel__core",
18-
"@npm//@types/node",
19-
"@npm//@types/yargs",
20-
"@npm//tinyglobby",
24+
],
25+
visibility = ["//packages/localize/tools:__subpackages__"],
26+
deps = [
27+
"//:node_modules/@babel/core",
28+
"//:node_modules/@types/babel__core",
29+
"//:node_modules/@types/node",
30+
"//:node_modules/@types/yargs",
31+
"//:node_modules/tinyglobby",
32+
"//packages/localize:localize_rjs",
2133
],
2234
)
2335

0 commit comments

Comments
 (0)