build: update dev-infra and rework windows native testing

TODO

Author: devversion

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

@@ -3,7 +3,7 @@
 # This file should be checked into version control along with the pnpm-lock.yaml file.
 .npmrc=-1406867100
 modules/testing/builder/package.json=973445093
-package.json=2015726282
+package.json=2141805065
 packages/angular/build/package.json=-1114621695
 packages/angular/cli/package.json=-1917515334
 packages/angular/pwa/package.json=1108903917
@@ -17,7 +17,7 @@ packages/angular_devkit/schematics/package.json=-1133510866
 packages/angular_devkit/schematics_cli/package.json=-2026655035
 packages/ngtools/webpack/package.json=605871936
 packages/schematics/angular/package.json=251715148
-pnpm-lock.yaml=-592767080
+pnpm-lock.yaml=336439828
 pnpm-workspace.yaml=-1264044456
 tests/package.json=700948366
-yarn.lock=-1726238563
+yarn.lock=1375668228

.bazelrc

@@ -33,10 +33,6 @@ test:no-sharding --flaky_test_attempts=1 --test_sharding_strategy=disabled
 # See https://github.com/bazelbuild/bazel/issues/4603
 build --symlink_prefix=dist/
 
-# Disable watchfs as it causes tests to be flaky on Windows
-# https://github.com/angular/angular/issues/29541
-build --nowatchfs
-
 # Turn off legacy external runfiles
 build --nolegacy_external_runfiles
 
@@ -162,10 +158,6 @@ build:remote-cache --google_default_credentials
 # Fixes use of npm paths with spaces such as some within the puppeteer module
 build --experimental_inprocess_symlink_creation
 
-# Enable runfiles even on Windows.
-# Architect resolves output files from data files, and this isn't possible without runfile support.
-build --enable_runfiles
-
 ####################################################
 # rules_js specific flags
 ####################################################

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

@@ -0,0 +1,73 @@
+name: 'Native Windows Bazel e2e test'
+description: 'Runs an Angular CLI e2e Bazel test on native Windows (dispatched from inside WSL)'
+author: 'Angular'
+
+inputs:
+  test_target_name:
+    description: E2E test target name
+    required: true
+  test_args:
+    description: |
+      TODO
+    required: false
+    default: ''
+
+runs:
+  using: composite
+  steps:
+    - name: Setup Bazel RBE
+      uses: angular/dev-infra/github-actions/bazel/configure-remote@2667d139a421977a40c3ea7ec768609fb19a8b9d
+      with:
+        allow_windows_rbe: true
+
+    - name: Initialize WSL
+      id: init_wsl
+      uses: angular/dev-infra/github-actions/setup-wsl@1e0e2edff67a23e606df18ac8a25a59249f23a60
+      with:
+        wsl_firewall_interface: 'vEthernet (WSL (Hyper-V firewall))'
+
+    - name: Install node modules in WSL (re-using from previous install/cache restore)
+      run: yarn install --immutable
+      working-directory: ${{steps.init_wsl.outputs.repo_path}}
+      shell: wsl-bash {0}
+
+    - name: Build test binary for Windows (inside WSL)
+      shell: wsl-bash {0}
+      working-directory: ${{steps.init_wsl.outputs.repo_path}}
+      run: |
+        yarn bazel \
+          build --config=e2e //tests/legacy-cli:${{inputs.test_target_name}} --platforms=tools:windows_x64
+      env:
+        # See: https://devblogs.microsoft.com/commandline/share-environment-vars-between-wsl-and-windows
+        WSLENV: 'GOOGLE_APPLICATION_CREDENTIALS/p'
+
+    - name: Copying binary artifact to host
+      shell: wsl-bash {0}
+      working-directory: ${{steps.init_wsl.outputs.repo_path}}
+      run: |
+        tar -cf /tmp/test.tar.gz dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_
+        mkdir /mnt/c/test
+        mv /tmp/test.tar.gz /mnt/c/test
+        (cd /mnt/c/test && tar -xf /mnt/c/test/test.tar.gz)
+
+    - name: Convert symlinks for Windows host
+      shell: wsl-bash {0}
+      working-directory: ${{steps.init_wsl.outputs.repo_path}}
+      run: |
+        runfiles_dir="/mnt/c/test/dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_/${{inputs.test_target_name}}.bat.runfiles"
+
+        # Make WSL symlinks compatible on Windows native file system.
+        node scripts/windows-testing/convert-symlinks.mjs $runfiles_dir "${{steps.init_wsl.outputs.cmd_path}}"
+
+        # Needed for resolution.
+        # TODO(devversion): consult with Aspect on why this is needed.
+        (cd $runfiles_dir/angular_cli && ${{steps.init_wsl.outputs.cmd_path}} /C "mklink /D external ..")
+
+    - name: Run tests
+      shell: bash # Note: This is Git Bash.
+      env:
+        BAZEL_BINDIR: '.'
+      working-directory: "C:\\test"
+      run: |
+        cd dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_/${{inputs.test_target_name}}.bat.runfiles/angular_cli
+        ../../${{inputs.test_target_name}} ${{inputs.test_args}}

.github/workflows/ci.yml

@@ -84,9 +84,7 @@ jobs:
             node: 20
     runs-on: ${{ matrix.os }}
     steps:
-      # Workaround for: https://github.com/bazel-contrib/bazel-lib/issues/968.
-      # TODO(devversion): Remove when Aspect lib issue is fixed.
-      - run: choco install gzip
+      - uses: Vampire/setup-wsl@v4
         if: ${{matrix.os == 'windows-latest'}}
       - name: Initialize environment
         uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43

.github/workflows/pr.yml

@@ -126,22 +126,42 @@ jobs:
         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 }}
 
   e2e-windows-subset:
-    needs: build
-    runs-on: windows-latest
+    # needs: build
+    runs-on: windows-2025
+    env:
+      ACTIONS_STEP_DEBUG: 'true'
     steps:
-      # Workaround for: https://github.com/bazel-contrib/bazel-lib/issues/968.
-      # TODO(devversion): Remove when Aspect lib issue is fixed.
-      - run: choco install gzip
       - name: Initialize environment
-        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b3240b00315baa96f1b2deea2f71315f870dbb43
-      - name: Install node modules
-        run: yarn install --immutable
-      - name: Setup Bazel
-        uses: angular/dev-infra/github-actions/bazel/setup@b3240b00315baa96f1b2deea2f71315f870dbb43
-      - name: Setup Bazel RBE
-        uses: angular/dev-infra/github-actions/bazel/configure-remote@b3240b00315baa96f1b2deea2f71315f870dbb43
-      - name: Run CLI E2E tests
-        run: yarn bazel test --config=e2e //tests/legacy-cli:e2e_node22 --test_filter="tests/basic/{build,rebuild}.ts" --test_arg="--esbuild"
+        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@0000d926624b2fd918e93f1c6b5e2defba9af91f
+      - run: ls -alh D:/a/angular-cli/angular-cli
+        shell: bash
+      #- name: Run CLI E2E tests
+      #  uses: ./.github/shared-actions/windows-bazel-test
+      #  with:
+      #    test_target_name: e2e_node22
+      #    test_args: --esbuild --glob "tests/basic/{build,rebuild}.ts"
+      - run: ls -alh D:/a/angular-cli/angular-cli
+        shell: bash
+
+  #  e2e_windows:
+  #    strategy:
+  #      fail-fast: false
+  #      matrix:
+  #        os: [windows-2025]
+  #        node: [22]
+  #        subset: [npm, esbuild]
+  #        shard: [0, 1, 2, 3, 4, 5]
+  #    runs-on: ${{ matrix.os }}
+  #    steps:
+  #      - name: Initialize environment
+  #        uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@d16848fd2ed19fce59488b540fa26a3353c72ad4
+  #      - name: Run CLI E2E tests
+  #        uses: ./.github/shared-actions/windows-bazel-test
+  #        with:
+  #          command: |
+  #            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 }} \
 
   e2e-package-managers:
     needs: build

WORKSPACE

@@ -2,12 +2,6 @@ workspace(name = "angular_cli")
 
 DEFAULT_NODE_VERSION = "20.11.1"
 
-# Workaround for: https://github.com/bazel-contrib/bazel-lib/issues/968.
-# Override toolchain for tar on windows.
-register_toolchains(
-    "//tools:windows_tar_system_toolchain",
-)
-
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file")
 
 http_archive(
@@ -145,13 +139,6 @@ aspect_bazel_lib_dependencies()
 
 aspect_bazel_lib_register_toolchains()
 
-register_toolchains(
-    "@npm//@angular/build-tooling/bazel/git-toolchain:git_linux_toolchain",
-    "@npm//@angular/build-tooling/bazel/git-toolchain:git_macos_x86_toolchain",
-    "@npm//@angular/build-tooling/bazel/git-toolchain:git_macos_arm64_toolchain",
-    "@npm//@angular/build-tooling/bazel/git-toolchain:git_windows_toolchain",
-)
-
 load("@npm//@angular/build-tooling/bazel/browsers:browser_repositories.bzl", "browser_repositories")
 
 browser_repositories()
@@ -205,6 +192,13 @@ npm_translate_lock(
         # for `rules_nodejs` dependencies :)
     },
     pnpm_lock = "//:pnpm-lock.yaml",
+    public_hoist_packages = {
+        # Pino of Verdaccio can't be bundled, so we make it loadable as runtime dep.
+        # Similarly, logger-prettify is dynamically loaded at runtime.
+        "pino": [""],
+        "@verdaccio/config": [""],
+        "@verdaccio/logger-prettify": [""],
+    },
     update_pnpm_lock = True,
     verify_node_modules_ignored = "//:.bazelignore",
     yarn_lock = "//:yarn.lock",
@@ -216,8 +210,6 @@ npm_repositories()
 
 http_archive(
     name = "aspect_rules_ts",
-    patch_args = ["-p1"],
-    patches = ["//tools:rules_ts_windows.patch"],
     sha256 = "4263532b2fb4d16f309d80e3597191a1cb2fb69c19e95d91711bd6b97874705e",
     strip_prefix = "rules_ts-3.5.0",
     url = "https://github.com/aspect-build/rules_ts/releases/download/v3.5.0/rules_ts-v3.5.0.tar.gz",
@@ -253,7 +245,7 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 git_repository(
     name = "devinfra",
-    commit = "0ad6a370f70638e785d6ef1f90dc6ede34684a47",
+    commit = "0f920f422b8bbf1ca96a72cf01e18b95e266dc98",
     remote = "https://github.com/angular/dev-infra.git",
 )
 
@@ -264,3 +256,10 @@ setup_dependencies_1()
 load("@devinfra//bazel:setup_dependencies_2.bzl", "setup_dependencies_2")
 
 setup_dependencies_2()
+
+register_toolchains(
+    "@devinfra//bazel/git-toolchain:git_linux_toolchain",
+    "@devinfra//bazel/git-toolchain:git_macos_x86_toolchain",
+    "@devinfra//bazel/git-toolchain:git_macos_arm64_toolchain",
+    "@devinfra//bazel/git-toolchain:git_windows_toolchain",
+)

goldens/BUILD.bazel

@@ -1,6 +1,8 @@
+load("@aspect_bazel_lib//lib:copy_to_bin.bzl", "copy_to_bin")
+
 package(default_visibility = ["//visibility:public"])
 
-filegroup(
+copy_to_bin(
     name = "public-api",
     srcs = glob([
         "public-api/**/*.md",

package.json

@@ -44,8 +44,8 @@
   "devDependencies": {
     "@ampproject/remapping": "2.3.0",
     "@angular/animations": "19.2.0-rc.0",
-    "@angular/bazel": "https://github.com/angular/bazel-builds.git#17b980a15a1adbff7f09dfad04236abadaa6cbe5",
-    "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#a6a996a69cfc03b3fbe538f11dd24b7bc4b30592",
+    "@angular/bazel": "https://github.com/angular/bazel-builds.git#58e1a344eed2dfea489cd290a4b4a963f7e3ac65",
+    "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#d4727212a9d0f7eb63ae3116d73c769d9bd0bdc1",
     "@angular/cdk": "19.2.0-rc.0",
     "@angular/common": "19.2.0-rc.0",
     "@angular/compiler": "19.2.0-rc.0",
@@ -82,6 +82,7 @@
     "@listr2/prompt-adapter-inquirer": "2.0.18",
     "@rollup/plugin-alias": "^5.1.1",
     "@rollup/plugin-commonjs": "^28.0.0",
+    "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^13.0.5",
     "@stylistic/eslint-plugin": "^4.0.0",
     "@types/babel__core": "7.20.5",

packages/angular/build/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults2.bzl", "copy_to_bin", "jasmine_test", "npm_package", "ts_project")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")

packages/ngtools/webpack/BUILD.bazel

@@ -3,7 +3,7 @@
 # Use of this source code is governed by an MIT-style license that can be
 # found in the LICENSE file at https://angular.dev/license
 
-load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@devinfra//bazel/api-golden:index_rjs.bzl", "api_golden_test_npm_package")
 load("@npm2//:defs.bzl", "npm_link_all_packages")
 load("//tools:defaults2.bzl", "jasmine_test", "npm_package", "ts_project")