Skip to content

Commit 5afcfc0

Browse files
committed
build: migrate modules/testing/builders to rules_js runtime
Fully migrates `modules/testing/builders` to `rules_js`, so that it can resolve modules at runtime using RJS, or executes tests via RJS.
1 parent e2aa475 commit 5afcfc0

File tree

8 files changed

+32
-13
lines changed

8 files changed

+32
-13
lines changed

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
33
# This file should be checked into version control along with the pnpm-lock.yaml file.
44
.npmrc=-1406867100
5+
modules/testing/builder/package.json=-1769051440
56
package.json=688000741
67
packages/angular/build/package.json=1789788715
78
packages/angular/cli/package.json=349838588
@@ -16,6 +17,6 @@ packages/angular_devkit/schematics/package.json=673943597
1617
packages/angular_devkit/schematics_cli/package.json=-356386813
1718
packages/ngtools/webpack/package.json=-942726894
1819
packages/schematics/angular/package.json=251715148
19-
pnpm-lock.yaml=319177102
20-
pnpm-workspace.yaml=-1635877240
20+
pnpm-lock.yaml=-870184322
21+
pnpm-workspace.yaml=-1173266031
2122
yarn.lock=969972397

.bazelignore

+2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ node_modules
44
packages/angular/cli/node_modules
55
packages/angular/create/node_modules
66
packages/angular/pwa/node_modules
7+
packages/angular/build/node_modules
78
packages/angular/ssr/node_modules
89
packages/angular_devkit/architect/node_modules
910
packages/angular_devkit/architect_cli/node_modules
@@ -14,3 +15,4 @@ packages/angular_devkit/schematics/node_modules
1415
packages/angular_devkit/schematics_cli/node_modules
1516
packages/ngtools/webpack/node_modules
1617
packages/schematics/angular/node_modules
18+
modules/testing/builder/node_modules

WORKSPACE

+1
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@ npm_translate_lock(
186186
data = [
187187
"//:package.json",
188188
"//:pnpm-workspace.yaml",
189+
"//modules/testing/builder:package.json",
189190
"//packages/angular/build:package.json",
190191
"//packages/angular/cli:package.json",
191192
"//packages/angular/pwa:package.json",

modules/testing/builder/BUILD.bazel

+9-10
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
2-
load("//tools:interop.bzl", "ts_project")
1+
load("@npm2//:defs.bzl", "npm_link_all_packages")
2+
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")
33

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

6+
npm_link_all_packages()
7+
68
ts_project(
79
name = "builder",
810
testonly = True,
@@ -16,12 +18,9 @@ ts_project(
1618
),
1719
data = glob(["projects/**/*"]),
1820
deps = [
21+
":node_modules/@angular-devkit/architect",
22+
":node_modules/@angular-devkit/core",
1923
"//:node_modules/rxjs",
20-
"//packages/angular_devkit/architect:architect_rjs",
21-
"//packages/angular_devkit/architect/node:node_rjs",
22-
"//packages/angular_devkit/architect/testing:testing_rjs",
23-
"//packages/angular_devkit/core:core_rjs",
24-
"//packages/angular_devkit/core/node:node_rjs",
2524
],
2625
)
2726

@@ -35,11 +34,11 @@ ts_project(
3534
),
3635
deps = [
3736
":builder_rjs",
38-
"//packages/angular_devkit/architect/testing:testing_rjs",
37+
":node_modules/@angular-devkit/architect",
3938
],
4039
)
4140

42-
jasmine_node_test(
41+
jasmine_test(
4342
name = "unit_test",
44-
srcs = [":unit_test_lib"],
43+
data = [":unit_test_lib_rjs"],
4544
)

modules/testing/builder/package.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"devDependencies": {
3+
"@angular-devkit/core": "workspace:*",
4+
"@angular-devkit/architect": "workspace:*"
5+
}
6+
}

packages/angular_devkit/build_angular/BUILD.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ ts_project(
196196
"//packages/angular/build:build_rjs",
197197
"//packages/angular/build/private:private_rjs",
198198
"//packages/angular/ssr:ssr_rjs",
199-
"//packages/angular_devkit/architect",
199+
"//packages/angular_devkit/architect:architect_rjs",
200200
"//packages/angular_devkit/build_webpack:build_webpack_rjs",
201201
"//packages/angular_devkit/core:core_rjs",
202202
"//packages/angular_devkit/core/node:node_rjs",

pnpm-lock.yaml

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

pnpm-workspace.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,4 @@ packages:
1111
- packages/angular/ssr
1212
- packages/schematics/angular
1313
- packages/ngtools/webpack
14+
- modules/testing/builder

0 commit comments

Comments
 (0)