ashu8912 · pull · Aug 17, 2021 · Aug 14, 2021 · Aug 14, 2021 · Aug 13, 2021
diff --git a/.bazelrc b/.bazelrc
@@ -114,11 +114,11 @@ build:remote --cpu=k8
 build:remote --host_cpu=k8
 
 # Toolchain and platform related flags
-build:remote --crosstool_top=//dev-infra/bazel/remote-execution/cpp:cc_toolchain_suite
-build:remote --extra_toolchains=//dev-infra/bazel/remote-execution/cpp:cc_toolchain
-build:remote --extra_execution_platforms=//dev-infra/bazel/remote-execution:platform
-build:remote --host_platform=//dev-infra/bazel/remote-execution:platform
-build:remote --platforms=//dev-infra/bazel/remote-execution:platform
+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=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
+build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
+build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform
 
 # Remote instance and caching
 build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -24,15 +24,15 @@ version: 2.1
 # **NOTE 2 **: If you change the cache key prefix, also sync the cache_key_fallback to match.
 # **NOTE 3 **: 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-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "aio/yarn.lock" }}
+var_3: &cache_key v1-angular-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ 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-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}
+var_4: &cache_key_fallback v1-angular-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}
 
 # Windows needs its own cache key because binaries in node_modules are different.
-var_3_win: &cache_key_win v4-angular-win-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "aio/yarn.lock" }}
-var_4_win: &cache_key_win_fallback v4-angular-win-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}
+var_3_win: &cache_key_win v1-angular-win-node-14-{{ checksum "month.txt" }}-{{ checksum ".bazelversion" }}-{{ checksum "yarn.lock" }}-{{ checksum "WORKSPACE" }}-{{ checksum "aio/yarn.lock" }}
+var_4_win: &cache_key_win_fallback v1-angular-win-node-14-{{ checksum "month.txt" }}-{{ 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.

diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
@@ -38,7 +38,6 @@ merge:
       - 'modules/benchmarks/**'
       - 'modules/system.d.ts'
       - 'packages/**'
-      - 'dev-infra/benchmark/driver-utilities/**'
     # list of patterns to ignore for the files changed by the PR
     exclude:
       - 'packages/*'

diff --git a/.gitmessage b/.gitmessage
@@ -106,8 +106,7 @@ Fixes #<issue number>
 #   │       └─⫸ Commit Scope: animations|bazel|benchpress|common|compiler|compiler-cli|core|
 #   │                          elements|forms|http|language-service|localize|platform-browser|
 #   │                          platform-browser-dynamic|platform-server|router|service-worker|
-#   │                          upgrade|zone.js|packaging|changelog|dev-infra|docs-infra|migrations|
-#   │                          ngcc|ve
+#   │                          upgrade|zone.js|packaging|changelog|docs-infra|migrations|ngcc|ve
 #   │                          https://github.com/angular/angular/blob/master/CONTRIBUTING.md#scope
 #   │
 #   └─⫸ Commit Type: build|ci|docs|feat|fix|perf|refactor|style|test

diff --git a/.ng-dev/caretaker.ts b/.ng-dev/caretaker.ts
@@ -1,4 +1,4 @@
-import {CaretakerConfig} from '../dev-infra/caretaker/config';
+import {CaretakerConfig} from '@angular/dev-infra-private/ng-dev/caretaker/config';
 
 /** The configuration for `ng-dev caretaker` commands. */
 export const caretaker: CaretakerConfig = {

diff --git a/.ng-dev/commit-message.ts b/.ng-dev/commit-message.ts
@@ -1,4 +1,4 @@
-import {CommitMessageConfig} from '../dev-infra/commit-message/config';
+import {CommitMessageConfig} from '@angular/dev-infra-private/ng-dev/commit-message/config';
 
 /**
  * The configuration for `ng-dev commit-message` commands.

diff --git a/.ng-dev/format.ts b/.ng-dev/format.ts
@@ -1,4 +1,4 @@
-import {FormatConfig} from '../dev-infra/format/config';
+import {FormatConfig} from '@angular/dev-infra-private/ng-dev/format/config';
 
 /**
  * Configuration for the `ng-dev format` command.

diff --git a/.ng-dev/github.ts b/.ng-dev/github.ts
@@ -1,11 +1,11 @@
-import {GithubConfig} from '../dev-infra/utils/config';
+import {GithubConfig} from '@angular/dev-infra-private/ng-dev/utils/config';
 
 /**
  * Github configuration for the `ng-dev` command. This repository is used as
  * remote for the merge script and other utilities like `ng-dev pr rebase`.
  */
-
 export const github: GithubConfig = {
   owner: 'angular',
-  name: 'angular'
+  name: 'angular',
+  mainBranchName: 'master',
 };
diff --git a/.ng-dev/merge.ts b/.ng-dev/merge.ts
@@ -1,5 +1,5 @@
-import {DevInfraMergeConfig} from '../dev-infra/pr/merge/config';
-import {getDefaultTargetLabelConfiguration} from '../dev-infra/pr/merge/defaults';
+import {DevInfraMergeConfig} from '@angular/dev-infra-private/ng-dev/pr/merge/config';
+import {getDefaultTargetLabelConfiguration} from '@angular/dev-infra-private/ng-dev/pr/merge/defaults';
 import {github} from './github';
 import {release} from './release';
 

diff --git a/.ng-dev/release.ts b/.ng-dev/release.ts
@@ -1,5 +1,5 @@
+import {ReleaseConfig} from '@angular/dev-infra-private/ng-dev/release/config';
 import {join} from 'path';
-import {ReleaseConfig} from '../dev-infra/release/config';
 
 /** Configuration for the `ng-dev release` command. */
 export const release: ReleaseConfig = {

diff --git a/.pullapprove.yml b/.pullapprove.yml
@@ -1155,7 +1155,6 @@ groups:
           '.ng-dev/**',
           '.vscode/**',
           '.yarn/**',
-          'dev-infra/**',
           'docs/*.md',
           'docs/images/**',
           'goldens/*',

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -248,8 +248,7 @@ Any line of the commit message cannot be longer than 100 characters.
   │       └─⫸ Commit Scope: animations|bazel|benchpress|common|compiler|compiler-cli|core|
   │                          elements|forms|http|language-service|localize|platform-browser|
   │                          platform-browser-dynamic|platform-server|router|service-worker|
-  │                          upgrade|zone.js|packaging|changelog|dev-infra|docs-infra|migrations|
-  │                          ngcc|ve
+  │                          upgrade|zone.js|packaging|changelog|docs-infra|migrations|ngcc|ve
   │
   └─⫸ Commit Type: build|ci|docs|feat|fix|perf|refactor|test
 ```
@@ -302,7 +301,7 @@ There are currently a few exceptions to the "use package name" rule:
 
 * `changelog`: used for updating the release notes in CHANGELOG.md
 
-* `dev-infra`: used for dev-infra related changes within the directories /scripts, /tools and /dev-infra
+* `dev-infra`: used for dev-infra related changes within the directories /scripts and /tools
 
 * `docs-infra`: used for docs-app (angular.io) related changes within the /aio directory of the repo
 

diff --git a/WORKSPACE b/WORKSPACE
@@ -44,7 +44,7 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
 
 web_test_repositories()
 
-load("//dev-infra/bazel/browsers:browser_repositories.bzl", "browser_repositories")
+load("@npm//@angular/dev-infra-private/bazel/browsers:browser_repositories.bzl", "browser_repositories")
 
 browser_repositories()
 

diff --git a/aio/content/guide/routing-overview.md b/aio/content/guide/routing-overview.md
@@ -6,7 +6,7 @@ As users perform application tasks, they need to move between the different [vie
 To handle the navigation from one [view](guide/glossary#view) to the next, you use the Angular **`Router`**.
 The **`Router`** enables navigation by interpreting a browser URL as an instruction to change the view.
 
-To explore a sample app featuring the router's primary features, see the <live-example stackblitz="router"></live-example>.
+To explore a sample app featuring the router's primary features, see the <live-example name="router"></live-example>.
 
 ## Prerequisites
 

diff --git a/aio/content/guide/template-reference-variables.md b/aio/content/guide/template-reference-variables.md
@@ -162,6 +162,12 @@ You declare a template input variable using the `let` keyword as in `let hero`.
 
 There are several such variables in this example: `hero`, `i`, and `odd`.
 
+```html
+<ng-template #hero let-hero let-i="index" let-odd="isOdd">
+  <div [class]="{'odd-row': odd}">{{i}}:{{hero.name}}</div>
+</ng-template>
+```
+
 The variable's scope is limited to a single instance of the repeated template.
 Use the same variable name again in the definition of other structural directives.
 

diff --git a/aio/content/marketing/contributors.json b/aio/content/marketing/contributors.json
@@ -111,7 +111,7 @@
     "picture": "aristeidis.jpg",
     "twitter": "abampakos",
     "website": "https://medium.com/@abampakos",
-    "bio": "Aristeidis is a front end web developer at Plex-Earth working with Angular. He is a co-organizer of the Angular Athens meetup and the author of Learning Angular - 3rd Edition. He is also a senior Angular instructor at Code.Hub where he teaches the Angular framework to other developers.",
+    "bio": "Aristeidis is a web development team lead at Plex-Earth working with Angular. He is a co-organizer of the Angular Athens meetup and the author of Learning Angular - 3rd Edition and Angular Projects - 2nd Edition books. He is also a senior Angular instructor at Code.Hub where he teaches the Angular framework to other developers.",
     "groups": ["GDE"]
   },
   "bbrennan": {
@@ -861,6 +861,12 @@
     "bio": "Andrew is a software engineer using Angular and .NET. He spends most of his spare time staying up-to-date, helping other people, and experimenting with web tech.",
     "groups": ["GDE"]
   },
+  "tmdavisgoogle": {
+    "name": "Tiffany Davis",
+    "bio": "Tiffany is an editor working on Angular documentation.",
+    "groups": ["Angular"],
+    "lead": "aikidave"
+  },
   "toddmotto": {
     "name": "Todd Motto",
     "picture": "toddmotto.jpg",

diff --git a/aio/package.json b/aio/package.json
@@ -131,7 +131,7 @@
     "css-selector-parser": "^1.4.1",
     "dgeni": "^0.4.14",
     "dgeni-packages": "^0.29.1",
-    "entities": "^2.2.0",
+    "entities": "^3.0.0",
     "esbuild": "^0.12.0",
     "eslint": "^7.26.0",
     "eslint-plugin-import": "^2.23.4",

diff --git a/aio/yarn.lock b/aio/yarn.lock
@@ -4831,11 +4831,16 @@ entities@^1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-entities@^2.0.0, entities@^2.2.0:
+entities@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
+entities@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4"
+  integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==
+
 env-paths@^2.2.0:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"

diff --git a/dev-infra/BUILD.bazel b/dev-infra/BUILD.bazel
diff --git a/dev-infra/bazel/BUILD.bazel b/dev-infra/bazel/BUILD.bazel
diff --git a/dev-infra/bazel/api-golden/BUILD.bazel b/dev-infra/bazel/api-golden/BUILD.bazel