Skip to content

Commit

Permalink
build: migrate modules/testing/builders to rules_js runtime
Browse files Browse the repository at this point in the history
Fully migrates `modules/testing/builders` to `rules_js`, so that it can
resolve modules at runtime using RJS, or executes tests via RJS.
  • Loading branch information
devversion committed Jan 28, 2025
1 parent e2aa475 commit 5afcfc0
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Input hashes for repository rule npm_translate_lock(name = "npm2", pnpm_lock = "@//:pnpm-lock.yaml").
# This file should be checked into version control along with the pnpm-lock.yaml file.
.npmrc=-1406867100
modules/testing/builder/package.json=-1769051440
package.json=688000741
packages/angular/build/package.json=1789788715
packages/angular/cli/package.json=349838588
Expand All @@ -16,6 +17,6 @@ packages/angular_devkit/schematics/package.json=673943597
packages/angular_devkit/schematics_cli/package.json=-356386813
packages/ngtools/webpack/package.json=-942726894
packages/schematics/angular/package.json=251715148
pnpm-lock.yaml=319177102
pnpm-workspace.yaml=-1635877240
pnpm-lock.yaml=-870184322
pnpm-workspace.yaml=-1173266031
yarn.lock=969972397
2 changes: 2 additions & 0 deletions .bazelignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ node_modules
packages/angular/cli/node_modules
packages/angular/create/node_modules
packages/angular/pwa/node_modules
packages/angular/build/node_modules
packages/angular/ssr/node_modules
packages/angular_devkit/architect/node_modules
packages/angular_devkit/architect_cli/node_modules
Expand All @@ -14,3 +15,4 @@ packages/angular_devkit/schematics/node_modules
packages/angular_devkit/schematics_cli/node_modules
packages/ngtools/webpack/node_modules
packages/schematics/angular/node_modules
modules/testing/builder/node_modules
1 change: 1 addition & 0 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ npm_translate_lock(
data = [
"//:package.json",
"//:pnpm-workspace.yaml",
"//modules/testing/builder:package.json",
"//packages/angular/build:package.json",
"//packages/angular/cli:package.json",
"//packages/angular/pwa:package.json",
Expand Down
19 changes: 9 additions & 10 deletions modules/testing/builder/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
load("//tools:interop.bzl", "ts_project")
load("@npm2//:defs.bzl", "npm_link_all_packages")
load("//tools:defaults2.bzl", "jasmine_test", "ts_project")

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

npm_link_all_packages()

ts_project(
name = "builder",
testonly = True,
Expand All @@ -16,12 +18,9 @@ ts_project(
),
data = glob(["projects/**/*"]),
deps = [
":node_modules/@angular-devkit/architect",
":node_modules/@angular-devkit/core",
"//:node_modules/rxjs",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/architect/node:node_rjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
],
)

Expand All @@ -35,11 +34,11 @@ ts_project(
),
deps = [
":builder_rjs",
"//packages/angular_devkit/architect/testing:testing_rjs",
":node_modules/@angular-devkit/architect",
],
)

jasmine_node_test(
jasmine_test(
name = "unit_test",
srcs = [":unit_test_lib"],
data = [":unit_test_lib_rjs"],
)
6 changes: 6 additions & 0 deletions modules/testing/builder/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"devDependencies": {
"@angular-devkit/core": "workspace:*",
"@angular-devkit/architect": "workspace:*"
}
}
2 changes: 1 addition & 1 deletion packages/angular_devkit/build_angular/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ ts_project(
"//packages/angular/build:build_rjs",
"//packages/angular/build/private:private_rjs",
"//packages/angular/ssr:ssr_rjs",
"//packages/angular_devkit/architect",
"//packages/angular_devkit/architect:architect_rjs",
"//packages/angular_devkit/build_webpack:build_webpack_rjs",
"//packages/angular_devkit/core:core_rjs",
"//packages/angular_devkit/core/node:node_rjs",
Expand Down
9 changes: 9 additions & 0 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ packages:
- packages/angular/ssr
- packages/schematics/angular
- packages/ngtools/webpack
- modules/testing/builder

0 comments on commit 5afcfc0

Please sign in to comment.