docs: improve startup nav, naming, and terminology

.circleci/bazel.linux.rc

@@ -14,7 +14,8 @@ build --repository_cache=/home/circleci/bazel_repository_cache
 # Bazel doesn't calculate the memory ceiling correctly when running under Docker.
 # Limit Bazel to consuming resources that fit in CircleCI "xlarge" class
 # https://circleci.com/docs/2.0/configuration-reference/#resource_class
-build --local_resources=14336,8.0,1.0
+build --local_cpu_resources=8
+build --local_ram_resources=14336
 
 # All build executed remotely should be done using our RBE configuration.
 build:remote --google_default_credentials

.circleci/bazel.windows.rc

@@ -10,6 +10,10 @@ try-import %workspace%/.circleci/bazel.common.rc
 # speeding up the analysis time significantly with Bazel managed node dependencies on the CI.
 build --repository_cache=C:/Users/circleci/bazel_repository_cache
 
+# Manually set the local resources used in windows CI runs
+build --local_ram_resources=13500
+build --local_cpu_resources=4
+
 # All windows jobs run on master and should use http caching
 build --remote_http_cache=https://storage.googleapis.com/angular-team-cache
 build --remote_accept_cached=true

.circleci/config.yml

@@ -22,18 +22,18 @@ version: 2.1
 # **NOTE 1 **: If you change the cache key prefix, also sync the cache_key_fallback to match.
 # **NOTE 2 **: Keep the static part of the cache key as prefix to enable correct fallbacks.
 # See https://circleci.com/docs/2.0/caching/#restoring-cache for how prefixes work in CircleCI.
-var_3: &cache_key v4-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
+var_3: &cache_key v6-angular-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
 # We invalidate the cache if the Bazel version changes because otherwise the `bazelisk` cache
 # folder will contain all previously used versions and ultimately cause the cache restoring to
 # be slower due to its growing size.
-var_4: &cache_key_fallback v4-angular-node-12-{{ checksum ".bazelversion" }}
-var_3_win: &cache_key_win v5-angular-win-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
-var_4_win: &cache_key_win_fallback v5-angular-win-node-12-{{ checksum ".bazelversion" }}
+var_4: &cache_key_fallback v6-angular-node-12-{{ checksum ".bazelversion" }}
+var_3_win: &cache_key_win v6-angular-win-node-12-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "packages/bazel/package.bzl" }}-{{ checksum "aio/yarn.lock" }}
+var_4_win: &cache_key_win_fallback v6-angular-win-node-12-{{ checksum ".bazelversion" }}
 
 # Cache key for the `components-repo-unit-tests` job. **Note** when updating the SHA in the
 # cache keys also update the SHA for the "COMPONENTS_REPO_COMMIT" environment variable.
-var_5: &components_repo_unit_tests_cache_key v5-angular-components-598db096e668aa7e9debd56eedfd127b7a55e371
-var_6: &components_repo_unit_tests_cache_key_fallback v5-angular-components-
+var_5: &components_repo_unit_tests_cache_key v6-angular-components-598db096e668aa7e9debd56eedfd127b7a55e371
+var_6: &components_repo_unit_tests_cache_key_fallback v6-angular-components-
 
 # Workspace initially persisted by the `setup` job, and then enhanced by `build-npm-packages` and
 # `build-ivy-npm-packages`.
@@ -226,6 +226,7 @@ jobs:
     executor: default-executor
     steps:
       - checkout
+      - init_environment
       - run:
           name: Rebase PR on target branch
           # After checkout, rebase on top of target branch.
@@ -235,7 +236,7 @@ jobs:
               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 ${CIRCLE_PR_NUMBER}
+              node tools/rebase-pr.js
             else
               echo "This build is not over a PR, nothing to do."
             fi
@@ -244,7 +245,6 @@ jobs:
           keys:
             - *cache_key
             - *cache_key_fallback
-      - init_environment
       - run:
           name: Running Yarn install
           command: yarn install --frozen-lockfile --non-interactive
