build: account for new dev-infra packages @angular/ng-dev and @angular/build-tooling (#25345)

We split the dev-infra-private packagve to decouple the ng-dev tool from
the build tooling. This allows us to easily update ng-dev e.g. in LTS
branches without needing to update Bazel.

It is important that ng-dev can be updated as much as possilbe in all
branches to ensure the release IPC reliably works.

(cherry picked from commit 00ee53a)

Author: devversion

.bazelrc

@@ -83,11 +83,11 @@ build:remote --google_default_credentials=true
 
 # 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=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
-build:remote --host_platform=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
-build:remote --platforms=@npm//@angular/dev-infra-private/bazel/remote-execution:platform_with_network
+build:remote --crosstool_top=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain_suite
+build:remote --extra_toolchains=@npm//@angular/build-tooling/bazel/remote-execution/cpp:cc_toolchain
+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
 
 ################################
 #  Sandbox settings            #

.ng-dev/caretaker.mts

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

.ng-dev/commit-message.mts

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

.ng-dev/format.mts

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

.ng-dev/github.mts

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

.ng-dev/pull-request.mts

@@ -1,4 +1,4 @@
-import {PullRequestConfig} from '@angular/dev-infra-private/ng-dev';
+import {PullRequestConfig} from '@angular/ng-dev';
 
 /**
  * Configuration for the pull request commands in `ng-dev`. This includes the

.ng-dev/release.mts

@@ -1,5 +1,5 @@
 import semver from 'semver';
-import {ReleaseConfig} from '@angular/dev-infra-private/ng-dev';
+import {ReleaseConfig} from '@angular/ng-dev';
 import {assertValidFrameworkPeerDependency} from '../tools/release-checks/check-framework-peer-dependency.mjs';
 import {assertValidUpdateMigrationCollections} from '../tools/release-checks/check-migration-collections.mjs';
 import {assertValidNpmPackageOutput} from '../tools/release-checks/npm-package-output/index.mjs';

WORKSPACE

@@ -109,7 +109,7 @@ sass_repositories(
 
 # Setup repositories for browsers provided by the shared dev-infra package.
 load(
-    "@npm//@angular/dev-infra-private/bazel/browsers:browser_repositories.bzl",
+    "@npm//@angular/build-tooling/bazel/browsers:browser_repositories.bzl",
     _dev_infra_browser_repositories = "browser_repositories",
 )
 

integration/size-test/index.bzl

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/bazel:expand_template.bzl", "expand_template")
+load("@npm//@angular/build-tooling/bazel:expand_template.bzl", "expand_template")
 load("@build_bazel_rules_nodejs//:index.bzl", "nodejs_binary", "nodejs_test")
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load("@npm//@bazel/esbuild:index.bzl", "esbuild")

package.json

@@ -15,7 +15,7 @@
   },
   "scripts": {
     "postinstall": "node tools/postinstall/apply-patches.js",
-    "ng-dev": "cross-env TS_NODE_PROJECT=$PWD/.ng-dev/tsconfig.json TS_NODE_TRANSPILE_ONLY=1 node --no-warnings --loader ts-node/esm node_modules/@angular/dev-infra-private/ng-dev/bundles/cli.mjs",
+    "ng-dev": "cross-env TS_NODE_PROJECT=$PWD/.ng-dev/tsconfig.json TS_NODE_TRANSPILE_ONLY=1 node --no-warnings --loader ts-node/esm node_modules/@angular/ng-dev/bundles/cli.mjs",
     "build": "ts-node --esm --project scripts/tsconfig.json ./scripts/build-packages-dist-main.mts",
     "build-docs-content": "ts-node --esm --project scripts/tsconfig.json ./scripts/build-docs-content-main.mts",
     "build-and-check-release-output": "ts-node --esm --project scripts/tsconfig.json scripts/build-and-check-release-output.mts",
@@ -74,10 +74,11 @@
     "@angular-devkit/core": "^14.0.1",
     "@angular-devkit/schematics": "^14.0.1",
     "@angular/bazel": "^14.0.1",
+    "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#1addc303bef0b6acc0dca0961e9e642629f3a5cd",
     "@angular/cli": "^14.0.1",
     "@angular/compiler-cli": "^14.0.1",
-    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#c1b330bfbd79adf076039c872b966cfef76c5781",
     "@angular/localize": "^14.0.1",
+    "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#865c7687cdca2bd512040330e1677eecaa26e46a",
     "@angular/platform-browser-dynamic": "^14.0.1",
     "@angular/platform-server": "^14.0.1",
     "@angular/router": "^14.0.1",
@@ -223,7 +224,8 @@
     "zx": "^6.2.4"
   },
   "resolutions": {
-    "@angular/dev-infra-private/typescript": "~4.7.2",
+    "@angular/build-tooling/typescript": "~4.7.2",
+    "@angular/ng-dev/typescript": "~4.7.2",
     "browser-sync-client": "2.26.13",
     "dgeni-packages/typescript": "~4.7.2",
     "**/https-proxy-agent": "5.0.0"

renovate.json

@@ -24,7 +24,7 @@
       "enabled": false
     },
     {
-      "matchPackageNames": ["@angular/dev-infra-private", "angular/dev-infra"],
+      "matchPackageNames": ["@angular/ng-dev", "@angular/build-tooling", "angular/dev-infra"],
       "groupName": "angular shared dev-infra code",
       "enabled": true
     },

