Skip to content

Commit f92bfa4

Browse files
devversiondevversion
committed
build: update dev-infra and rework windows native testing
As part of go/ng:windows-dev-future, we are changing how our infrastructure supports Windows build & testing. Clearly: - we will still support contributors on Windows, and we believe we will be improving and streamlining the experience here - we will continue testing the Angular CLI for our Windows users. We are aware of the many Windows users using the `ng` CLI. What is changing? We are no longer actively working towards a Bazel infrastructure that supports native Windows building and testing. There are currently two ways to contribute to Angular on Windows. That is via WSL, or via e.g. native Windows cmd.exe, with Git Bash on top. We acknowledge that the latter worked sometimes, but we also realize it very often breaks as nobody on our team uses, verifies it, and it introduces extra complexity because Bazel on Windows is quite disconnected from Linux/Mac (e.g. no sandboxing). Going forward, to improve our team's effectiveness, and improve our stability guarantees for Windows (and Windows contributors), we are actively discouraging the use of Git Bash for contributing to Angular; but instead ask for WSL to be used. I can speak as one of the few long-term team members that have worked on Windows (without WSL) most of my time, that WSL is great and the contributing experience is much smoother and also easier to "guide". It's a positive change because we won't be suggesting "two ways to contribute on Windows", where in reality one is very brittle and can break at any time!
1 parent 3ebd7ca commit f92bfa4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+728
-226
lines changed

‎.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
# This file should be checked into version control along with the pnpm-lock.yaml file.
44
.npmrc=-1406867100
55
modules/testing/builder/package.json=973445093
6-
package.json=817786158
6+
package.json=875297300
77
packages/angular/build/package.json=1540368256
88
packages/angular/cli/package.json=-1917515334
99
packages/angular/pwa/package.json=1108903917
10-
packages/angular/ssr/package.json=708248541
10+
packages/angular/ssr/package.json=-149631110
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=-221067535
@@ -17,6 +17,6 @@ packages/angular_devkit/schematics/package.json=673943597
1717
packages/angular_devkit/schematics_cli/package.json=-2026655035
1818
packages/ngtools/webpack/package.json=605871936
1919
packages/schematics/angular/package.json=251715148
20-
pnpm-lock.yaml=-555932675
20+
pnpm-lock.yaml=-10828064
2121
pnpm-workspace.yaml=-1056556036
22-
yarn.lock=-1678795202
22+
yarn.lock=-1549158718

‎.bazelrc

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ test:no-sharding --flaky_test_attempts=1 --test_sharding_strategy=disabled
3333
# See https://github.com/bazelbuild/bazel/issues/4603
3434
build --symlink_prefix=dist/
3535

36-
# Disable watchfs as it causes tests to be flaky on Windows
37-
# https://github.com/angular/angular/issues/29541
38-
build --nowatchfs
39-
4036
# Turn off legacy external runfiles
4137
build --nolegacy_external_runfiles
4238

@@ -133,9 +129,9 @@ build:remote --jobs=150
133129

134130
# Setup the toolchain and platform for the remote build execution. The platform
135131
# is provided by the shared dev-infra package and targets k8 remote containers.
136-
build:remote --extra_execution_platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
137-
build:remote --host_platform=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
138-
build:remote --platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
132+
build:remote --extra_execution_platforms=@devinfra//bazel/remote-execution:platform_with_network
133+
build:remote --host_platform=@devinfra//bazel/remote-execution:platform_with_network
134+
build:remote --platforms=@devinfra//bazel/remote-execution:platform_with_network
139135

140136
# Set remote caching settings
141137
build:remote --remote_accept_cached=true
@@ -162,10 +158,6 @@ build:remote-cache --google_default_credentials
162158
# Fixes use of npm paths with spaces such as some within the puppeteer module
163159
build --experimental_inprocess_symlink_creation
164160

