Skip to content

Commit 539336e

Browse files
devversionalan-agius4
authored andcommitted
build: migrate remaining @angular/ssr tests to rules_js
Migrates the remaining `@angular/ssr` tests to `rules_js`.
1 parent 6a6ecee commit 539336e

File tree

7 files changed

+27
-22
lines changed

7 files changed

+27
-22
lines changed

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ package.json=-744581142
77
packages/angular/build/package.json=1783072863
88
packages/angular/cli/package.json=1301682969
99
packages/angular/pwa/package.json=1108903917
10-
packages/angular/ssr/package.json=1104313629
10+
packages/angular/ssr/package.json=362039201
1111
packages/angular_devkit/architect/package.json=-1496633956
1212
packages/angular_devkit/architect_cli/package.json=1551210941
1313
packages/angular_devkit/build_angular/package.json=-1206066740
@@ -17,6 +17,6 @@ packages/angular_devkit/schematics/package.json=673943597
1717
packages/angular_devkit/schematics_cli/package.json=-169616762
1818
packages/ngtools/webpack/package.json=1463215526
1919
packages/schematics/angular/package.json=251715148
20-
pnpm-lock.yaml=1844603164
20+
pnpm-lock.yaml=-1995042738
2121
pnpm-workspace.yaml=-1056556036
2222
yarn.lock=346921654

packages/angular/ssr/BUILD.bazel

+3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
load("@aspect_rules_js//npm:defs.bzl", "npm_package")
22
load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
3+
load("@npm2//:defs.bzl", "npm_link_all_packages")
34
load("@rules_pkg//:pkg.bzl", "pkg_tar")
45
load("//tools:defaults.bzl", "ng_package")
56
load("//tools:defaults2.bzl", "ts_project")
67

78
package(default_visibility = ["//visibility:public"])
89

10+
npm_link_all_packages()
11+
912
ts_project(
1013
name = "ssr",
1114
srcs = glob(

packages/angular/ssr/node/test/BUILD.bazel

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
load("@npm//@angular/build-tooling/bazel/spec-bundling:index.bzl", "spec_bundle")
2-
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
3-
load("//tools:interop.bzl", "ts_project")
2+
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
43

54
ts_project(
65
name = "unit_test_lib",
@@ -22,9 +21,9 @@ spec_bundle(
2221
],
2322
)
2423

25-
jasmine_node_test(
24+
jasmine_test(
2625
name = "test",
27-
deps = [
26+
data = [
2827
":esm_tests_bundled",
2928
],
3029
)

packages/angular/ssr/package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@
2828
}
2929
},
3030
"devDependencies": {
31+
"@angular-devkit/schematics": "workspace:*",
3132
"@angular/common": "19.2.0-next.0",
3233
"@angular/compiler": "19.2.0-next.0",
3334
"@angular/core": "19.2.0-next.0",
3435
"@angular/platform-browser": "19.2.0-next.0",
3536
"@angular/platform-server": "19.2.0-next.0",
3637
"@angular/router": "19.2.0-next.0",
37-
"@bazel/runfiles": "^6.0.0"
38+
"@bazel/runfiles": "^6.0.0",
39+
"@schematics/angular": "workspace:*"
3840
},
3941
"sideEffects": false,
4042
"schematics": "./schematics/collection.json",

packages/angular/ssr/schematics/BUILD.bazel

+7-11
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
# Use of this source code is governed by an MIT-style license that can be
44
# found in the LICENSE file at https://angular.dev/license
55

6-
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
76
load("//tools:defaults.bzl", "pkg_npm")
8-
load("//tools:interop.bzl", "ts_project")
7+
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
98
load("//tools:ts_json_schema.bzl", "ts_json_schema")
109

1110
licenses(["notice"])
@@ -61,8 +60,8 @@ ts_project(
6160
data = [":schematics_assets"],
6261
module_name = "@angular/ssr/schematics",
6362
deps = [
64-
"//packages/angular_devkit/schematics:schematics_rjs",
65-
"//packages/schematics/angular:angular_rjs",
63+
"//packages/angular/ssr:node_modules/@angular-devkit/schematics",
64+
"//packages/angular/ssr:node_modules/@schematics/angular",
6665
],
6766
)
6867

@@ -80,17 +79,14 @@ ts_project(
8079
),
8180
deps = [
8281
":schematics_rjs",
83-
"//packages/angular_devkit/schematics/testing:testing_rjs",
82+
"//packages/angular/ssr:node_modules/@angular-devkit/schematics",
8483
],
8584
)
8685

87-
jasmine_node_test(
86+
jasmine_test(
8887
name = "ssr_schematics_test",
89-
srcs = [":ssr_schematics_test_lib"],
90-
deps = [
91-
"@npm//jasmine",
92-
"@npm//source-map",
93-
"@npm//typescript",
88+
data = [
89+
":ssr_schematics_test_lib_rjs",
9490
],
9591
)
9692

packages/angular/ssr/test/npm_package/BUILD.bazel

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
load("@bazel_skylib//rules:diff_test.bzl", "diff_test")
22
load("@bazel_skylib//rules:write_file.bzl", "write_file")
3-
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
4-
load("//tools:interop.bzl", "ts_project")
3+
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
54

65
ts_project(
76
name = "unit_test_lib",
@@ -12,10 +11,10 @@ ts_project(
1211
],
1312
)
1413

15-
jasmine_node_test(
14+
jasmine_test(
1615
name = "test",
17-
srcs = [":unit_test_lib"],
1816
data = [
17+
"unit_test_lib_rjs",
1918
"//packages/angular/ssr:npm_package",
2019
],
2120
)

pnpm-lock.yaml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)