Skip to content

Commit 47660b7

Browse files
josephperrottthePunderWoman
josephperrott
authored and
thePunderWoman
committed
build: migrate examples to use rules_js (angular#61650)
Migrate examples to use ng_project and ts_project for building PR Close angular#61650
1 parent 04656d0 commit 47660b7

File tree

24 files changed

+259
-131
lines changed

24 files changed

+259
-131
lines changed

‎packages/examples/BUILD.bazel‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,38 @@
1+
load("//tools:defaults2.bzl", "ts_config")
2+
13
package(default_visibility = ["//visibility:public"])
24

35
exports_files([
46
"index.html",
5-
"tsconfig-e2e.json",
67
])
78

9+
ts_config(
10+
name = "tsconfig_build",
11+
src = "tsconfig.json",
12+
deps = [
13+
"//packages:tsconfig_build",
14+
],
15+
)
16+
17+
ts_config(
18+
name = "tsconfig_test",
19+
src = "tsconfig-test.json",
20+
deps = [
21+
":tsconfig_build",
22+
"//:node_modules/@types/jasmine",
23+
],
24+
)
25+
26+
ts_config(
27+
name = "tsconfig_e2e",
28+
src = "tsconfig-e2e.json",
29+
deps = [
30+
":tsconfig_test",
31+
"//:node_modules/@types/jasminewd2",
32+
"//:node_modules/@types/node",
33+
],
34+
)
35+
836
filegroup(
937
name = "files_for_docgen",
1038
srcs = [

‎packages/examples/common/BUILD.bazel‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,38 @@
1-
load("//tools:defaults.bzl", "esbuild", "http_server", "ng_module", "protractor_web_test_suite", "ts_library")
1+
load("//tools:defaults.bzl", "esbuild", "http_server", "protractor_web_test_suite")
2+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
23

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

5-
ng_module(
6+
ng_project(
67
name = "common_examples",
78
srcs = glob(
89
["**/*.ts"],
910
exclude = ["**/*_spec.ts"],
1011
),
11-
deps = [
12-
"//packages/common",
13-
"//packages/core",
12+
interop_deps = [
1413
"//packages/platform-browser",
15-
"//packages/router",
1614
"//packages/zone.js/lib",
17-
"@npm//rxjs",
15+
],
16+
deps = [
17+
"//:node_modules/rxjs",
18+
"//packages/common:common_rjs",
19+
"//packages/core:core_rjs",
20+
"//packages/router:router_rjs",
1821
],
1922
)
2023

21-
ts_library(
24+
ts_project(
2225
name = "common_tests_lib",
2326
testonly = True,
2427
srcs = glob(["**/*_spec.ts"]),
25-
tsconfig = "//packages/examples:tsconfig-e2e.json",
26-
deps = [
27-
"//packages/examples/test-utils",
28+
interop_deps = [
2829
"//packages/private/testing",
29-
"@npm//@types/jasminewd2",
30-
"@npm//protractor",
30+
],
31+
tsconfig = "//packages/examples:tsconfig_e2e",
32+
deps = [
33+
"//:node_modules/@types/jasminewd2",
34+
"//:node_modules/protractor",
35+
"//packages/examples/test-utils:test-utils_rjs",
3136
],
3237
)
3338

‎packages/examples/core/BUILD.bazel‎

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

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

5-
ng_module(
6+
ng_project(
67
name = "core_examples",
78
srcs = glob(
89
["**/*.ts"],
@@ -11,40 +12,42 @@ ng_module(
1112
"**/*_howto.ts",
1213
],
1314
),
14-
deps = [
15-
"//packages/animations",
16-
"//packages/core",
17-
"//packages/forms",
15+
interop_deps = [
1816
"//packages/platform-browser",
1917
"//packages/platform-browser/animations",
20-
"//packages/router",
2118
"//packages/zone.js/lib",
22-
"@npm//rxjs",
19+
],
20+
deps = [
21+
"//:node_modules/rxjs",
22+
"//packages/animations:animations_rjs",
23+
"//packages/core:core_rjs",
24+
"//packages/forms:forms_rjs",
25+
"//packages/router:router_rjs",
2326
],
2427
)
2528

26-
ts_library(
29+
ts_project(
2730
name = "core_tests_lib",
2831
testonly = True,
2932
srcs = glob(
3033
["**/*_spec.ts"],
3134
exclude = ["**/e2e_test/*"],
3235
),
3336
deps = [
34-
"//packages/core",
35-
"//packages/core/testing",
37+
"//packages/core:core_rjs",
38+
"//packages/core/testing:testing_rjs",
3639
],
3740
)
3841

39-
ts_library(
42+
ts_project(
4043
name = "core_e2e_tests_lib",
4144
testonly = True,
4245
srcs = glob(["**/e2e_test/*_spec.ts"]),
43-
tsconfig = "//packages/examples:tsconfig-e2e.json",
46+
tsconfig = "//packages/examples:tsconfig_e2e",
4447
deps = [
45-
"//packages/examples/test-utils",
46-
"@npm//@types/jasminewd2",
47-
"@npm//protractor",
48+
"//:node_modules/@types/jasminewd2",
49+
"//:node_modules/protractor",
50+
"//packages/examples/test-utils:test-utils_rjs",
4851
],
4952
)
5053

‎packages/examples/core/di/ts/contentChild/content_child_example.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ export class Pane {
1919

2020
@Component({
2121
selector: 'tab',
22-
template: ` <div>pane: {{ pane?.id }}</div> `,
22+
template: ` <div>pane: {{ pane.id }}</div> `,
2323
standalone: false,
2424
})
2525
export class Tab {

‎packages/examples/core/di/ts/forward_ref/BUILD.bazel‎

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

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

5-
# Note: The `forward_ref` example tests are built through this `ng_module` sub-target.
5+
# Note: The `forward_ref` example tests are built through this `ng_project` sub-target.
66
# This is done so that DI decorator/type metadata is processed manually by the compiler
77
# ahead of time. We cannot rely on the official TypeScript decorator downlevel emit (for JIT),
88
# as the output is not compatible with `forwardRef` and ES2015+. More details here:
99
# https://github.com/angular/angular/commit/323651bd38909b0f4226bcb6c8f5abafa91cf9d9.
1010
# https://github.com/microsoft/TypeScript/issues/27519.
11-
ng_module(
11+
ng_project(
1212
name = "forward_ref_tests_lib",
1313
testonly = True,
1414
srcs = ["forward_ref_spec.ts"],
1515
visibility = ["//packages/examples/core:__pkg__"],
16-
deps = ["//packages/core"],
16+
deps = ["//packages/core:core_rjs"],
1717
)
1818

1919
filegroup(

‎packages/examples/core/testing/ts/BUILD.bazel‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +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

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

5-
ts_library(
6+
ts_project(
67
name = "fake_async_lib",
8+
testonly = True,
79
srcs = [
810
"example_spec.ts",
911
"fake_async.ts",
1012
],
11-
deps = [
13+
interop_deps = [
1214
"//packages/core/testing",
13-
"@npm//@types/jasmine",
14-
"@npm//@types/node",
1515
],
1616
)
1717

‎packages/examples/forms/BUILD.bazel‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,38 @@
1-
load("//tools:defaults.bzl", "esbuild", "http_server", "ng_module", "protractor_web_test_suite", "ts_library")
1+
load("//tools:defaults.bzl", "esbuild", "http_server", "protractor_web_test_suite")
2+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
23

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

5-
ng_module(
6+
ng_project(
67
name = "forms_examples",
78
srcs = glob(
89
["**/*.ts"],
910
exclude = ["**/*_spec.ts"],
1011
),
11-
deps = [
12-
"//packages/core",
13-
"//packages/forms",
12+
interop_deps = [
1413
"//packages/platform-browser",
15-
"//packages/router",
1614
"//packages/zone.js/lib",
17-
"@npm//rxjs",
15+
],
16+
deps = [
17+
"//:node_modules/rxjs",
18+
"//packages/core:core_rjs",
19+
"//packages/forms:forms_rjs",
20+
"//packages/router:router_rjs",
1821
],
1922
)
2023

21-
ts_library(
24+
ts_project(
2225
name = "forms_e2e_tests_lib",
2326
testonly = True,
2427
srcs = glob(["**/e2e_test/*_spec.ts"]),
25-
tsconfig = "//packages/examples:tsconfig-e2e.json",
26-
deps = [
27-
"//packages/examples/test-utils",
28+
interop_deps = [
2829
"//packages/private/testing",
29-
"@npm//@types/jasminewd2",
30-
"@npm//protractor",
30+
],
31+
tsconfig = "//packages/examples:tsconfig_e2e",
32+
deps = [
33+
"//:node_modules/@types/jasminewd2",
34+
"//:node_modules/protractor",
35+
"//packages/examples/test-utils:test-utils_rjs",
3136
],
3237
)
3338

‎packages/examples/platform-browser/BUILD.bazel‎

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

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

5-
ng_module(
5+
ng_project(
66
name = "platform_browser_examples",
77
srcs = glob(["**/*.ts"]),
8-
deps = [
8+
interop_deps = [
99
"//packages/compiler",
10-
"//packages/core",
1110
"//packages/platform-browser",
1211
],
12+
deps = [
13+
"//packages/core:core_rjs",
14+
],
1315
)
1416

1517
filegroup(

‎packages/examples/router/BUILD.bazel‎

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

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

5-
ng_module(
5+
ng_project(
66
name = "router",
77
srcs = glob(
88
["**/*.ts"],
99
),
10-
deps = [
11-
"//packages/core",
10+
interop_deps = [
1211
"//packages/platform-browser",
13-
"//packages/router",
12+
],
13+
deps = [
14+
"//packages/core:core_rjs",
15+
"//packages/router:router_rjs",
1416
],
1517
)
1618

‎packages/examples/router/activated-route/BUILD.bazel‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,21 @@
1-
load("//tools:defaults.bzl", "esbuild", "http_server", "ng_module")
1+
load("//tools:defaults.bzl", "esbuild", "http_server")
2+
load("//tools:defaults2.bzl", "ng_project")
23

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

5-
ng_module(
6+
ng_project(
67
name = "router_activated_route_examples",
78
srcs = glob(
89
["**/*.ts"],
910
),
10-
deps = [
11-
"//packages/core",
12-
"//packages/platform-browser",
13-
"//packages/router",
11+
interop_deps = [
1412
"//packages/zone.js/lib",
15-
"@npm//rxjs",
13+
"//packages/platform-browser",
14+
],
15+
deps = [
16+
"//:node_modules/rxjs",
17+
"//packages/core:core_rjs",
18+
"//packages/router:router_rjs",
1619
],
1720
)
1821

0 commit comments

Comments
 (0)