165-
# Enable runfiles even on Windows.
166-
# Architect resolves output files from data files, and this isn't possible without runfile support.
167-
build --enable_runfiles
168-
169161
####################################################
170162
# rules_js specific flags
171163
####################################################

‎.github/shared-actions/windows-bazel-test/action.yml

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
name: 'Native Windows Bazel e2e test'
2+
description: 'Runs an Angular CLI e2e Bazel test on native Windows (dispatched from inside WSL)'
3+
author: 'Angular'
4+
5+
inputs:
6+
test_target_name:
7+
description: E2E test target name
8+
required: true
9+
test_args:
10+
description: |
11+
Text representing the command line arguments that
12+
should be passed to the e2e test runner.
13+
required: false
14+
default: ''
15+
16+
runs:
17+
using: composite
18+
steps:
19+
- name: Setup Bazel RBE
20+
uses: angular/dev-infra/github-actions/bazel/configure-remote@2667d139a421977a40c3ea7ec768609fb19a8b9d
21+
with:
22+
allow_windows_rbe: true
23+
24+
- name: Initialize WSL
25+
id: init_wsl
26+
uses: angular/dev-infra/github-actions/setup-wsl@9a3e28a515bf51cd2ecfd5f4d5b17613845e6f44
27+
with:
28+
wsl_firewall_interface: 'vEthernet (WSL (Hyper-V firewall))'
29+
30+
- name: Install node modules in WSL (re-using from previous install/cache restore)
31+
run: |
32+
cd ${{steps.init_wsl.outputs.repo_path}}
33+
yarn install --immutable
34+
shell: wsl-bash {0}
35+
36+
- name: Build test binary for Windows (inside WSL)
37+
shell: wsl-bash {0}
38+
run: |
39+
cd ${{steps.init_wsl.outputs.repo_path}}
40+
yarn bazel \
41+
build --config=e2e //tests/legacy-cli:${{inputs.test_target_name}} --platforms=tools:windows_x64
42+
env:
43+
# See: https://devblogs.microsoft.com/commandline/share-environment-vars-between-wsl-and-windows
44+
WSLENV: 'GOOGLE_APPLICATION_CREDENTIALS/p'
45+
46+
- name: Copying binary artifact to host
47+
shell: wsl-bash {0}
48+
run: |
49+
cd ${{steps.init_wsl.outputs.repo_path}}
50+
tar -cf /tmp/test.tar.gz dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_
51+
mkdir /mnt/c/test
52+
mv /tmp/test.tar.gz /mnt/c/test
53+
(cd /mnt/c/test && tar -xf /mnt/c/test/test.tar.gz)
54+
55+
- name: Convert symlinks for Windows host
56+
shell: wsl-bash {0}
57+
run: |
58+
cd ${{steps.init_wsl.outputs.repo_path}}
59+
60+
runfiles_dir="/mnt/c/test/dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_/${{inputs.test_target_name}}.bat.runfiles"
61+
62+
# Make WSL symlinks compatible on Windows native file system.
63+
node scripts/windows-testing/convert-symlinks.mjs $runfiles_dir "${{steps.init_wsl.outputs.cmd_path}}"
64+
65+
# Needed for resolution because Aspect/Bazel looks for repositories at `<workspace>/external`.
66+
# TODO(devversion): consult with Aspect on why this is needed.
67+
(cd $runfiles_dir/angular_cli && ${{steps.init_wsl.outputs.cmd_path}} /C "mklink /D external ..")
68+
69+
- name: Run tests
70+
# Note: This is Git Bash.
71+
shell: bash
72+
env:
73+
BAZEL_BINDIR: '.'
74+
working-directory: "C:\\test"
75+
run: |
76+
node "${{github.workspace}}\\scripts\\windows-testing\\parallel-executor.mjs" \
77+
$PWD/dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_/${{inputs.test_target_name}}.bat.runfiles \
78+
${{inputs.test_target_name}} \
79+
"${{inputs.test_args}}" \