scripts/build-docs-content.mts

@@ -4,7 +4,7 @@
  */
 
 import sh from 'shelljs';
-import {BuiltPackage} from '@angular/dev-infra-private/ng-dev';
+import {BuiltPackage} from '@angular/ng-dev';
 import {fileURLToPath} from 'url';
 import {join, dirname} from 'path';
 

scripts/build-packages-dist.mts

@@ -6,7 +6,7 @@
 
 import {execSync} from 'child_process';
 import {join, dirname} from 'path';
-import {BuiltPackage} from '@angular/dev-infra-private/ng-dev';
+import {BuiltPackage} from '@angular/ng-dev';
 import {fileURLToPath} from 'url';
 import sh from 'shelljs';
 

scripts/circleci/notify-slack-job-failure.mts

@@ -6,11 +6,7 @@
  */
 
 import sh from 'shelljs';
-import {
-  isVersionBranch,
-  getConfig,
-  assertValidGithubConfig,
-} from '@angular/dev-infra-private/ng-dev';
+import {isVersionBranch, getConfig, assertValidGithubConfig} from '@angular/ng-dev';
 
 if (process.env.CIRCLE_PR_NUMBER !== undefined) {
   console.info('Skipping notifications for pull requests.');

scripts/circleci/setup-angular-snapshots.js

@@ -28,10 +28,11 @@ const snapshotPackages = [
 
 /** List of packages which should not be updated to a snapshot build. */
 const ignorePackages = [
-  // Skip update for the shared dev-infra package. We do not want to update to a snapshot
+  // Skip update for the shared dev-infra packages. We do not want to update to a snapshot
   // version of the dev-infra tooling as that could break tooling from running snapshot
   // tests for the actual snapshot Angular framework code.
-  '@angular/dev-infra-private',
+  '@angular/build-tooling',
+  '@angular/ng-dev',
 ];
 
 const {writeFileSync} = require('fs');

scripts/create-legacy-tests-bundle.mjs

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import {createLinkerEsbuildPlugin} from '@angular/dev-infra-private/shared-scripts/angular-linker/esbuild-plugin.mjs';
+import {createLinkerEsbuildPlugin} from '@angular/build-tooling/shared-scripts/angular-linker/esbuild-plugin.mjs';
 import child_process from 'child_process';
 import esbuild from 'esbuild';
 import fs from 'fs';

scripts/docs-deploy/deploy-ci-push.mts

@@ -5,7 +5,7 @@ import {
   getBranchesForMajorVersions,
   getVersionForVersionBranch,
   isVersionBranch,
-} from '@angular/dev-infra-private/ng-dev';
+} from '@angular/ng-dev';
 import {firebaseConfig, sites} from './utils.mjs';
 
 import {buildAndDeployWithSnapshots} from './snapshot-deploy.mjs';

scripts/docs-deploy/github-versioning.mts

@@ -5,7 +5,7 @@ import {
   assertValidGithubConfig,
   getConfig,
   getNextBranchName,
-} from '@angular/dev-infra-private/ng-dev';
+} from '@angular/ng-dev';
 
 import {githubAccessToken} from './utils.mjs';
 

scripts/docs-deploy/install-built-packages.mts

@@ -1,7 +1,7 @@
 import * as fs from 'fs';
 import * as url from 'url';
 
