build: migrate to use the new layout of the @angular/dev-infra-private package

Author: josephperrott

.circleci/config.yml

@@ -13,12 +13,12 @@ var_2: &docker-firefox-image circleci/node:14.16.1-browsers
 # **Note**: When updating the beginning of the cache key, also update the cache key to match
 # the new cache key prefix. This allows us to take advantage of CircleCI's fallback caching.
 # Read more here: https://circleci.com/docs/2.0/caching/#restoring-cache.
-var_3: &cache_key v8-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
+var_3: &cache_key v1-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-{{ checksum "WORKSPACE" }}-{{ checksum "yarn.lock" }}
 # We want to invalidate the cache if the postinstall patches change. In order to apply new
 # patches, a clean version of the node modules is needed. Additionally, we invalidate the cache
 # if the Bazel version changes. We do this because otherwise the `bazelisk` cache folder will
 # contain all previously used versions and ultimately cause the cache restoring to be slower.
-var_4: &cache_fallback_key v8-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-
+var_4: &cache_fallback_key v1-ng-mat-{{ checksum ".bazelversion" }}-{{ checksum "tools/postinstall/apply-patches.js" }}-
 
 # Settings common to each job
 var_5: &job_defaults

.ng-dev/caretaker.ts

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

.ng-dev/commit-message.ts

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

.ng-dev/format.ts

@@ -1,4 +1,4 @@
-import {FormatConfig} from '@angular/dev-infra-private/format/config';
+import {FormatConfig} from '@angular/dev-infra-private/ng-dev/format/config';
 
 /**
  * Configuration for the ng-dev format command. We currently only use the buildifier

.ng-dev/github.ts

@@ -1,4 +1,4 @@
-import {GithubConfig} from '@angular/dev-infra-private/utils/config';
+import {GithubConfig} from '@angular/dev-infra-private/ng-dev/utils/config';
 
 /**
  * Github configuration for the ng-dev command. This repository is

.ng-dev/merge.ts

@@ -1,5 +1,5 @@
-import {DevInfraMergeConfig} from '@angular/dev-infra-private/pr/merge/config';
-import {getDefaultTargetLabelConfiguration} from '@angular/dev-infra-private/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';
 

.ng-dev/release.ts

@@ -1,5 +1,5 @@
 import {join} from 'path';
-import {ReleaseConfig} from '@angular/dev-infra-private/release/config';
+import {ReleaseConfig} from '@angular/dev-infra-private/ng-dev/release/config';
 import {releasePackages} from '../tools/release/release-output/release-packages';
 import {promptAndGenerateChangelog} from '../tools/release/changelog';
 

package.json

@@ -77,7 +77,7 @@
     "@angular-devkit/schematics": "12.1.2",
     "@angular/bazel": "https://github.com/angular/bazel-builds.git#2566cc859235399edc72749a957f1cdcba2dc121",
     "@angular/compiler-cli": "12.1.2",
-    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#0057daca63205a10c26256b6733b02af835497c0",
+    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#301b2fe",
     "@angular/localize": "12.1.2",
     "@angular/platform-browser-dynamic": "12.1.2",
     "@angular/platform-server": "12.1.2",

test/benchmarks/cdk/testing/component-harness/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 load("//tools:defaults.bzl", "ng_test_library", "ng_web_test_suite", "ts_library")
 
 package(default_visibility = ["//visibility:public"])

test/benchmarks/cdk/testing/component-harness/protractor-benchmark-utilities.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 import {USE_BENCHPRESS} from './constants';
 
 /**

test/benchmarks/material/button/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/button/button.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('button performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/material/card/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/card/card.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('card performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/material/checkbox/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/checkbox/checkbox.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('checkbox performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/material/chips/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/chips/chips.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('chip performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/material/form-field/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/form-field/form-field.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 function runFormFieldRenderBenchmark(testId: string, showBtnId: string) {
   return runBenchmark({

test/benchmarks/material/menu/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/menu/menu.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, by, element, ElementFinder, Key} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 // Clicking to close a menu is problematic. This is a solution that uses `.sendKeys()` avoids
 // issues with `.click()`.

test/benchmarks/material/radio/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/radio/radio.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('radio button performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/material/slide-toggle/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/slide-toggle/slide-toggle.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('slide toggle performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/material/table/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 component_benchmark(
     name = "benchmark",

test/benchmarks/material/table/table.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 function runTableRenderBenchmark(testId: string, buttonId: string) {
   return runBenchmark({

test/benchmarks/material/tabs/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/material/tabs/tabs.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser, ElementFinder} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('tabs performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/mdc/button/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/button/button.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('button performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/mdc/card/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/card/card.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('card performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/mdc/checkbox/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/checkbox/checkbox.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('checkbox performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/mdc/chips/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/chips/chips.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 async function runRenderBenchmark(testId: string, showBtnId: string) {
   return runBenchmark({

test/benchmarks/mdc/form-field/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/form-field/form-field.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 function runFormFieldRenderBenchmark(testId: string, showBtnId: string) {
   return runBenchmark({

test/benchmarks/mdc/menu/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/menu/menu.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, by, element, ElementFinder, Key} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 // Clicking to close a menu is problematic. This is a solution that uses `.sendKeys()` avoids
 // issues with `.click()`.

test/benchmarks/mdc/radio/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/radio/radio.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('radio button performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/mdc/slide-toggle/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/slide-toggle/slide-toggle.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('slide toggle performance benchmarks', () => {
   beforeAll(() => {

test/benchmarks/mdc/table/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 component_benchmark(
     name = "benchmark",

test/benchmarks/mdc/table/table.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 function runTableRenderBenchmark(testId: string, buttonId: string) {
   return runBenchmark({

test/benchmarks/mdc/tabs/BUILD.bazel

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
 
 # TODO(wagnermaciel): Update this target to provide indigo-pink in a way that doesn't require having to import it with
 # stylesUrls inside the components once `component_benchmark` supports asset injection.

test/benchmarks/mdc/tabs/tabs.perf-spec.ts

@@ -7,7 +7,7 @@
  */
 
 import {$, browser, ElementFinder} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
 
 describe('tabs performance benchmarks', () => {
   beforeAll(() => {