‎.github/workflows/ci.yml

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -74,23 +74,12 @@ jobs:
7474
strategy:
7575
fail-fast: false
7676
matrix:
77-
os: [ubuntu-latest, windows-latest]
77+
os: [ubuntu-latest]
7878
node: [18, 20, 22]
7979
subset: [npm, esbuild]
8080
shard: [0, 1, 2, 3, 4, 5]
81-
exclude:
82-
# Skip Node.js v18 tests on Windows
83-
- os: windows-latest
84-
node: 18
85-
# Skip Node.js v20 tests on Windows
86-
- os: windows-latest
87-
node: 20
8881
runs-on: ${{ matrix.os }}
8982
steps:
90-
# Workaround for: https://github.com/bazel-contrib/bazel-lib/issues/968.
91-
# TODO(devversion): Remove when Aspect lib issue is fixed.
92-
- run: choco install gzip
93-
if: ${{matrix.os == 'windows-latest'}}
9483
- name: Initialize environment
9584
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0ad6a370f70638e785d6ef1f90dc6ede34684a47
9685
- name: Install node modules
@@ -100,7 +89,27 @@ jobs:
10089
- name: Setup Bazel RBE
10190
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
10291
- name: Run CLI E2E tests
103-
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
92+
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
93+
94+
e2e_windows:
95+
strategy:
96+
fail-fast: false
97+
matrix:
98+
os: [windows-2025]
99+
node: [22]
100+
subset: [npm, esbuild]
101+
shard: [0, 1, 2, 3, 4, 5]
102+
runs-on: ${{ matrix.os }}
103+
steps:
104+
- name: Initialize environment
105+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0000d926624b2fd918e93f1c6b5e2defba9af91f
106+
- name: Run CLI E2E tests
107+
uses: ./.github/shared-actions/windows-bazel-test
108+
with:
109+
test_target_name: e2e.${{ matrix.subset }}_node${{ matrix.node }}
110+
env:
111+
E2E_SHARD_TOTAL: 6
112+
E2E_SHARD_INDEX: ${{ matrix.shard }}
104113

105114
e2e-package-managers:
106115
needs: test
@@ -122,7 +131,7 @@ jobs:
122131
- name: Setup Bazel RBE
123132
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
124133
- name: Run CLI E2E tests
125-
run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
134+
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
126135

127136
e2e-snapshots:
128137
needs: test
@@ -144,7 +153,7 @@ jobs:
144153
- name: Setup Bazel RBE
145154
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
146155
- name: Run CLI E2E tests
147-
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
156+
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
148157

149158
browsers:
150159
needs: build

‎.github/workflows/pr.yml

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -123,25 +123,19 @@ jobs:
123123
- name: Setup Bazel RBE
124124
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
125125
- name: Run CLI E2E tests
126-
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
126+
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
127127

128128
e2e-windows-subset:
129129
needs: build
130-
runs-on: windows-latest
130+
runs-on: windows-2025
131131
steps:
132-
# Workaround for: https://github.com/bazel-contrib/bazel-lib/issues/968.
133-
# TODO(devversion): Remove when Aspect lib issue is fixed.
134-
- run: choco install gzip
135132
- name: Initialize environment
136-
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0ad6a370f70638e785d6ef1f90dc6ede34684a47
137-
- name: Install node modules
138-
run: yarn install --immutable
139-
- name: Setup Bazel
140-
uses: angular/dev-infra/github-actions/bazel/setup@0ad6a370f70638e785d6ef1f90dc6ede34684a47
141-
- name: Setup Bazel RBE
142-
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
133+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0000d926624b2fd918e93f1c6b5e2defba9af91f
143134
- name: Run CLI E2E tests
144-
run: yarn bazel test --config=e2e //tests/legacy-cli:e2e_node22 --test_filter="tests/basic/{build,rebuild}.ts" --test_arg="--esbuild"
135+
uses: ./.github/shared-actions/windows-bazel-test
136+
with:
137+
test_target_name: e2e_node22
138+
test_args: --esbuild --glob "tests/basic/{build,rebuild}.ts"
145139

