Skip to content

Commit 31efc4b

Browse files
josephperrottalxhub
josephperrott
authored and
alxhub
committed
build: migrate devtools to use ng-project (angular#61317)
Migrate devtools to use ng-project PR Close angular#61317
1 parent 4db2166 commit 31efc4b

File tree

51 files changed

+468
-393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+468
-393
lines changed

‎devtools/projects/demo-no-zone/src/BUILD.bazel

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web")
2-
load("//devtools/tools:ng_module.bzl", "ng_module")
2+
load("//devtools/tools:ng_project.bzl", "ng_project")
33
load("//tools:defaults.bzl", "esbuild", "http_server")
44

55
package(default_visibility = ["//:__subpackages__"])
66

7-
ng_module(
7+
ng_project(
88
name = "src",
99
srcs = ["main.ts"],
10-
deps = [
11-
"//devtools/projects/demo-no-zone/src/app",
10+
interop_deps = [
1211
"//packages/common",
1312
"//packages/core",
1413
"//packages/platform-browser",
15-
"@npm//@types",
16-
"@npm//rxjs",
14+
],
15+
deps = [
16+
"//:node_modules/rxjs",
17+
"//devtools/projects/demo-no-zone/src/app:app_rjs",
1718
],
1819
)
1920

‎devtools/projects/demo-no-zone/src/app/BUILD.bazel

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
load("//devtools/tools:ng_module.bzl", "ng_module")
1+
load("//devtools/tools:ng_project.bzl", "ng_project")
22

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

5-
ng_module(
5+
ng_project(
66
name = "app",
77
srcs = glob(
88
include = ["*.ts"],
99
),
1010
angular_assets = ["app.component.html"],
11-
deps = [
11+
interop_deps = [
1212
"//packages/common",
1313
"//packages/core",
1414
"//packages/platform-browser",
15-
"@npm//rxjs",
15+
],
16+
deps = [
17+
"//:node_modules/rxjs",
1618
],
1719
)

‎devtools/projects/demo-standalone/src/BUILD.bazel

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")
22
load("@build_bazel_rules_nodejs//:index.bzl", "pkg_web")
33
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary")
4-
load("//devtools/tools:ng_module.bzl", "ng_module")
4+
load("//devtools/tools:ng_project.bzl", "ng_project")
55
load("//devtools/tools/esbuild:index.bzl", "LINKER_PROCESSED_FW_PACKAGES")
66
load("//tools:defaults.bzl", "esbuild", "http_server")
77

@@ -38,20 +38,21 @@ copy_to_directory(
3838
},
3939
)
4040

41-
ng_module(
41+
ng_project(
4242
name = "demo",
4343
srcs = ["main.ts"],
44-
deps = [
45-
"//devtools/projects/demo-standalone/src/app",
44+
interop_deps = [
4645
"//devtools/src:demo_application_environment",
4746
"//devtools/src:demo_application_operations",
4847
"//packages/common",
4948
"//packages/common/http",
5049
"//packages/core",
5150
"//packages/core/src/util",
5251
"//packages/platform-browser",
53-
"@npm//@types",
54-
"@npm//rxjs",
52+
],
53+
deps = [
54+
"//:node_modules/rxjs",
55+
"//devtools/projects/demo-standalone/src/app:app_rjs",
5556
],
5657
)
5758

‎devtools/projects/demo-standalone/src/app/BUILD.bazel

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
1-
load("//devtools/tools:ng_module.bzl", "ng_module")
1+
load("//devtools/tools:ng_project.bzl", "ng_project")
22

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

5-
ng_module(
5+
ng_project(
66
name = "app",
77
srcs = [
88
"app.component.ts",
99
],
10-
deps = [
11-
"//devtools/projects/demo-standalone/src/app/demo-app",
12-
"//devtools/projects/demo-standalone/src/app/devtools-app",
13-
"//devtools/projects/ng-devtools",
10+
interop_deps = [
1411
"//packages/core",
1512
"//packages/platform-browser",
1613
"//packages/platform-browser/animations",
1714
"//packages/router",
1815
],
16+
deps = [
17+
"//devtools/projects/demo-standalone/src/app/demo-app:demo-app_rjs",
18+
"//devtools/projects/demo-standalone/src/app/devtools-app:devtools-app_rjs",
19+
"//devtools/projects/ng-devtools:ng-devtools_rjs",
20+
],
1921
)

‎devtools/projects/demo-standalone/src/app/demo-app/BUILD.bazel

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//devtools/tools:ng_module.bzl", "ng_module")
21
load("@io_bazel_rules_sass//:defs.bzl", "sass_binary", "sass_library")
2+
load("//devtools/tools:ng_project.bzl", "ng_project")
33

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

@@ -19,7 +19,7 @@ sass_binary(
1919
],
2020
)
2121

22-
ng_module(
22+
ng_project(
2323
name = "demo-app",
2424
srcs = [
2525
"demo-app.component.ts",
@@ -30,12 +30,14 @@ ng_module(
3030
"demo-app.component.html",
3131
":demo_app_component_styles",
3232
],
33-
deps = [
34-
"//devtools/projects/demo-standalone/src/app/demo-app/todo",
35-
"//devtools/projects/ng-devtools-backend",
36-
"//devtools/src:zone-unaware-iframe_message_bus",
33+
interop_deps = [
3734
"//packages/core",
3835
"//packages/elements",
3936
"//packages/router",
4037
],
38+
deps = [
39+
"//devtools/projects/demo-standalone/src/app/demo-app/todo:todo_rjs",
40+
"//devtools/projects/ng-devtools-backend:ng-devtools-backend_rjs",
41+
"//devtools/src:zone-unaware-iframe_message_bus_rjs",
42+
],
4143
)

‎devtools/projects/demo-standalone/src/app/demo-app/todo/BUILD.bazel

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
1-
load("//devtools/tools:ng_module.bzl", "ng_module")
1+
load("//devtools/tools:ng_project.bzl", "ng_project")
22

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

5-
ng_module(
5+
ng_project(
66
name = "todo",
77
srcs = [
88
"dialog.component.ts",
99
"todo-app.component.ts",
1010
],
11-
deps = [
12-
"//devtools/projects/demo-standalone/src/app/demo-app/todo/about",
13-
"//devtools/projects/demo-standalone/src/app/demo-app/todo/home",
11+
interop_deps = [
1412
"//packages/common",
1513
"//packages/core",
1614
"//packages/forms",
1715
"//packages/router",
18-
"@npm//@angular/material",
16+
],
17+
deps = [
18+
"//:node_modules/@angular/material",
19+
"//devtools/projects/demo-standalone/src/app/demo-app/todo/about:about_rjs",
20+
"//devtools/projects/demo-standalone/src/app/demo-app/todo/home:home_rjs",
1921
],
2022
)

‎devtools/projects/demo-standalone/src/app/demo-app/todo/about/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
load("//devtools/tools:ng_module.bzl", "ng_module")
1+
load("//devtools/tools:ng_project.bzl", "ng_project")
22

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

5-
ng_module(
5+
ng_project(
66
name = "about",
77
srcs = ["about.component.ts"],
8-
deps = [
8+
interop_deps = [
99
"//packages/core",
1010
"//packages/router",
1111
],

‎devtools/projects/demo-standalone/src/app/demo-app/todo/home/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
load("//devtools/tools:ng_module.bzl", "ng_module")
1+
load("//devtools/tools:ng_project.bzl", "ng_project")
22

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

5-
ng_module(
5+
ng_project(
66
name = "home",
77
srcs = [
88
"sample.pipe.ts",
99
"todo.component.ts",
1010
"todos.component.ts",
1111
"tooltip.directive.ts",
1212
],
13-
deps = [
13+
interop_deps = [
1414
"//packages/common",
1515
"//packages/core",
1616
"//packages/router",

‎devtools/projects/demo-standalone/src/app/devtools-app/BUILD.bazel

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,19 @@
1-
load("//devtools/tools:ng_module.bzl", "ng_module")
1+
load("//devtools/tools:ng_project.bzl", "ng_project")
22

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

5-
ng_module(
5+
ng_project(
66
name = "devtools-app",
77
srcs = ["devtools-app.component.ts"],
8-
deps = [
9-
"//devtools/projects/ng-devtools",
10-
"//devtools/projects/ng-devtools/src/lib/application-services:frame_manager",
11-
"//devtools/projects/protocol",
12-
"//devtools/src:iframe_message_bus",
8+
interop_deps = [
139
"//packages/common",
1410
"//packages/core",
1511
"//packages/router",
1612
],
13+
deps = [
14+
"//devtools/projects/ng-devtools:ng-devtools_rjs",
15+
"//devtools/projects/ng-devtools/src/lib/application-services:frame_manager_rjs",
16+
"//devtools/projects/protocol:protocol_rjs",
17+
"//devtools/src:iframe_message_bus_rjs",
18+
],
1719
)

‎devtools/projects/ng-devtools-backend/src/lib/ng-debug-api/BUILD.bazel

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
2-
load("//devtools/tools:ng_module.bzl", "ng_module")
2+
load("//devtools/tools:ng_project.bzl", "ng_project")
33
load("//devtools/tools:typescript.bzl", "ts_test_library")
44

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

7-
ng_module(
7+
ng_project(
88
name = "ng-debug-api",
99
srcs = glob(
1010
include = ["*.ts"],
1111
exclude = ["*.spec.ts"],
1212
),
13-
deps = [
14-
"//devtools/projects/ng-devtools-backend/src/lib/component-tree:core-enums",
15-
"//devtools/projects/ng-devtools-backend/src/lib/component-tree:get-roots",
16-
"//devtools/projects/protocol",
13+
interop_deps = [
1714
"//packages/core",
1815
],
16+
deps = [
17+
"//devtools/projects/ng-devtools-backend/src/lib/component-tree:core-enums_rjs",
18+
"//devtools/projects/ng-devtools-backend/src/lib/component-tree:get-roots_rjs",
19+
"//devtools/projects/protocol:protocol_rjs",
20+
],
1921
)
2022

2123
ts_test_library(

‎devtools/projects/ng-devtools-backend/src/lib/state-serializer/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
load("//devtools/tools:defaults.bzl", "karma_web_test_suite")
2-
load("//devtools/tools:ng_module.bzl", "ng_module")
2+
load("//devtools/tools:ng_project.bzl", "ng_project")
33
load("//devtools/tools:typescript.bzl", "ts_test_library")
44

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

7-
ng_module(
7+
ng_project(
88
name = "state-serializer",
99
srcs = glob(
1010
include = ["*.ts"],
1111
exclude = ["*.spec.ts"],
1212
),
1313
deps = [
14-
"//devtools/projects/ng-devtools-backend/src/lib/directive-forest",
15-
"//devtools/projects/protocol",
14+
"//devtools/projects/ng-devtools-backend/src/lib/directive-forest:directive-forest_rjs",
15+
"//devtools/projects/protocol:protocol_rjs",
1616
],
1717
)
1818

‎devtools/projects/ng-devtools/BUILD.bazel

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,28 @@
1-
load("//devtools/tools:ng_module.bzl", "ng_module")
1+
load("//devtools/tools:ng_project.bzl", "ng_project")
22

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

55
exports_files(["tsconfig.lib.json"])
66

7-
ng_module(
7+
ng_project(
88
name = "ng-devtools",
99
srcs = ["index.ts"],
10-
deps = [
11-
"//devtools/projects/ng-devtools/src",
12-
"//devtools/projects/protocol",
10+
interop_deps = [
1311
"//packages/animations",
1412
"//packages/common",
1513
"//packages/core",
1614
"//packages/forms",
17-
"@npm//@angular/cdk",
18-
"@npm//@angular/material",
19-
"@npm//@types",
20-
"@npm//d3",
21-
"@npm//memo-decorator",
22-
"@npm//ngx-flamegraph",
23-
"@npm//rxjs",
24-
"@npm//webtreemap",
15+
],
16+
deps = [
17+
"//:node_modules/@angular/cdk",
18+
"//:node_modules/@angular/material",
19+
"//:node_modules/@types/d3",
20+
"//:node_modules/d3",
21+
"//:node_modules/memo-decorator",
22+
"//:node_modules/ngx-flamegraph",
23+
"//:node_modules/rxjs",
24+
"//:node_modules/webtreemap",
25+
"//devtools/projects/ng-devtools/src:src_rjs",
26+
"//devtools/projects/protocol:protocol_rjs",
2527
],
2628
)

‎devtools/projects/ng-devtools/src/BUILD.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
load("//devtools/tools:ng_module.bzl", "ng_module")
1+
load("//devtools/tools:ng_project.bzl", "ng_project")
22

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

5-
ng_module(
5+
ng_project(
66
name = "src",
77
srcs = ["public-api.ts"],
88
deps = [
9-
"//devtools/projects/ng-devtools/src/lib",
10-
"//devtools/projects/ng-devtools/src/lib/application-environment",
11-
"//devtools/projects/ng-devtools/src/lib/application-operations",
9+
"//devtools/projects/ng-devtools/src/lib:lib_rjs",
10+
"//devtools/projects/ng-devtools/src/lib/application-environment:application-environment_rjs",
11+
"//devtools/projects/ng-devtools/src/lib/application-operations:application-operations_rjs",
1212
],
1313
)

0 commit comments

Comments
 (0)