Skip to content

Commit 3a8bbe9

Browse files
josephperrottthePunderWoman
josephperrott
authored and
thePunderWoman
committed
build: migrate language service to use rules_js (#61578)
Migrate language service to build using ts_project PR Close #61578
1 parent ec60501 commit 3a8bbe9

File tree

12 files changed

+291
-231
lines changed

12 files changed

+291
-231
lines changed

‎packages/core/schematics/utils/tsurge/index.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ export * from './replacement';
1313
export * from './helpers/unique_id';
1414
export * from './helpers/serializable';
1515
export * from './project_paths';
16+
export {groupReplacementsByFile} from './helpers/group_replacements';

‎packages/language-service/BUILD.bazel‎

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

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

5-
ts_library(
6+
ts_config(
7+
name = "tsconfig_build",
8+
src = "tsconfig.json",
9+
deps = [
10+
"//:node_modules/@types/node",
11+
"//packages:tsconfig_build",
12+
],
13+
)
14+
15+
ts_project(
616
name = "api",
717
srcs = [
818
"api.ts",
919
],
1020
deps = [
11-
"@npm//typescript",
21+
"//:node_modules/typescript",
1222
],
1323
)
1424

15-
ts_library(
25+
ts_project(
1626
name = "factory_lib",
1727
srcs = ["plugin-factory.ts"],
1828
deps = [
19-
":api",
20-
"@npm//@types/node",
21-
"@npm//typescript",
29+
":api_rjs",
30+
"//:node_modules/typescript",
2231
],
2332
)
2433

‎packages/language-service/src/BUILD.bazel‎

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

33
package(default_visibility = ["//packages/language-service:__subpackages__"])
44

5-
ts_library(
5+
ts_project(
66
name = "src",
77
srcs = glob([
88
"*.ts",
99
"**/*.ts",
1010
]),
11-
deps = [
11+
interop_deps = [
1212
"//packages/compiler",
1313
"//packages/compiler-cli",
1414
"//packages/compiler-cli/src/ngtsc/core",
@@ -25,11 +25,12 @@ ts_library(
2525
"//packages/compiler-cli/src/ngtsc/typecheck",
2626
"//packages/compiler-cli/src/ngtsc/typecheck/api",
2727
"//packages/compiler-cli/src/ngtsc/util",
28-
"//packages/core/schematics/migrations/signal-migration/src",
29-
"//packages/language-service:api",
30-
"//packages/language-service/src/refactorings",
31-
"//packages/language-service/src/utils",
32-
"@npm//@types/node",
33-
"@npm//typescript",
28+
],
29+
deps = [
30+
"//:node_modules/typescript",
31+
"//packages/core/schematics/migrations/signal-migration/src:src_rjs",
32+
"//packages/language-service:api_rjs",
33+
"//packages/language-service/src/refactorings:refactorings_rjs",
34+
"//packages/language-service/src/utils:utils_rjs",
3435
],
3536
)

‎packages/language-service/src/codefixes/fix_missing_import.ts‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,8 @@
77
*/
88

99
import {ASTWithName, TmplAstElement} from '@angular/compiler';
10-
import {
11-
ErrorCode as NgCompilerErrorCode,
12-
ngErrorCode,
13-
} from '@angular/compiler-cli/src/ngtsc/diagnostics/index';
14-
import {
15-
PotentialDirective,
16-
PotentialImportMode,
17-
PotentialPipe,
18-
} from '@angular/compiler-cli/src/ngtsc/typecheck/api';
10+
import {ErrorCode as NgCompilerErrorCode, ngErrorCode} from '@angular/compiler-cli';
11+
import {PotentialDirective, PotentialPipe} from '@angular/compiler-cli/src/ngtsc/typecheck/api';
1912
import ts from 'typescript';
2013

2114
import {getTargetAtPosition, TargetNodeKind} from '../template_target';

‎packages/language-service/src/refactorings/BUILD.bazel‎

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

33
package(default_visibility = ["//packages/language-service:__subpackages__"])
44

5-
ts_library(
5+
ts_project(
66
name = "refactorings",
77
srcs = glob([
88
"**/*.ts",
99
]),
10-
deps = [
10+
interop_deps = [
1111
"//packages/compiler-cli",
1212
"//packages/compiler-cli/src/ngtsc/annotations",
1313
"//packages/compiler-cli/src/ngtsc/core",
1414
"//packages/compiler-cli/src/ngtsc/file_system",
1515
"//packages/compiler-cli/src/ngtsc/metadata",
1616
"//packages/compiler-cli/src/ngtsc/reflection",
17-
"//packages/core/schematics/migrations/signal-migration/src",
18-
"//packages/core/schematics/migrations/signal-queries-migration:migration",
19-
"//packages/core/schematics/utils/tsurge",
20-
"//packages/language-service:api",
21-
"//packages/language-service/src/utils",
22-
"@npm//@types/node",
23-
"@npm//typescript",
17+
],
18+
deps = [
19+
"//:node_modules/typescript",
20+
"//packages/core/schematics/migrations/signal-migration/src:src_rjs",
21+
"//packages/core/schematics/migrations/signal-queries-migration:migration_rjs",
22+
"//packages/language-service:api_rjs",
23+
"//packages/language-service/src/utils:utils_rjs",
2424
],
2525
)

‎packages/language-service/src/utils/BUILD.bazel‎

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

33
package(default_visibility = ["//packages/language-service:__subpackages__"])
44

5-
ts_library(
5+
ts_project(
66
name = "utils",
77
srcs = glob(["*.ts"]),
8-
deps = [
8+
interop_deps = [
99
"//packages/compiler",
1010
"//packages/compiler-cli/src/ngtsc/annotations",
1111
"//packages/compiler-cli/src/ngtsc/core",
1212
"//packages/compiler-cli/src/ngtsc/file_system",
1313
"//packages/compiler-cli/src/ngtsc/metadata",
1414
"//packages/compiler-cli/src/ngtsc/reflection",
1515
"//packages/compiler-cli/src/ngtsc/typecheck/api",
16-
"@npm//typescript",
16+
],
17+
deps = [
18+
"//:node_modules/typescript",
1719
],
1820
)

‎packages/language-service/test/BUILD.bazel‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ ts_project(
1313
"//packages/compiler-cli/src/ngtsc/file_system/testing",
1414
"//packages/compiler-cli/src/ngtsc/testing",
1515
"//packages/compiler-cli/src/ngtsc/typecheck/api",
16-
"//packages/language-service/src",
17-
"//packages/language-service/src/utils",
18-
"//packages/language-service/testing",
1916
],
2017
deps = [
2118
"//:node_modules/typescript",
19+
"//packages/language-service/src:src_rjs",
20+
"//packages/language-service/src/utils:utils_rjs",
21+
"//packages/language-service/testing:testing_rjs",
2222
],
2323
)
2424

‎packages/language-service/test/legacy/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 = "legacy_lib",
56
testonly = True,
67
srcs = glob(["*.ts"]),
7-
deps = [
8+
interop_deps = [
89
"//packages/compiler",
910
"//packages/compiler-cli/src/ngtsc/core:api",
1011
"//packages/compiler-cli/src/ngtsc/diagnostics",
11-
"//packages/language-service/src",
12-
"//packages/language-service/src/utils",
13-
"@npm//typescript",
12+
],
13+
deps = [
14+
"//:node_modules/typescript",
15+
"//packages/language-service/src:src_rjs",
16+
"//packages/language-service/src/utils:utils_rjs",
1417
],
1518
)
1619

0 commit comments

Comments
 (0)