Skip to content

Commit 6f74458

Browse files
josephperrottthePunderWoman
authored andcommitted
build: migrate animations to use rules_js based toolchain (angular#61479)
Migrate animations to use `ts_project` and `ng_project` PR Close angular#61479
1 parent 62435f6 commit 6f74458

File tree

6 files changed

+46
-32
lines changed

6 files changed

+46
-32
lines changed

packages/animations/BUILD.bazel

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

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

5-
ng_module(
6+
ng_project(
67
name = "animations",
78
srcs = glob(
89
[
910
"*.ts",
1011
"src/**/*.ts",
1112
],
1213
),
13-
deps = [
14+
interop_deps = [
1415
"//packages/common",
15-
"//packages/core",
16+
],
17+
deps = [
18+
"//packages/core:core_rjs",
1619
],
1720
)
1821

packages/animations/browser/BUILD.bazel

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
1+
load("//tools:defaults.bzl", "generate_api_docs")
2+
load("//tools:defaults2.bzl", "ng_project")
23

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

56
exports_files(["package.json"])
67

7-
ng_module(
8+
ng_project(
89
name = "browser",
910
srcs = glob(
1011
[
@@ -13,8 +14,8 @@ ng_module(
1314
],
1415
),
1516
deps = [
16-
"//packages/animations",
17-
"//packages/core",
17+
"//packages/animations:animations_rjs",
18+
"//packages/core:core_rjs",
1819
],
1920
)
2021

packages/animations/browser/test/BUILD.bazel

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

3-
ts_library(
4+
ts_project(
45
name = "test_lib",
56
testonly = True,
67
srcs = glob(["**/*.ts"]),
78
deps = [
8-
"//packages:types",
9-
"//packages/animations",
10-
"//packages/animations/browser",
11-
"//packages/animations/browser/testing",
12-
"//packages/core",
13-
"//packages/core/testing",
14-
"//packages/platform-browser/testing",
9+
"//packages:types_rjs",
10+
"//packages/animations:animations_rjs",
11+
"//packages/animations/browser:browser_rjs",
12+
"//packages/animations/browser/testing:testing_rjs",
13+
"//packages/core:core_rjs",
14+
"//packages/core/testing:testing_rjs",
1515
],
1616
)
1717

packages/animations/browser/testing/BUILD.bazel

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
1-
load("//tools:defaults.bzl", "generate_api_docs", "ng_module")
1+
load("//tools:defaults.bzl", "generate_api_docs")
2+
load("//tools:defaults2.bzl", "ng_project")
23

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

56
exports_files(["package.json"])
67

7-
ng_module(
8+
ng_project(
89
name = "testing",
910
srcs = glob(["**/*.ts"]),
1011
deps = [
11-
"//packages/animations",
12-
"//packages/animations/browser",
12+
"//packages/animations:animations_rjs",
13+
"//packages/animations/browser:browser_rjs",
1314
],
1415
)
1516

packages/animations/test/BUILD.bazel

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

3-
ts_library(
4+
ts_project(
45
name = "test_lib",
56
testonly = True,
67
srcs = glob(["**/*.ts"]),
7-
deps = [
8-
"//packages:types",
9-
"//packages/animations",
10-
"//packages/animations/browser",
11-
"//packages/animations/browser/testing",
8+
interop_deps = [
129
"//packages/common",
13-
"//packages/core",
14-
"//packages/core/testing",
1510
"//packages/platform-browser",
1611
"//packages/platform-browser-dynamic/testing",
1712
"//packages/platform-browser/animations",
1813
"//packages/platform-browser/animations/async",
1914
"//packages/platform-browser/testing",
2015
],
16+
deps = [
17+
"//packages:types_rjs",
18+
"//packages/animations:animations_rjs",
19+
"//packages/animations/browser:browser_rjs",
20+
"//packages/animations/browser/testing:testing_rjs",
21+
"//packages/core:core_rjs",
22+
"//packages/core/testing:testing_rjs",
23+
],
2124
)
2225

2326
jasmine_node_test(

packages/bazel/src/ng_module/partial_compilation.bzl

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,16 @@ ng_partial_compilation_flag = rule(
1616
)
1717

1818
def _partial_compilation_transition_impl(_settings, _attr):
19-
return {"//packages/bazel/src:partial_compilation": True}
19+
return {
20+
"@rules_angular//src/ng_project/config:partial_compilation": True,
21+
"//packages/bazel/src:partial_compilation": True,
22+
}
2023

2124
partial_compilation_transition = transition(
2225
implementation = _partial_compilation_transition_impl,
2326
inputs = [],
24-
outputs = ["//packages/bazel/src:partial_compilation"],
27+
outputs = [
28+
"//packages/bazel/src:partial_compilation",
29+
"@rules_angular//src/ng_project/config:partial_compilation",
30+
],
2531
)

0 commit comments

Comments
 (0)