146140
e2e-package-managers:
147141
needs: build
@@ -163,7 +157,7 @@ jobs:
163157
- name: Setup Bazel RBE
164158
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
165159
- name: Run CLI E2E tests
166-
run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
160+
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=3 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}
167161

168162
e2e-snapshots:
169163
needs: [analyze, build]
@@ -186,4 +180,4 @@ jobs:
186180
- name: Setup Bazel RBE
187181
uses: angular/dev-infra/github-actions/bazel/configure-remote@0ad6a370f70638e785d6ef1f90dc6ede34684a47
188182
- name: Run CLI E2E tests
189-
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}
183+
run: yarn bazel test --test_env=E2E_SHARD_TOTAL=6 --test_env=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}

‎WORKSPACE

Lines changed: 16 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ workspace(name = "angular_cli")
22

33
DEFAULT_NODE_VERSION = "18.19.1"
44

5-
# Workaround for: https://github.com/bazel-contrib/bazel-lib/issues/968.
6-
# Override toolchain for tar on windows.
7-
register_toolchains(
8-
"//tools:windows_tar_system_toolchain",
9-
)
10-
115
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
126

137
http_archive(
@@ -160,17 +154,6 @@ aspect_bazel_lib_dependencies()
160154

161155
aspect_bazel_lib_register_toolchains()
162156

163-
register_toolchains(
164-
"@npm//@angular/build-tooling/bazel/git-toolchain:git_linux_toolchain",
165-
"@npm//@angular/build-tooling/bazel/git-toolchain:git_macos_x86_toolchain",
166-
"@npm//@angular/build-tooling/bazel/git-toolchain:git_macos_arm64_toolchain",
167-
"@npm//@angular/build-tooling/bazel/git-toolchain:git_windows_toolchain",
168-
)
169-
170-
load("@npm//@angular/build-tooling/bazel/browsers:browser_repositories.bzl", "browser_repositories")
171-
172-
browser_repositories()
173-
174157
load("@build_bazel_rules_nodejs//toolchains/esbuild:esbuild_repositories.bzl", "esbuild_repositories")
175158

176159
esbuild_repositories(
@@ -219,6 +202,10 @@ npm_translate_lock(
219202
# for `rules_nodejs` dependencies :)
220203
},
221204
pnpm_lock = "//:pnpm-lock.yaml",
205+
public_hoist_packages = {
206+
# TODO: Remove when https://github.com/verdaccio/verdaccio/commit/bf0e09a509e8e0a74167b0307d129202bc3f40d2 is available.
207+
"@verdaccio/config": [""],
208+
},
222209
update_pnpm_lock = True,
223210
verify_node_modules_ignored = "//:.bazelignore",
224211
yarn_lock = "//:yarn.lock",
@@ -230,8 +217,6 @@ npm_repositories()
230217

231218
http_archive(
232219
name = "aspect_rules_ts",
233-
patch_args = ["-p1"],
234-
patches = ["//tools:rules_ts_windows.patch"],
235220
sha256 = "4263532b2fb4d16f309d80e3597191a1cb2fb69c19e95d91711bd6b97874705e",
236221
strip_prefix = "rules_ts-3.5.0",
237222
url = "https://github.com/aspect-build/rules_ts/releases/download/v3.5.0/rules_ts-v3.5.0.tar.gz",
@@ -267,7 +252,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
267252

268253
git_repository(
269254
name = "devinfra",
270-
commit = "0ad6a370f70638e785d6ef1f90dc6ede34684a47",
255+
commit = "bf0dd632ed129ee8770b09a6e11c6497162b3edb",
271256
remote = "https://github.com/angular/dev-infra.git",
272257
)
273258

@@ -278,3 +263,14 @@ setup_dependencies_1()
278263
load("@devinfra//bazel:setup_dependencies_2.bzl", "setup_dependencies_2")
279264

280265
setup_dependencies_2()
266+
267+
load("@devinfra//bazel/browsers:browser_repositories.bzl", "browser_repositories")
268+
269+
browser_repositories()
270+
271+
register_toolchains(
272+
"@devinfra//bazel/git-toolchain:git_linux_toolchain",
273+
"@devinfra//bazel/git-toolchain:git_macos_x86_toolchain",
274+
"@devinfra//bazel/git-toolchain:git_macos_arm64_toolchain",
275+
"@devinfra//bazel/git-toolchain:git_windows_toolchain",
276+
)

‎goldens/BUILD.bazel

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
2+
13
package(default_visibility = ["//visibility:public"])
24

3-
filegroup(
5+
copy_to_bin(
46
name = "public-api",
57
srcs = glob([
68
"public-api/**/*.md",

‎package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@ampproject/remapping": "2.3.0",
4646
"@angular/animations": "19.2.0-rc.0",
4747
"@angular/bazel": "https://github.com/angular/bazel-builds.git#58e1a344eed2dfea489cd290a4b4a963f7e3ac65",
48-
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#a6a996a69cfc03b3fbe538f11dd24b7bc4b30592",
48+
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#d4727212a9d0f7eb63ae3116d73c769d9bd0bdc1",
4949
"@angular/cdk": "19.2.0-rc.0",
5050
"@angular/common": "19.2.0-rc.0",
5151
"@angular/compiler": "19.2.0-rc.0",
@@ -72,13 +72,13 @@
7272
"@babel/runtime": "7.26.9",
7373
"@bazel/bazelisk": "1.25.0",
7474
"@bazel/buildifier": "8.0.3",
75-
"@bazel/runfiles": "^6.0.0",
7675
"@discoveryjs/json-ext": "0.6.3",
7776
"@inquirer/confirm": "5.1.6",
7877
"@inquirer/prompts": "7.3.2",
7978
"@listr2/prompt-adapter-inquirer": "2.0.18",
8079
"@rollup/plugin-alias": "^5.1.1",
8180
"@rollup/plugin-commonjs": "^28.0.0",
81+
"@rollup/plugin-json": "^6.1.0",
8282
"@rollup/plugin-node-resolve": "^13.0.5",
8383
"@stylistic/eslint-plugin": "^3.0.0",
8484
"@types/babel__core": "7.20.5",

‎packages/angular/build/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
1+
load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
22
load("@npm2//:defs.bzl", "npm_link_all_packages")
33
load("//tools:defaults2.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
44
load("//tools:ts_json_schema.bzl", "ts_json_schema")
@@ -313,6 +313,6 @@ api_golden_test_npm_package(
313313
":npm_package",
314314
"//goldens:public-api",
315315
],
316-
golden_dir = "angular_cli/goldens/public-api/angular/build",
317-
npm_package = "angular_cli/packages/angular/build/npm_package",
316+
golden_dir = "goldens/public-api/angular/build",
317+
npm_package = "packages/angular/build/npm_package",
318318
)

‎packages/angular/ssr/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
load("@aspect_rules_js//npm:defs.bzl", "npm_package")
2-
load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
2+
load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
33
load("@npm2//:defs.bzl", "npm_link_all_packages")
44
load("@rules_pkg//:pkg.bzl", "pkg_tar")
55
load("//tools:defaults2.bzl", "ng_package", "ts_project")
@@ -90,6 +90,6 @@ api_golden_test_npm_package(
9090
":npm_package",
9191
"//goldens:public-api",
9292
],
93-
golden_dir = "angular_cli/goldens/public-api/angular/ssr",
94-
npm_package = "angular_cli/packages/angular/ssr/npm_package",
93+
golden_dir = "goldens/public-api/angular/ssr",
94+
npm_package = "packages/angular/ssr/npm_package",
9595
)

0 commit comments

Comments
 (0)