Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc43fd3a

Browse files
josephperrottthePunderWoman
authored andcommitted
build: migrate common to use rules_js based toolchain (#61434)
Migrate packages/common to use ts_project and ng_project.PRClose#61434
1 parentc0c69a5 commitc43fd3a

File tree

16 files changed

+101
-64
lines changed

16 files changed

+101
-64
lines changed

‎packages/common/BUILD.bazel‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
load("@build_bazel_rules_nodejs//:index.bzl","generated_file_test")
22
load("//packages/common/locales:index.bzl","generate_base_currencies_file")
3-
load("//tools:defaults.bzl","api_golden_test","api_golden_test_npm_package","generate_api_docs","ng_module","ng_package")
3+
load("//tools:defaults.bzl","api_golden_test","api_golden_test_npm_package","generate_api_docs","ng_package")
4+
load("//tools:defaults2.bzl","ng_project")
45

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

@@ -19,19 +20,20 @@ generated_file_test(
1920
generated=":base_currencies_file_generated",
2021
)
2122

22-
ng_module(
23+
ng_project(
2324
name="common",
24-
package_name="@angular/common",
2525
srcs=glob(
2626
[
2727
"*.ts",
2828
"src/**/*.ts",
2929
],
3030
),
31-
deps= [
31+
interop_deps= [
3232
"//packages/core",
3333
"//packages/core/primitives/dom-navigation",
34-
"@npm//rxjs",
34+
],
35+
deps= [
36+
"//:node_modules/rxjs",
3537
],
3638
)
3739

‎packages/common/http/BUILD.bazel‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,24 @@
1-
load("//tools:defaults.bzl","api_golden_test","generate_api_docs","ng_module")
1+
load("//tools:defaults.bzl","api_golden_test","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="http",
910
srcs=glob(
1011
[
1112
"*.ts",
1213
"src/**/*.ts",
1314
],
1415
),
15-
deps= [
16-
"//packages/common",
16+
interop_deps= [
1717
"//packages/core",
18-
"@npm//rxjs",
18+
],
19+
deps= [
20+
"//:node_modules/rxjs",
21+
"//packages/common:common_rjs",
1922
],
2023
)
2124

‎packages/common/http/src/fetch.ts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,9 @@ import {
2828
HttpResponse,
2929
}from'./response';
3030

31+
// Needed for the global `Zone` ambient types to be available.
32+
importtype{}from'zone.js';
33+
3134
constXSSI_PREFIX=/^\)\]\}',?\n/;
3235

3336
/**

‎packages/common/http/test/BUILD.bazel‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,25 @@
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(
78
["**/*.ts"],
89
),
9-
# Visible to //:saucelabs_unit_tests_poc target
10-
visibility= ["//:__pkg__"],
11-
deps= [
10+
interop_deps= [
1211
"//packages:types",
13-
"//packages/common",
14-
"//packages/common/http",
15-
"//packages/common/http/testing",
1612
"//packages/core",
1713
"//packages/core/testing",
1814
"//packages/private/testing",
19-
"@npm//rxjs",
15+
],
16+
# Visible to //:saucelabs_unit_tests_poc target
17+
visibility= ["//:__pkg__"],
18+
deps= [
19+
"//:node_modules/rxjs",
20+
"//packages/common:common_rjs",
21+
"//packages/common/http:http_rjs",
22+
"//packages/common/http/testing:testing_rjs",
2023
],
2124
)
2225

‎packages/common/http/test/transfer_cache_spec.ts‎

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

99
import{DOCUMENT}from'../../index';
10-
import{ApplicationRef,Component,Injectable,PLATFORM_ID}from'@angular/core';
11-
import{makeStateKey,TransferState}from'@angular/core/src/transfer_state';
10+
import{
11+
makeStateKey,
12+
ApplicationRef,
13+
Component,
14+
Injectable,
15+
PLATFORM_ID,
16+
TransferState,
17+
}from'@angular/core';
1218
import{fakeAsync,flush,TestBed}from'@angular/core/testing';
1319
import{withBody}from'@angular/private/testing';
1420
import{BehaviorSubject}from'rxjs';

‎packages/common/http/testing/BUILD.bazel‎

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

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

66
exports_files(["package.json"])
77

8-
ng_module(
8+
ng_project(
99
name="testing",
1010
srcs=glob(
1111
[
1212
"*.ts",
1313
"src/**/*.ts",
1414
],
1515
),
16-
deps= [
17-
"//packages/common/http",
16+
interop_deps= [
1817
"//packages/core",
19-
"@npm//rxjs",
18+
],
19+
deps= [
20+
"//:node_modules/rxjs",
21+
"//packages/common/http:http_rjs",
2022
],
2123
)
2224

‎packages/common/http/testing/test/BUILD.bazel‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
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(
@@ -9,9 +10,9 @@ ts_library(
910
# Visible to //:saucelabs_unit_tests_poc target
1011
visibility= ["//:__pkg__"],
1112
deps= [
12-
"//packages/common/http",
13-
"//packages/common/http/testing",
14-
"@npm//rxjs",
13+
"//:node_modules/rxjs",
14+
"//packages/common/http:http_rjs",
15+
"//packages/common/http/testing:testing_rjs",
1516
],
1617
)
1718

‎packages/common/test/BUILD.bazel‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,28 @@
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(
78
["**/*.ts"],
89
),
9-
# Visible to //:saucelabs_unit_tests_poc target
10-
visibility= ["//:__pkg__"],
11-
deps= [
12-
"//packages/common",
13-
"//packages/common/locales",
14-
"//packages/common/testing",
10+
interop_deps= [
1511
"//packages/compiler",
1612
"//packages/core",
1713
"//packages/core/testing",
1814
"//packages/platform-browser",
1915
"//packages/platform-browser-dynamic",
2016
"//packages/platform-browser/testing",
2117
"//packages/private/testing",
22-
"@npm//rxjs",
18+
"//packages/common/locales",
19+
],
20+
# Visible to //:saucelabs_unit_tests_poc target
21+
visibility= ["//:__pkg__"],
22+
deps= [
23+
"//:node_modules/rxjs",
24+
"//packages/common:common_rjs",
25+
"//packages/common/testing:testing_rjs",
2326
],
2427
)
2528

‎packages/common/test/directives/ng_for_spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import{CommonModule,NgFor,NgForOf}from'../../index';
1010
import{Component}from'@angular/core';
1111
import{ComponentFixture,TestBed,waitForAsync}from'@angular/core/testing';
12-
import{By}from'@angular/platform-browser/src/dom/debug/by';
12+
import{By}from'@angular/platform-browser';
1313
import{expect}from'@angular/platform-browser/testing/src/matchers';
1414

1515
letthisArg:any;

‎packages/common/test/directives/ng_if_spec.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
* found in the LICENSE file at https://angular.dev/license
77
*/
88

9-
import{CommonModule,NgIf,ɵgetDOMasgetDOM}from'../../index';
9+
import{CommonModule,NgIf}from'../../index';
1010
import{Component}from'@angular/core';
1111
import{ComponentFixture,TestBed,waitForAsync}from'@angular/core/testing';
12-
import{By}from'@angular/platform-browser/src/dom/debug/by';
12+
import{By}from'@angular/platform-browser';
1313
import{expect}from'@angular/platform-browser/testing/src/matchers';
1414

1515
describe('ngIf directive',()=>{

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp