Merge pull request #1106 from angular/main

Create a new pull request by comparing changes across two branches.

Author: GulajavaMinistudio

.aspect/rules/external_repository_action_cache/npm_translate_lock_MzA5NzUwNzMx

@@ -16,3 +16,5 @@ packages/angular_devkit/schematics_cli/node_modules
 packages/ngtools/webpack/node_modules
 packages/schematics/angular/node_modules
 modules/testing/builder/node_modules
+tests/node_modules
+tools/baseline_browserslist/node_modules

.bazelignore

@@ -33,18 +33,14 @@ 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
 
 # Turn on --incompatible_strict_action_env which was on by default
 # in Bazel 0.21.0 but turned off again in 0.22.0. Follow
 # https://github.com/bazelbuild/bazel/issues/7026 for more details.
 # This flag is needed to so that the bazel cache is not invalidated
-# when running bazel via `yarn bazel`.
+# when running bazel via `pnpm bazel`.
 # See https://github.com/angular/angular/issues/27514.
 build --incompatible_strict_action_env
 run --incompatible_strict_action_env
@@ -56,9 +52,6 @@ build --experimental_remote_merkle_tree_cache
 # Ensure that tags applied in BUILDs propagate to actions
 common --experimental_allow_tags_propagation
 
-# Don't check if output files have been modified
-build --noexperimental_check_output_files
-
 # Ensure sandboxing is enabled even for exclusive tests
 test --incompatible_exclusive_test_sandboxed
 
@@ -87,14 +80,14 @@ test:saucelabs --define=KARMA_WEB_TEST_MODE=SL_REQUIRED
 # Releases should always be stamped with version control info
 # This command assumes node on the path and is a workaround for
 # https://github.com/bazelbuild/bazel/issues/4802
-build:release --workspace_status_command="yarn ng-dev release build-env-stamp --mode=release"
+build:release --workspace_status_command="pnpm -s ng-dev release build-env-stamp --mode=release"
 build:release --stamp
 
-build:snapshot --workspace_status_command="yarn ng-dev release build-env-stamp --mode=snapshot"
+build:snapshot --workspace_status_command="pnpm -s ng-dev release build-env-stamp --mode=snapshot"
 build:snapshot --stamp
 build:snapshot --//:enable_snapshot_repo_deps
 
-build:e2e --workspace_status_command="yarn ng-dev release build-env-stamp --mode=release"
+build:e2e --workspace_status_command="pnpm -s ng-dev release build-env-stamp --mode=release"
 build:e2e --stamp
 test:e2e --test_timeout=3600 --experimental_ui_max_stdouterr_bytes=2097152
 
@@ -133,12 +126,13 @@ build:remote --jobs=150
 
 # Setup the toolchain and platform for the remote build execution. The platform
 # is provided by the shared dev-infra package and targets k8 remote containers.
-build:remote --extra_execution_platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
-build:remote --host_platform=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
-build:remote --platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform_with_network
+build:remote --extra_execution_platforms=@devinfra//bazel/remote-execution:platform_with_network
+build:remote --host_platform=@devinfra//bazel/remote-execution:platform_with_network
+build:remote --platforms=@devinfra//bazel/remote-execution:platform_with_network
 
 # Set remote caching settings
 build:remote --remote_accept_cached=true
+build:remote --remote_upload_local_results=false
 
 # Force remote executions to consider the entire run as linux.
 # This is required for OSX cross-platform RBE.
@@ -151,21 +145,16 @@ build:remote --google_default_credentials
 # Use HTTP remote cache
 build:remote-cache --remote_cache=https://storage.googleapis.com/angular-team-cache
 build:remote-cache --remote_accept_cached=true
-build:remote-cache --remote_upload_local_results=true
+build:remote-cache --remote_upload_local_results=false
 build:remote-cache --google_default_credentials
 
-###############################
-# NodeJS rules settings
-# These settings are required for rules_nodejs
-###############################
+# Additional flags added when running a "trusted build" with additional access
+build:trusted-build --remote_upload_local_results=true
 
-# Fixes use of npm paths with spaces such as some within the puppeteer module
+# Fixes issues with browser archives and files with spaces. Could be
+# removed in Bazel 8 when Bazel runfiles supports spaces.
 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
 ####################################################
@@ -174,6 +163,11 @@ build --enable_runfiles
 # Prevents the npm package extract from occuring or caching on RBE which overwhelms our quota
 build --modify_execution_info=NpmPackageExtract=+no-remote
 
+# Allow the Bazel server to check directory sources for changes. `rules_js` previously
+# heavily relied on this, but still uses directory "inputs" in some cases.
+# See: https://github.com/aspect-build/rules_js/issues/1408.
+startup --host_jvm_args=-DBAZEL_TRACK_SOURCE_DIRECTORIES=1
+
 ####################################################
 # User bazel configuration
 # NOTE: This needs to be the *last* entry in the config.

.bazelrc

@@ -1 +1 @@
-6.5.0
+7.6.1

.bazelversion

@@ -0,0 +1,78 @@
+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: |
+      Text representing the command line arguments that
+      should be passed to the e2e test runner.
+    required: false
+    default: ''
+
+runs:
+  using: composite
+  steps:
+    - name: Initialize WSL
+      id: init_wsl
+      uses: angular/dev-infra/github-actions/setup-wsl@43b8195028f62c7a10f793a0f7c48893531a32dc
+      with:
+        wsl_firewall_interface: 'vEthernet (WSL (Hyper-V firewall))'
+
+    - name: Installing pnpm (in WSL)
+      run: npm install -g pnpm@9
+      shell: wsl-bash {0}
+
+    - name: Install node modules in WSL (re-using from previous install/cache restore)
+      run: |
+        cd ${{steps.init_wsl.outputs.repo_path}}
+        pnpm install --frozen-lockfile
+      shell: wsl-bash {0}
+
+    - name: Build test binary for Windows (inside WSL)
+      shell: wsl-bash {0}
+      run: |
+        cd ${{steps.init_wsl.outputs.repo_path}}
+        pnpm 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}
+      run: |
+        cd ${{steps.init_wsl.outputs.repo_path}}
+        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}
+      run: |
+        cd ${{steps.init_wsl.outputs.repo_path}}
+
+        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 because Aspect/Bazel looks for repositories at `<workspace>/external`.
+        # TODO(devversion): consult with Aspect on why this is needed.
+        (cd $runfiles_dir/_main && ${{steps.init_wsl.outputs.cmd_path}} /C "mklink /D external ..")
+
+    - name: Run tests
+      # Note: This is Git Bash.
+      shell: bash
+      env:
+        BAZEL_BINDIR: '.'
+      working-directory: "C:\\test"
+      run: |
+        node "${{github.workspace}}\\scripts\\windows-testing\\parallel-executor.mjs" \
+          $PWD/dist/bin/tests/legacy-cli/${{inputs.test_target_name}}_/${{inputs.test_target_name}}.bat.runfiles \
+          ${{inputs.test_target_name}} \
+          "${{inputs.test_args}}" \

.eslintrc.json

@@ -16,6 +16,6 @@ jobs:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
           persist-credentials: false
-      - uses: angular/dev-infra/github-actions/branch-manager@15db94d9a481826aed42ecf761c263c981931c9c
+      - uses: angular/dev-infra/github-actions/branch-manager@43b8195028f62c7a10f793a0f7c48893531a32dc
         with:
           angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}