@@ -278,9 +278,10 @@ jobs:
       - run: 'yarn bazel:lint ||
               (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'
 
-      - run: yarn lint
-      - run: yarn ts-circular-deps:check
-      - run: node tools/pullapprove/verify.js
+      - run: yarn -s lint --branch $CI_GIT_BASE_REVISION
+      - run: yarn -s ts-circular-deps:check
+      - run: yarn -s ng-dev pullapprove verify
+      - run: yarn -s ng-dev commit-message validate-range --range $CI_COMMIT_RANGE
 
   test:
     executor:
@@ -454,7 +455,7 @@ jobs:
 
   test_docs_examples:
     parameters:
-      ivy:
+      viewengine:
         type: boolean
         default: false
     executor:
@@ -470,7 +471,7 @@ jobs:
         # Run examples tests. The "CIRCLE_NODE_INDEX" will be set if "parallelism" is enabled.
         # Since the parallelism is set to "5", there will be five parallel CircleCI containers.
         # with either "0", "1", etc as node index. This can be passed to the "--shard" argument.
-      - run: yarn --cwd aio example-e2e --setup --local <<# parameters.ivy >>--ivy<</ parameters.ivy >> --cliSpecsConcurrency=5 --shard=${CIRCLE_NODE_INDEX}/${CIRCLE_NODE_TOTAL} --retry 2
+      - run: yarn --cwd aio example-e2e --setup --local <<# parameters.viewengine >>--viewengine<</ parameters.viewengine >> --cliSpecsConcurrency=5 --shard=${CIRCLE_NODE_INDEX}/${CIRCLE_NODE_TOTAL} --retry 2
 
   # This job should only be run on PR builds, where `CI_PULL_REQUEST` is not `false`.
   aio_preview:
@@ -822,8 +823,8 @@ workflows:
           requires:
             - build-npm-packages
       - test_docs_examples:
-          name: test_docs_examples_ivy
-          ivy: true
+          name: test_docs_examples_viewengine
+          viewengine: true
           requires:
             - build-npm-packages
       - aio_preview:
@@ -850,7 +851,7 @@ workflows:
             - test_aio_local
             - test_aio_local_viewengine
             - test_docs_examples
-            - test_docs_examples_ivy
+            - test_docs_examples_viewengine
             # Get the artifacts to publish from the build-packages-dist job
             # since the publishing script expects the legacy outputs layout.
             - build-npm-packages

.circleci/env.sh

@@ -3,72 +3,89 @@
 # Variables
 readonly projectDir=$(realpath "$(dirname ${BASH_SOURCE[0]})/..")
 readonly envHelpersPath="$projectDir/.circleci/env-helpers.inc.sh";
-
-# Load helpers and make them available everywhere (through `$BASH_ENV`).
-source $envHelpersPath;
-echo "source $envHelpersPath;" >> $BASH_ENV;
-
-
-####################################################################################################
-# Define PUBLIC environment variables for CircleCI.
-####################################################################################################
-# See https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables for more info.
-####################################################################################################
-setPublicVar PROJECT_ROOT "$projectDir";
-setPublicVar CI_AIO_MIN_PWA_SCORE "95";
-# This is the branch being built; e.g. `pull/12345` for PR builds.
-setPublicVar CI_BRANCH "$CIRCLE_BRANCH";
-setPublicVar CI_BUILD_URL "$CIRCLE_BUILD_URL";
-setPublicVar CI_COMMIT "$CIRCLE_SHA1";
-# `CI_COMMIT_RANGE` is only used on push builds (a.k.a. non-PR, non-scheduled builds and rerun
-# workflows of such builds).
-setPublicVar CI_COMMIT_RANGE "$CIRCLE_GIT_BASE_REVISION..$CIRCLE_GIT_REVISION";
-setPublicVar CI_PULL_REQUEST "${CIRCLE_PR_NUMBER:-false}";
-setPublicVar CI_REPO_NAME "$CIRCLE_PROJECT_REPONAME";
-setPublicVar CI_REPO_OWNER "$CIRCLE_PROJECT_USERNAME";
-
-
-####################################################################################################
-# Define "lazy" PUBLIC environment variables for CircleCI.
-# (I.e. functions to set an environment variable when called.)
-####################################################################################################
-createPublicVarSetter CI_STABLE_BRANCH "\$(npm info @angular/core dist-tags.latest | sed -r 's/^\\s*([0-9]+\\.[0-9]+)\\.[0-9]+.*$/\\1.x/')";
-
-
-####################################################################################################
-# Define SECRET environment variables for CircleCI.
-####################################################################################################
-setSecretVar CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN "$AIO_DEPLOY_TOKEN";
-setSecretVar CI_SECRET_PAYLOAD_FIREBASE_TOKEN "$ANGULAR_PAYLOAD_TOKEN";
-
-
-####################################################################################################
-# Define SauceLabs environment variables for CircleCI.
-####################################################################################################
-setPublicVar SAUCE_USERNAME "angular-framework";
-setSecretVar SAUCE_ACCESS_KEY "0c731274ed5f-cbc9-16f4-021a-9835e39f";
-# TODO(josephperrott): Remove environment variables once all saucelabs tests are via bazel method.
-setPublicVar SAUCE_LOG_FILE /tmp/angular/sauce-connect.log
-setPublicVar SAUCE_READY_FILE /tmp/angular/sauce-connect-ready-file.lock
-setPublicVar SAUCE_PID_FILE /tmp/angular/sauce-connect-pid-file.lock
-setPublicVar SAUCE_TUNNEL_IDENTIFIER "angular-framework-${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_INDEX}"
-# Amount of seconds we wait for sauceconnect to establish a tunnel instance. In order to not
-# acquire CircleCI instances for too long if sauceconnect failed, we need a connect timeout.
-setPublicVar SAUCE_READY_FILE_TIMEOUT 120
-
-
-####################################################################################################
-# Define environment variables for the `angular/components` repo unit tests job.
-####################################################################################################
-# We specifically use a directory within "/tmp" here because we want the cloned repo to be
-# completely isolated from angular/angular in order to avoid any bad interactions between
-# their separate build setups. **NOTE**: When updating the temporary directory, also update
-# the `save_cache` path configuration in `config.yml`
-setPublicVar COMPONENTS_REPO_TMP_DIR "/tmp/angular-components-repo"
-setPublicVar COMPONENTS_REPO_URL "https://github.com/angular/components.git"
-setPublicVar COMPONENTS_REPO_BRANCH "master"
-# **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI `config.yml`.
-setPublicVar COMPONENTS_REPO_COMMIT "598db096e668aa7e9debd56eedfd127b7a55e371"
+readonly bashEnvCachePath="$projectDir/.circleci/bash_env_cache";
+
+if [ -f $bashEnvCachePath ]; then
+  # Since a bash env cache is present, load this into the $BASH_ENV
+  cat "$bashEnvCachePath" >> $BASH_ENV;
+  echo "BASH environment loaded from cached value at $bashEnvCachePath";
+else
+  # Since no bash env cache is present, build out $BASH_ENV values.
+
+  # Load helpers and make them available everywhere (through `$BASH_ENV`).
+  source $envHelpersPath;
+  echo "source $envHelpersPath;" >> $BASH_ENV;
+
+
+  ####################################################################################################
+  # Define PUBLIC environment variables for CircleCI.
+  ####################################################################################################
+  # See https://circleci.com/docs/2.0/env-vars/#built-in-environment-variables for more info.
+  ####################################################################################################
+  setPublicVar CI "$CI"
+  setPublicVar PROJECT_ROOT "$projectDir";
+  setPublicVar CI_AIO_MIN_PWA_SCORE "95";
+  # This is the branch being built; e.g. `pull/12345` for PR builds.
+  setPublicVar CI_BRANCH "$CIRCLE_BRANCH";
+  setPublicVar CI_BUILD_URL "$CIRCLE_BUILD_URL";
+  setPublicVar CI_COMMIT "$CIRCLE_SHA1";
+  # `CI_COMMIT_RANGE` is only used on push builds (a.k.a. non-PR, non-scheduled builds and rerun
+  # workflows of such builds).
+  setPublicVar CI_GIT_BASE_REVISION "${CIRCLE_GIT_BASE_REVISION}";
+  setPublicVar CI_GIT_REVISION "${CIRCLE_GIT_REVISION}";
+  setPublicVar CI_COMMIT_RANGE "$CIRCLE_GIT_BASE_REVISION..$CIRCLE_GIT_REVISION";
+  setPublicVar CI_PULL_REQUEST "${CIRCLE_PR_NUMBER:-false}";
+  setPublicVar CI_REPO_NAME "$CIRCLE_PROJECT_REPONAME";
+  setPublicVar CI_REPO_OWNER "$CIRCLE_PROJECT_USERNAME";
+  setPublicVar CI_PR_REPONAME "$CIRCLE_PR_REPONAME";
+  setPublicVar CI_PR_USERNAME "$CIRCLE_PR_USERNAME";
+
+
+  ####################################################################################################
+  # Define "lazy" PUBLIC environment variables for CircleCI.
+  # (I.e. functions to set an environment variable when called.)
+  ####################################################################################################
+  createPublicVarSetter CI_STABLE_BRANCH "\$(npm info @angular/core dist-tags.latest | sed -r 's/^\\s*([0-9]+\\.[0-9]+)\\.[0-9]+.*$/\\1.x/')";
+
+
+  ####################################################################################################
+  # Define SECRET environment variables for CircleCI.
+  ####################################################################################################
+  setSecretVar CI_SECRET_AIO_DEPLOY_FIREBASE_TOKEN "$AIO_DEPLOY_TOKEN";
+  setSecretVar CI_SECRET_PAYLOAD_FIREBASE_TOKEN "$ANGULAR_PAYLOAD_TOKEN";
+
+
+  ####################################################################################################
+  # Define SauceLabs environment variables for CircleCI.
+  ####################################################################################################
+  setPublicVar SAUCE_USERNAME "angular-framework";
+  setSecretVar SAUCE_ACCESS_KEY "0c731274ed5f-cbc9-16f4-021a-9835e39f";
+  # TODO(josephperrott): Remove environment variables once all saucelabs tests are via bazel method.
+  setPublicVar SAUCE_LOG_FILE /tmp/angular/sauce-connect.log
+  setPublicVar SAUCE_READY_FILE /tmp/angular/sauce-connect-ready-file.lock
+  setPublicVar SAUCE_PID_FILE /tmp/angular/sauce-connect-pid-file.lock
+  setPublicVar SAUCE_TUNNEL_IDENTIFIER "angular-framework-${CIRCLE_BUILD_NUM}-${CIRCLE_NODE_INDEX}"
+  # Amount of seconds we wait for sauceconnect to establish a tunnel instance. In order to not
+  # acquire CircleCI instances for too long if sauceconnect failed, we need a connect timeout.
+  setPublicVar SAUCE_READY_FILE_TIMEOUT 120
+
+
+  ####################################################################################################
+  # Define environment variables for the `angular/components` repo unit tests job.
+  ####################################################################################################
+  # We specifically use a directory within "/tmp" here because we want the cloned repo to be
+  # completely isolated from angular/angular in order to avoid any bad interactions between
+  # their separate build setups. **NOTE**: When updating the temporary directory, also update
+  # the `save_cache` path configuration in `config.yml`
+  setPublicVar COMPONENTS_REPO_TMP_DIR "/tmp/angular-components-repo"
+  setPublicVar COMPONENTS_REPO_URL "https://github.com/angular/components.git"
+  setPublicVar COMPONENTS_REPO_BRANCH "master"
+  # **NOTE**: When updating the commit SHA, also update the cache key in the CircleCI `config.yml`.
+  setPublicVar COMPONENTS_REPO_COMMIT "598db096e668aa7e9debd56eedfd127b7a55e371"
+
+  # Save the created BASH_ENV into the bash env cache file.
+  cat "$BASH_ENV" >> $bashEnvCachePath;
+fi
 
 
 ####################################################################################################

.dev-infra.json

@@ -0,0 +1,47 @@
+{
+  "commitMessage": {
+    "maxLength": 120,
+    "minBodyLength": 0,
+    "types": [
+      "build",
+      "ci",
+      "docs",
+      "feat",
+      "fix",
+      "perf",
+      "refactor",
+      "release",
+      "style",
+      "test"
+    ],
+    "scopes": [
+      "animations",
+      "bazel",
+      "benchpress",
+      "changelog",
+      "common",
+      "compiler",
+      "compiler-cli",
+      "core",
+      "dev-infra",
+      "docs-infra",
+      "elements",
+      "forms",
+      "http",
+      "language-service",
+      "localize",
+      "ngcc",
+      "packaging",
+      "platform-browser",
+      "platform-browser-dynamic",
+      "platform-server",
+      "platform-webworker",
+      "platform-webworker-dynamic",
+      "router",
+      "service-worker",
+      "upgrade",
+      "ve",
+      "zone.js"
+    ]
+  }
+}