[pull] master from angular:master

.bazelrc

@@ -68,7 +68,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 -s ng-dev release build-env-stamp"
+build:release --workspace_status_command="yarn -s ng-dev release build-env-stamp --mode=release"
+build:release --stamp
+
+build:snapshot --workspace_status_command="yarn -s ng-dev release build-env-stamp --mode=snapshot"
+build:snapshot --stamp
+build:snapshot --//:enable_snapshot_repo_deps
+
+build:local --//:enable_package_json_tar_deps
 
 ###############################
 # Output                      #
@@ -92,8 +99,8 @@ test --test_output=errors
 ################################
 
 # Use the Angular team internal GCP instance for remote execution.
-build:remote --remote_instance_name=projects/internal-200822/instances/default_instance
-build:remote --project_id=internal-200822
+build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance
+build:remote --bes_instance_name=internal-200822
 
 # Starting with Bazel 0.27.0 strategies do not need to be explicitly
 # defined. See https://github.com/bazelbuild/bazel/issues/7480
@@ -105,20 +112,15 @@ build:remote --remote_executor=remotebuildexecution.googleapis.com
 build:remote --remote_timeout=600
 build:remote --jobs=150
 
- # Setup the toolchain and platform for the remote build execution. The platform
-# is automatically configured by the "rbe_autoconfig" rule in the project workpsace.
-build:remote --host_javabase=@rbe_ubuntu1604_angular//java:jdk
-build:remote --javabase=@rbe_ubuntu1604_angular//java:jdk
-build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
-build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
-build:remote --crosstool_top=@rbe_ubuntu1604_angular//cc:toolchain
-build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
-build:remote --extra_toolchains=@rbe_ubuntu1604_angular//config:cc-toolchain
-build:remote --extra_execution_platforms=//tools:rbe_ubuntu1604-angular
-build:remote --host_platform=//tools:rbe_ubuntu1604-angular
-build:remote --platforms=//tools:rbe_ubuntu1604-angular
-
- # Set remote caching settings
+# 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 --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite
+build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain
+build:remote --extra_execution_platforms=//tools:rbe_platform_with_network_access
+build:remote --host_platform=//tools:rbe_platform_with_network_access
+build:remote --platforms=//tools:rbe_platform_with_network_access
+
+# Set remote caching settings
 build:remote --remote_accept_cached=true
 
 # Force remote executions to consider the entire run as linux.

.bazelversion

@@ -1,3 +1 @@
-4.0.0
-# [NB: this comment has to be after the first line, see https://github.com/bazelbuild/bazelisk/issues/117]
-# When updating the Bazel version you also need to update the RBE toolchains version in WORKSPACE
+5.0.0

.circleci/config.yml

@@ -10,16 +10,16 @@
 version: 2.1
 
 orbs:
-  browser-tools: circleci/browser-tools@1.0.1
+  browser-tools: circleci/browser-tools@1.1.3
 
 # Variables
 
 ## IMPORTANT
 # Windows needs its own cache key because binaries in node_modules are different.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_1: &cache_key v1-angular_devkit-14.15-{{ checksum "yarn.lock" }}
-var_1_win: &cache_key_win v1-angular_devkit-win-12.22-{{ checksum "yarn.lock" }}
-var_3: &default_nodeversion '14.15'
+var_1: &cache_key v1-angular_devkit-14.19-{{ checksum "yarn.lock" }}
+var_1_win: &cache_key_win v1-angular_devkit-win-14.19-{{ checksum "yarn.lock" }}
+var_3: &default_nodeversion '14.19'
 # Workspace initially persisted by the `setup` job, and then enhanced by `setup-and-build-win`.
 # https://circleci.com/docs/2.0/workflows/#using-workspaces-to-share-data-among-jobs
 # https://circleci.com/blog/deep-diving-into-circleci-workspaces/
@@ -29,6 +29,8 @@ var_5: &only_release_branches
   filters:
     branches:
       only:
