Skip to content

Commit 4c72ce4

Browse files
josephperrottatscott
josephperrott
authored and
atscott
committed
build: migrate platform-browser and platform-browser-dynamic package to use rules_js (angular#61623)
Use ts_project and ng_project to build platform-browser and platform-browser-dynamic package PR Close angular#61623
1 parent b03ac99 commit 4c72ce4

File tree

18 files changed

+139
-111
lines changed

18 files changed

+139
-111
lines changed

‎packages/core/src/core.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ export {
3838
destroyPlatform,
3939
getPlatform,
4040
providePlatformInitializer,
41+
createOrReusePlatformInjector as ɵcreateOrReusePlatformInjector,
4142
} from './platform/platform';
4243
export {
4344
provideZoneChangeDetection,

‎packages/core/src/di/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,3 +59,4 @@ export {
5959
export {InjectionToken} from './injection_token';
6060
export {HostAttributeToken} from './host_attribute_token';
6161
export {HOST_TAG_NAME} from './host_tag_name_token';
62+
export {R3Injector as ɵR3Injector} from './r3_injector';

‎packages/core/testing/public_api.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,5 @@
1515
*/
1616
export * from './src/testing';
1717
export * from './src/testing_private_export';
18-
18+
export {Log as ɵLog} from './src/testing_internal';
1919
// This file only reexports content of the `src` folder. Keep it that way.

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

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,24 @@
1-
load("//tools:defaults.bzl", "api_golden_test_npm_package", "generate_api_docs", "ng_module", "ng_package")
1+
load("//tools:defaults.bzl", "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 = "platform-browser-dynamic",
7-
package_name = "@angular/platform-browser-dynamic",
88
srcs = glob(
99
[
1010
"*.ts",
1111
"src/**/*.ts",
1212
],
1313
),
14-
deps = [
14+
interop_deps = [
1515
"//packages:types",
16-
"//packages/common",
1716
"//packages/compiler",
18-
"//packages/core",
19-
"//packages/platform-browser",
17+
],
18+
deps = [
19+
"//packages/common:common_rjs",
20+
"//packages/core:core_rjs",
21+
"//packages/platform-browser:platform-browser_rjs",
2022
],
2123
)
2224

‎packages/platform-browser-dynamic/test/BUILD.bazel

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
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+
interop_deps = [
89
"//packages:types",
910
"//packages/compiler",
10-
"//packages/core",
11-
"//packages/core/testing",
12-
"//packages/platform-browser-dynamic",
13-
"//packages/platform-browser-dynamic/testing",
14-
"//packages/platform-browser/animations",
15-
"//packages/platform-browser/testing",
1611
"//packages/private/testing",
1712
],
13+
deps = [
14+
"//packages/core:core_rjs",
15+
"//packages/core/testing:testing_rjs",
16+
"//packages/platform-browser-dynamic:platform-browser-dynamic_rjs",
17+
"//packages/platform-browser-dynamic/testing:testing_rjs",
18+
"//packages/platform-browser/animations:animations_rjs",
19+
"//packages/platform-browser/testing:testing_rjs",
20+
],
1821
)
1922

2023
jasmine_node_test(

‎packages/platform-browser-dynamic/testing/BUILD.bazel

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,23 @@
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"]),
10-
deps = [
11-
"//packages/common",
11+
interop_deps = [
1212
"//packages/compiler",
13-
"//packages/core",
14-
"//packages/core/testing",
15-
"//packages/platform-browser",
16-
"//packages/platform-browser-dynamic",
17-
"//packages/platform-browser/testing",
13+
],
14+
deps = [
15+
"//packages/common:common_rjs",
16+
"//packages/core:core_rjs",
17+
"//packages/core/testing:testing_rjs",
18+
"//packages/platform-browser:platform-browser_rjs",
19+
"//packages/platform-browser-dynamic:platform-browser-dynamic_rjs",
20+
"//packages/platform-browser/testing:testing_rjs",
1821
],
1922
)
2023

‎packages/platform-browser/BUILD.bazel

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

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

5-
ng_module(
6+
ng_project(
67
name = "platform-browser",
7-
package_name = "@angular/platform-browser",
88
srcs = glob(
99
[
1010
"*.ts",
1111
"src/**/*.ts",
1212
],
1313
),
14-
deps = [
14+
interop_deps = [
1515
"//packages:types",
16-
"//packages/common",
17-
"//packages/common/http",
18-
"//packages/core",
1916
"//packages/zone.js/lib:zone_d_ts",
20-
"@npm//@types/hammerjs",
17+
],
18+
deps = [
19+
"//:node_modules/@types/hammerjs",
20+
"//packages:goog_types_rjs",
21+
"//packages/common:common_rjs",
22+
"//packages/common/http:http_rjs",
23+
"//packages/core:core_rjs",
2124
],
2225
)
2326

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1-
load("//tools:defaults.bzl", "generate_api_docs", "ng_module", "tsec_test")
1+
load("//tools:defaults.bzl", "generate_api_docs", "tsec_test")
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 = "animations",
910
srcs = glob(
1011
[
@@ -13,11 +14,11 @@ ng_module(
1314
],
1415
),
1516
deps = [
16-
"//packages/animations",
17-
"//packages/animations/browser",
18-
"//packages/common",
19-
"//packages/core",
20-
"//packages/platform-browser",
17+
"//packages/animations:animations_rjs",
18+
"//packages/animations/browser:browser_rjs",
19+
"//packages/common:common_rjs",
20+
"//packages/core:core_rjs",
21+
"//packages/platform-browser:platform-browser_rjs",
2122
],
2223
)
2324

‎packages/platform-browser/animations/async/BUILD.bazel

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
1-
load("//tools:defaults.bzl", "ng_module", "tsec_test")
21
load("//adev/shared-docs/pipeline/api-gen:generate_api_docs.bzl", "generate_api_docs")
2+
load("//tools:defaults.bzl", "tsec_test")
3+
load("//tools:defaults2.bzl", "ng_project")
34

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

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

8-
ng_module(
9+
ng_project(
910
name = "async",
1011
srcs = glob(
1112
[
1213
"*.ts",
1314
"src/**/*.ts",
1415
],
1516
),
16-
deps = [
17-
"//packages/animations",
18-
"//packages/animations/browser",
17+
interop_deps = [
1918
"//packages/common",
20-
"//packages/core",
21-
"//packages/platform-browser",
19+
],
20+
deps = [
21+
"//packages/animations:animations_rjs",
22+
"//packages/animations/browser:browser_rjs",
23+
"//packages/core:core_rjs",
24+
"//packages/platform-browser:platform-browser_rjs",
2225
],
2326
)
2427

‎packages/platform-browser/animations/async/test/BUILD.bazel

Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,27 @@
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+
interop_deps = [
89
"//packages:types",
9-
"//packages/animations",
10-
"//packages/animations/browser",
11-
"//packages/animations/browser/testing",
12-
"//packages/common",
1310
"//packages/compiler",
14-
"//packages/core",
15-
"//packages/core/testing",
16-
"//packages/platform-browser",
17-
"//packages/platform-browser/animations",
18-
"//packages/platform-browser/animations/async",
19-
"//packages/platform-browser/testing",
2011
"//packages/private/testing",
21-
"@npm//rxjs",
12+
],
13+
deps = [
14+
"//:node_modules/rxjs",
15+
"//packages/animations:animations_rjs",
16+
"//packages/animations/browser:browser_rjs",
17+
"//packages/animations/browser/testing:testing_rjs",
18+
"//packages/common:common_rjs",
19+
"//packages/core:core_rjs",
20+
"//packages/core/testing:testing_rjs",
21+
"//packages/platform-browser:platform-browser_rjs",
22+
"//packages/platform-browser/animations:animations_rjs",
23+
"//packages/platform-browser/animations/async:async_rjs",
24+
"//packages/platform-browser/testing:testing_rjs",
2225
],
2326
)
2427

0 commit comments

Comments
 (0)