-import {BuiltPackage} from '@angular/dev-infra-private/ng-dev';
+import {BuiltPackage} from '@angular/ng-dev';
 import {getPackageJsonOfProject} from './utils.mjs';
 
 export async function installBuiltPackagesInRepo(repoPath: string, builtPackages: BuiltPackage[]) {

scripts/docs-deploy/monitoring/index.mts

@@ -2,7 +2,7 @@ import {$, cd} from 'zx';
 
 import {ProductionDeployment} from '../deploy-to-site.mjs';
 import {cloneDocsRepositoryForMajor} from '../clone-docs-repo.mjs';
-import {ActiveReleaseTrains} from '@angular/dev-infra-private/ng-dev';
+import {ActiveReleaseTrains} from '@angular/ng-dev';
 import {getReleaseRepoWithApi} from '../github-versioning.mjs';
 import {installDepsForDocsSite} from '../docs-deps-install.mjs';
 import {sites} from '../utils.mjs';

scripts/docs-deploy/update-versions-file.mts

@@ -6,7 +6,7 @@ import {
   assertValidReleaseConfig,
   fetchLongTermSupportBranchesFromNpm,
   getConfig,
-} from '@angular/dev-infra-private/ng-dev';
+} from '@angular/ng-dev';
 
 import {sites} from './utils.mjs';
 

src/cdk/testing/tests/webdriver-test.bzl

@@ -19,7 +19,7 @@ def webdriver_test(name, deps, tags = [], **kwargs):
 
     web_test(
         name = "%s_chromium_web_test" % name,
-        browser = "@npm//@angular/dev-infra-private/bazel/browsers/chromium:chromium",
+        browser = "@npm//@angular/build-tooling/bazel/browsers/chromium:chromium",
         tags = tags + ["manual"],
         test = ":%s_jasmine_test" % name,
     )

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

@@ -1,4 +1,4 @@
-load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/build-toolinge/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"])
@@ -20,7 +20,7 @@ ts_library(
     srcs = [":protractor-benchmark-utilities.ts"],
     deps = [
         ":constants",
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//@types/node",
     ],
 )
@@ -69,7 +69,7 @@ ng_test_library(
         "//src/cdk/testing/testbed",
         "//src/material/button",
         "//src/material/button/testing",
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
     ],
 )
 

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/bazel/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/build-tooling/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/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/build-tooling/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.
@@ -7,7 +7,7 @@ component_benchmark(
     name = "benchmark",
     driver = ":button.perf-spec.ts",
     driver_deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
         "@npm//@types/jasmine",
     ],

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

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/build-tooling/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/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/build-tooling/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.
@@ -7,7 +7,7 @@ component_benchmark(
     name = "benchmark",
     driver = ":card.perf-spec.ts",
     driver_deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
         "@npm//@types/jasmine",
     ],

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

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/build-tooling/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/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/build-tooling/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.
@@ -7,7 +7,7 @@ component_benchmark(
     name = "benchmark",
     driver = ":checkbox.perf-spec.ts",
     driver_deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
         "@npm//@types/jasmine",
     ],

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

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/build-tooling/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/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/build-tooling/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.
@@ -7,7 +7,7 @@ component_benchmark(
     name = "benchmark",
     driver = ":chips.perf-spec.ts",
     driver_deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
         "@npm//@types/jasmine",
     ],

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

@@ -7,7 +7,7 @@
  */
 
 import {$, browser} from 'protractor';
-import {runBenchmark} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/build-tooling/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/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/build-tooling/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.
@@ -7,7 +7,7 @@ component_benchmark(
     name = "benchmark",
     driver = ":form-field.perf-spec.ts",
     driver_deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
         "@npm//@types/jasmine",
     ],

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/bazel/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/build-tooling/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/bazel/benchmark/component_benchmark:component_benchmark.bzl", "component_benchmark")
+load("@npm//@angular/build-tooling/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.
@@ -7,7 +7,7 @@ component_benchmark(
     name = "benchmark",
     driver = ":menu.perf-spec.ts",
     driver_deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
         "@npm//@types/jasmine",
     ],

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/bazel/benchmark/driver-utilities';
+import {runBenchmark} from '@angular/build-tooling/bazel/benchmark/driver-utilities';
 
 // Clicking to close a menu is problematic. This is a solution that uses `.sendKeys()` avoids
 // issues with `.click()`.