+        - main
+        # TODO(BRANCH_RENAME_CLEANUP): remove
         - master
         - /\d+\.\d+\.x/
 
@@ -68,15 +70,23 @@ executors:
 # Command Definitions
 # https://circleci.com/docs/2.0/reusing-config/#authoring-reusable-commands
 commands:
+  fail_fast:
+    steps:
+      - run:
+          name: 'Cancel workflow on fail'
+          when: on_fail
+          command: |
+            curl -X POST --header "Content-Type: application/json" "https://circleci.com/api/v2/workflow/${CIRCLE_WORKFLOW_ID}/cancel?circle-token=${CIRCLE_TOKEN}"
+
   custom_attach_workspace:
     description: Attach workspace at a predefined location
     steps:
       - attach_workspace:
           at: *workspace_location
   setup_windows:
     steps:
-      - run: nvm install 12.22.1
-      - run: nvm use 12.22.1
+      - run: nvm install 14.19
+      - run: nvm use 14.19
       - run: npm install -g [email protected]
       - run: node --version
       - run: yarn --version
@@ -97,7 +107,7 @@ commands:
             openssl aes-256-cbc -d -in .circleci/gcp_token -md md5 -k "${<< parameters.key >>}" -out /home/circleci/.gcp_credentials;
             sudo bash -c "echo -e 'build --google_credentials=/home/circleci/.gcp_credentials' >> .bazelrc.user";
             # Upload/don't upload local results to cache based on environment
-            if [[ -n "{$CIRCLE_PR_NUMBER}" ]]; then
+            if [[ -n "{$CIRCLE_PULL_REQUEST}" ]]; then
               sudo bash -c "echo -e 'build:remote --remote_upload_local_results=false\n' >> .bazelrc.user";
               echo "Not uploading local build results to remote cache.";
             else
@@ -154,11 +164,6 @@ jobs:
     steps:
       - custom_attach_workspace
       - run: yarn lint
