Skip to content

Commit 082cc55

Browse files
devversionthePunderWoman
authored andcommitted
build: migrate all ng_module in packages/core/test (angular#61472)
Migrates all `ng_module` to `ng_project` in `packages/core/test/`. PR Close angular#61472
1 parent 8ead19f commit 082cc55

File tree

19 files changed

+78
-78
lines changed

19 files changed

+78
-78
lines changed

packages/core/test/acceptance/BUILD.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ng_module")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite")
2+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
33

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

@@ -45,17 +45,17 @@ ts_project(
4545
],
4646
)
4747

48-
# Note: The `forward_ref` example tests are built through this `ng_module` sub-target.
48+
# Note: The `forward_ref` example tests are built through this `ng_project` sub-target.
4949
# This is done so that DI decorator/type metadata is processed manually by the compiler
5050
# ahead of time. We cannot rely on the official TypeScript decorator downlevel emit (for JIT),
5151
# as the output is not compatible with `forwardRef` and ES2015+. More details here:
5252
# https://github.com/angular/angular/commit/323651bd38909b0f4226bcb6c8f5abafa91cf9d9.
5353
# https://github.com/microsoft/TypeScript/issues/27519.
54-
ng_module(
54+
ng_project(
5555
name = "forward_ref_test_lib",
5656
testonly = True,
5757
srcs = SPEC_FILES_WITH_FORWARD_REFS,
58-
deps = [
58+
interop_deps = [
5959
"//packages/core",
6060
"//packages/core/testing",
6161
],

packages/core/test/acceptance/authoring/BUILD.bazel

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "ng_module", "nodejs_binary", "npm_package_bin")
2-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "jasmine_node_test", "karma_web_test_suite", "nodejs_binary", "npm_package_bin")
2+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
33

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

@@ -8,14 +8,18 @@ TEST_FILES = glob(
88
exclude = ["authoring_test_compiler.ts"],
99
)
1010

11-
TEST_DEPS = [
11+
TEST_INTEROP_DEPS = [
1212
"//packages/core",
1313
"//packages/core/rxjs-interop",
1414
"//packages/core/testing",
1515
"//packages/platform-browser",
1616
"//packages/core/primitives/signals",
1717
]
1818

19+
TEST_DEPS = [
20+
"//:node_modules/rxjs",
21+
]
22+
1923
ts_project(
2024
name = "test_compiler_lib",
2125
testonly = True,
@@ -55,21 +59,16 @@ ts_project(
5559
name = "test_jit_lib",
5660
testonly = True,
5761
srcs = ["transformed_%s" % file for file in TEST_FILES],
58-
interop_deps = TEST_DEPS,
59-
deps = [
60-
# TODO: Only rely on `TEST_DEPS`. This should be removed during `rules_js` migration.
61-
"//:node_modules/rxjs",
62-
],
62+
interop_deps = TEST_INTEROP_DEPS,
63+
deps = TEST_DEPS,
6364
)
6465

65-
ng_module(
66+
ng_project(
6667
name = "test_lib",
6768
testonly = True,
6869
srcs = TEST_FILES,
69-
deps = TEST_DEPS + [
70-
# TODO: Only rely on `TEST_DEPS`. This should be removed during `rules_js` migration.
71-
"@npm//rxjs",
72-
],
70+
interop_deps = TEST_INTEROP_DEPS,
71+
deps = TEST_DEPS,
7372
)
7473

7574
jasmine_node_test(

packages/core/test/acceptance/selectorless/BUILD

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

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

5-
ng_module(
6+
ng_project(
67
name = "selectorless_test_lib",
78
testonly = True,
89
srcs = glob(["**/*.ts"]),
9-
tsconfig = ":tsconfig.json",
10-
visibility = ["//:__pkg__"],
11-
deps = [
10+
extends = "//packages/core:tsconfig_test",
11+
interop_deps = [
1212
"//packages/core",
1313
"//packages/core/testing",
1414
"//packages/zone.js/lib:zone_d_ts",
1515
],
16+
tsconfig = ":tsconfig.json",
17+
visibility = ["//:__pkg__"],
1618
)
1719

1820
jasmine_node_test(
Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
{
2+
"extends": "../../../tsconfig-test.json",
23
"compilerOptions": {
3-
"strict": true,
4-
"types": ["node", "jasmine"],
5-
"plugins": [{
6-
"name": "@bazel/tsetse",
7-
"disabledRules": ["must-use-promises"]
8-
}]
4+
"strict": true
95
},
106
"angularCompilerOptions": {
117
"strictTemplates": true,
128
"_enableSelectorless": true
13-
},
14-
"bazelOptions": {
15-
"suppressTsconfigOverrideWarnings": true
169
}
1710
}

packages/core/test/bundling/animations-standalone/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
load("@npm//http-server:index.bzl", "http_server")
2-
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test", "ng_module")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test")
3+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
44
load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
55

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

8-
ng_module(
8+
ng_project(
99
name = "animations_standalone",
1010
srcs = ["index.ts"],
11-
deps = [
11+
interop_deps = [
1212
"//packages/core",
1313
"//packages/platform-browser",
1414
"//packages/platform-browser/animations",

packages/core/test/bundling/cyclic_import/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
load("@npm//http-server:index.bzl", "http_server")
2-
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test", "ng_module")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test")
3+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
44

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

7-
ng_module(
7+
ng_project(
88
name = "cyclic_import",
99
srcs = [
1010
"index.ts",
1111
"trigger.ts",
1212
],
13-
deps = [
13+
interop_deps = [
1414
"//packages/core",
1515
"//packages/platform-browser",
1616
],

packages/core/test/bundling/defer/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
load("@npm//http-server:index.bzl", "http_server")
2-
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test", "ng_module")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test")
3+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
44
load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
55

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

8-
ng_module(
8+
ng_project(
99
name = "defer",
1010
srcs = [
1111
"defer.component.ts",
1212
"index.ts",
1313
],
14-
deps = [
14+
interop_deps = [
1515
"//packages/core",
1616
"//packages/platform-browser",
1717
],

packages/core/test/bundling/forms_reactive/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
load("@npm//http-server:index.bzl", "http_server")
2-
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test", "ng_module")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test")
3+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
44
load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
55

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

8-
ng_module(
8+
ng_project(
99
name = "forms_reactive",
1010
srcs = ["index.ts"],
11-
deps = [
11+
interop_deps = [
1212
"//packages/core",
1313
"//packages/forms",
1414
"//packages/platform-browser",

packages/core/test/bundling/forms_template_driven/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
load("@npm//http-server:index.bzl", "http_server")
2-
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test", "ng_module")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test")
3+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
44
load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
55

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

8-
ng_module(
8+
ng_project(
99
name = "forms_template_driven",
1010
srcs = ["index.ts"],
11-
deps = [
11+
interop_deps = [
1212
"//packages/core",
1313
"//packages/forms",
1414
"//packages/platform-browser",

packages/core/test/bundling/hydration/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
load("@npm//http-server:index.bzl", "http_server")
2-
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test", "ng_module")
3-
load("//tools:defaults2.bzl", "ts_project")
2+
load("//tools:defaults.bzl", "app_bundle", "jasmine_node_test")
3+
load("//tools:defaults2.bzl", "ng_project", "ts_project")
44
load("//tools/symbol-extractor:index.bzl", "js_expected_symbol_test")
55

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

8-
ng_module(
8+
ng_project(
99
name = "hydration",
1010
srcs = ["index.ts"],
11-
deps = [
11+
interop_deps = [
1212
"//packages/core",
1313
"//packages/platform-browser",
1414
],

0 commit comments

Comments
 (0)