-      - run: 'yarn bazel:format -mode=check ||
-          (echo "BUILD files not formatted. Please run ''yarn bazel:format''" ; exit 1)'
-      # Run the skylark linter to check our Bazel rules
-      - run: 'yarn bazel:lint ||
-          (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'
 
   validate:
     executor: action-executor
@@ -173,7 +178,16 @@ jobs:
               echo "This build is not over a PR, nothing to do."
             fi
       - run:
-          command: yarn -s admin validate --ci
+          name: Validate Code Formatting
+          command: yarn -s ng-dev format changed <<pipeline.git.base_revision>> --check
+      - run:
+          name: Validate NgBot Configuration
+          command: yarn ng-dev ngbot verify
+      - run:
+          name: Validate Circular Dependencies
+          command: yarn ts-circular-deps:check
+      - run: yarn -s admin validate
+      - run: yarn -s check-tooling-setup
 
   e2e-cli:
     parameters:
@@ -192,7 +206,10 @@ jobs:
       - browser-tools/install-chrome
       - run:
           name: Initialize Environment
-          command: ./.circleci/env.sh
+          # npm 7 currently does not properly publish the packages locally
+          command: |
+            ./.circleci/env.sh
+            sudo npm install --global npm@6
       - run:
           name: Execute CLI E2E Tests
           command: |
@@ -203,6 +220,12 @@ jobs:
           command: |
             mkdir /mnt/ramdisk/e2e-yarn
             node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --yarn --tmpdir=/mnt/ramdisk/e2e-yarn --glob="{tests/basic/**,tests/update/**,tests/commands/add/**}"
+      - run:
+          name: Execute CLI E2E Tests Subset with esbuild builder
+          command: |
+            mkdir /mnt/ramdisk/e2e-esbuild
+            node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --esbuild --tmpdir=/mnt/ramdisk/e2e-esbuild --glob="{tests/basic/**,tests/build/prod-build.ts}" --ignore="tests/basic/{environment,rebuild,serve,scripts-array}.ts"
+      - fail_fast
 
   test-browsers:
     executor:
@@ -228,6 +251,7 @@ jobs:
       - run: node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts --ve
       - run: node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts
       - run: ./scripts/saucelabs/stop-tunnel.sh
+      - fail_fast
 
   build:
     executor: action-executor
@@ -245,13 +269,17 @@ jobs:
       - run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
       - run:
           command: yarn bazel:test
-          no_output_timeout: 20m
+          # This timeout provides time for the actual tests to timeout and report status
+          # instead of CircleCI stopping the job without test failure information.
+          no_output_timeout: 40m
+      - fail_fast
 
   snapshot_publish:
     executor: action-executor
     resource_class: medium
     steps:
       - custom_attach_workspace
+      - install_python
       - run:
           name: Decrypt Credentials
           # Note: when changing the image, you might have to re-encrypt the credentials with a
@@ -263,13 +291,26 @@ jobs:
           name: Deployment to Snapshot
           command: |
             yarn admin snapshots --verbose --githubTokenFile=${HOME}/github_token
+      - fail_fast
 
   # Windows jobs
   e2e-cli-win:
     executor: windows-executor
     parallelism: 8
     steps:
-      - custom_attach_workspace
+      - checkout
+      - run:
+          name: Rebase PR on target branch
+          command: |
+            if (Test-Path env:CIRCLE_PR_NUMBER) {
+              # User is required for rebase.
+              git config user.name "angular-ci"
+              git config user.email "angular-ci"
+              # Rebase PR on top of target branch.
+              node tools/rebase-pr.js angular/angular-cli $env:CIRCLE_PR_NUMBER
+            } else {
+              echo "This build is not over a PR, nothing to do."
+            }
       - setup_windows
       - restore_cache:
           keys:
@@ -283,11 +324,12 @@ jobs:
       - run:
           name: Execute E2E Tests
           command: |
-            if (Test-Path env:CIRCLE_PR_NUMBER) {
-              node tests\legacy-cli\run_e2e.js "--glob={tests/basic/**,tests/i18n/extract-ivy*.ts,tests/build/profile.ts}" --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX
+            if (Test-Path env:CIRCLE_PULL_REQUEST) {
+              node tests\legacy-cli\run_e2e.js "--glob={tests/basic/**,tests/i18n/extract-ivy*.ts,tests/build/profile.ts,tests/test/test-sourcemap.ts}" --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX
             } else {
               node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX
             }
+      - fail_fast
 
 workflows:
   version: 2
@@ -306,6 +348,7 @@ workflows:
             - setup
       - e2e-cli:
           name: e2e-cli
+          nodeversion: '14.15'
           post-steps:
             - store_artifacts:
                 path: /tmp/dist
@@ -316,18 +359,20 @@ workflows:
           name: e2e-cli-ng-snapshots
           snapshots: true
           requires:
-            - e2e-cli
+            - build
           filters:
             branches:
               only:
                 - renovate/angular
+                - main
+                # TODO(BRANCH_RENAME_CLEANUP): remove
                 - master
       - e2e-cli:
-          name: e2e-cli-node-12
-          nodeversion: '12.18'
+          name: e2e-cli-node-16
+          nodeversion: '16.10'
           <<: *only_release_branches
           requires:
-            - e2e-cli
+            - build
       - test-browsers:
           requires:
             - build
@@ -343,7 +388,7 @@ workflows:
       # Windows jobs
       - e2e-cli-win:
           requires:
-            - test
+            - build
 
       # Publish jobs
       - snapshot_publish:

.eslintignore

@@ -0,0 +1,13 @@
+/bazel-out/
+/dist-schema/
+/goldens/public-api
+/packages/angular_devkit/build_angular/test/
+/packages/angular_devkit/build_webpack/test/
+/packages/angular_devkit/schematics_cli/blank/project-files/
+/packages/angular_devkit/schematics_cli/blank/schematic-files/
+/packages/angular_devkit/schematics_cli/schematic/files/
+/tests/
+.yarn/
+dist/
+node_modules/
+third_party/