build: update dev-infra packages and account for build-tooling split from ng-dev (angular#46976)

The dev-infra build tooling is now decoupled from `ng-dev`. This will
make it easier to update `ng-dev` without necessarily needing to upgrade
the whole build system, Bazel etc. This is useful when e.g. new release
tool features have been added and should also be ported to active LTS
branches.

PR Close angular#46976

Author: devversion

.bazelrc

@@ -96,11 +96,11 @@ build:remote --cpu=k8
 build:remote --host_cpu=k8
 
 # Toolchain and platform related flags
-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
+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
+build:remote --host_platform=@npm//@angular/build-tooling/bazel/remote-execution:platform
+build:remote --platforms=@npm//@angular/build-tooling/bazel/remote-execution:platform
 
 # Remote instance and caching
 build:remote --remote_instance_name=projects/internal-200822/instances/primary_instance

.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.

.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 used as

.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 merge tool in `ng-dev`. This sets up the labels which

.ng-dev/release.mts

@@ -1,4 +1,4 @@
-import {ReleaseConfig} from '@angular/dev-infra-private/ng-dev';
+import {ReleaseConfig} from '@angular/ng-dev';
 
 /** Configuration for the `ng-dev release` command. */
 export const release: ReleaseConfig = {

WORKSPACE

@@ -123,7 +123,7 @@ load("@io_bazel_rules_webtesting//web:repositories.bzl", "web_test_repositories"
 
 web_test_repositories()
 
-load("@npm//@angular/dev-infra-private/bazel/browsers:browser_repositories.bzl", "browser_repositories")
+load("@npm//@angular/build-tooling/bazel/browsers:browser_repositories.bzl", "browser_repositories")
 
 browser_repositories()
 

devtools/tools/defaults.bzl

@@ -1,8 +1,8 @@
 # Re-export of Bazel rules with devtools-wide defaults
 
-load("@npm//@angular/dev-infra-private/bazel/spec-bundling:index.bzl", "spec_bundle")
-load("@npm//@angular/dev-infra-private/bazel/karma:index.bzl", _karma_web_test_suite = "karma_web_test_suite")
-load("@npm//@angular/dev-infra-private/bazel:extract_js_module_output.bzl", "extract_js_module_output")
+load("@npm//@angular/build-tooling/bazel/spec-bundling:index.bzl", "spec_bundle")
+load("@npm//@angular/build-tooling/bazel/karma:index.bzl", _karma_web_test_suite = "karma_web_test_suite")
+load("@npm//@angular/build-tooling/bazel:extract_js_module_output.bzl", "extract_js_module_output")
 
 def karma_web_test_suite(name, **kwargs):
     test_deps = kwargs.get("deps", [])
@@ -35,10 +35,10 @@ def karma_web_test_suite(name, **kwargs):
     if not hasattr(kwargs, "browsers"):
         kwargs["tags"] = ["native"] + kwargs.get("tags", [])
         kwargs["browsers"] = [
-            "@npm//@angular/dev-infra-private/bazel/browsers/chromium:chromium",
+            "@npm//@angular/build-tooling/bazel/browsers/chromium:chromium",
 
             # todo(aleksanderbodurri): enable when firefox support is done
-            # "@npm//@angular/dev-infra-private/bazel/browsers/firefox:firefox",
+            # "@npm//@angular/build-tooling/bazel/browsers/firefox:firefox",
         ]
 
     # Default test suite with all configured browsers.

devtools/tools/esbuild/BUILD.bazel

@@ -13,7 +13,7 @@ esbuild_config(
     config_file = "esbuild-esm.config.mjs",
     deps = [
         ":esbuild_base",
-        "@npm//@angular/dev-infra-private/shared-scripts/angular-linker:js_lib",
+        "@npm//@angular/build-tooling/shared-scripts/angular-linker:js_lib",
     ],
 )
 
@@ -23,8 +23,8 @@ esbuild_config(
     deps = [
         ":esbuild_base",
         "//packages/compiler-cli/private",
-        "@npm//@angular/dev-infra-private/shared-scripts/angular-linker:js_lib",
-        "@npm//@angular/dev-infra-private/shared-scripts/angular-optimization:js_lib",
+        "@npm//@angular/build-tooling/shared-scripts/angular-linker:js_lib",
+        "@npm//@angular/build-tooling/shared-scripts/angular-optimization:js_lib",
     ],
 )
 
@@ -42,7 +42,7 @@ esbuild_config(
     config_file = "esbuild-spec.config.mjs",
     deps = [
         ":esbuild_base",
-        "@npm//@angular/dev-infra-private/shared-scripts/angular-linker:js_lib",
+        "@npm//@angular/build-tooling/shared-scripts/angular-linker:js_lib",
     ],
 )
 

devtools/tools/esbuild/esbuild-esm-prod.config.mjs

@@ -6,8 +6,8 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import { createLinkerEsbuildPlugin } from '@angular/dev-infra-private/shared-scripts/angular-linker/esbuild-plugin.mjs';
-import { createEsbuildAngularOptimizePlugin } from '@angular/dev-infra-private/shared-scripts/angular-optimization/esbuild-plugin.mjs';
+import { createLinkerEsbuildPlugin } from '@angular/build-tooling/shared-scripts/angular-linker/esbuild-plugin.mjs';
+import { createEsbuildAngularOptimizePlugin } from '@angular/build-tooling/shared-scripts/angular-optimization/esbuild-plugin.mjs';
 import { GLOBAL_DEFS_FOR_TERSER_WITH_AOT } from '@angular/compiler-cli/private/tooling.js';
 import baseEsbuildConfig from './esbuild-base.config.mjs';
 
@@ -26,7 +26,7 @@ export default {
       // DevTools also relies on Angular CDK and Material packages that are consumed via npm.
       // Because of this, we set unknownDeclarationVersionHandling to ignore so that we bypass
       // selecting a linker for our CDK and Material dependencies based on our local framework
-      // version (0.0.0-PLACEHOLDER). 
+      // version (0.0.0-PLACEHOLDER).
       // Instead this option defaults to the latest linker version, which should
       // be correct, except for the small time interval where we rollout a new
       // declaration version and target a material release that hasn't been compiled

devtools/tools/esbuild/esbuild-esm.config.mjs

@@ -6,9 +6,9 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-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 baseEsbuildConfig from './esbuild-base.config.mjs';
-  
+
 export default {
   ...baseEsbuildConfig,
   format: 'esm',
@@ -24,7 +24,7 @@ export default {
       // DevTools also relies on Angular CDK and Material packages that are consumed via npm.
       // Because of this, we set unknownDeclarationVersionHandling to ignore so that we bypass
       // selecting a linker for our CDK and Material dependencies based on our local framework
-      // version (0.0.0-PLACEHOLDER). 
+      // version (0.0.0-PLACEHOLDER).
       // Instead this option defaults to the latest linker version, which should
       // be correct, except for the small time interval where we rollout a new
       // declaration version and target a material release that hasn't been compiled

devtools/tools/esbuild/esbuild-spec.config.mjs

@@ -18,19 +18,19 @@ import baseEsbuildConfig from './esbuild-base.config.mjs';
   // Note: This needs to be a NPM module path as this ESBuild config is generated and can
   // end up in arbitrary Bazel packages or differently-named consumer workspaces.
   const {createLinkerEsbuildPlugin} = await import(
-    '@angular/dev-infra-private/shared-scripts/angular-linker/esbuild-plugin.mjs'
+    '@angular/build-tooling/shared-scripts/angular-linker/esbuild-plugin.mjs'
   );
 
   return await createLinkerEsbuildPlugin(
     /.*/,
     /* ensureNoPartialDeclaration */ true,
-    
+
     // DevTools relies on angular framework packages that are consumed,
     // locally via bazel. These packages have a version of 0.0.0-PLACEHOLDER.
     // DevTools also relies on Angular CDK and Material packages that are consumed via npm.
     // Because of this, we set unknownDeclarationVersionHandling to ignore so that we bypass
     // selecting a linker for our CDK and Material dependencies based on our local framework
-    // version (0.0.0-PLACEHOLDER). 
+    // version (0.0.0-PLACEHOLDER).
     // Instead this option defaults to the latest linker version, which should
     // be correct, except for the small time interval where we rollout a new
     // declaration version and target a Material release that hasn't been compiled

devtools/tools/esbuild/index.bzl

@@ -1,5 +1,5 @@
 load("//devtools:packages.bzl", "ANGULAR_PACKAGES")
-load("@npm//@angular/dev-infra-private/bazel/esbuild:index.bzl", "esbuild")
+load("@npm//@angular/build-tooling/bazel/esbuild:index.bzl", "esbuild")
 load("@build_bazel_rules_nodejs//internal/linker:link_node_modules.bzl", "LinkerPackageMappingInfo")
 load("@build_bazel_rules_nodejs//:providers.bzl", "ExternalNpmPackageInfo", "JSModuleInfo")
 

integration/index.bzl

@@ -6,7 +6,7 @@
 """
 
 load("//integration:npm_package_archives.bzl", "NPM_PACKAGE_ARCHIVES", "npm_package_archive_label")
-load("@npm//@angular/dev-infra-private/bazel/integration:index.bzl", "integration_test")
+load("@npm//@angular/build-tooling/bazel/integration:index.bzl", "integration_test")
 
 # The generated npm packages should ALWAYS be replaced in integration tests
 # so we pass them to the `check_npm_packages` attribute of npm_integration_test
@@ -41,8 +41,8 @@ def _ng_integration_test(name, setup_chromium = False, **kwargs):
     data = kwargs.pop("data", [])
 
     if setup_chromium:
-        data.append("@npm//@angular/dev-infra-private/bazel/browsers/chromium")
-        toolchains.append("@npm//@angular/dev-infra-private/bazel/browsers/chromium:toolchain_alias")
+        data.append("@npm//@angular/build-tooling/bazel/browsers/chromium")
+        toolchains.append("@npm//@angular/build-tooling/bazel/browsers/chromium:toolchain_alias")
         environment.update({
             "CHROMEDRIVER_BIN": "$(CHROMEDRIVER)",
             "CHROME_BIN": "$(CHROMIUM)",

modules/benchmarks/e2e_test.bzl

@@ -9,7 +9,7 @@ load("//tools:defaults.bzl", "protractor_web_test_suite")
 def e2e_test(name, server, **kwargs):
     protractor_web_test_suite(
         name = name,
-        on_prepare = "@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:start-server.js",
+        on_prepare = "@npm//@angular/build-tooling/bazel/benchmark/component_benchmark:start-server.js",
         server = server,
         **kwargs
     )

modules/benchmarks/src/change_detection/BUILD.bazel

@@ -15,7 +15,7 @@ ts_library(
     srcs = ["change_detection.perf-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
     ],
 )
@@ -26,7 +26,7 @@ ts_library(
     srcs = ["change_detection.e2e-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
     ],
 )

modules/benchmarks/src/change_detection/change_detection.e2e-spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {openBrowser, verifyNoBrowserErrors} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
+import {openBrowser, verifyNoBrowserErrors} from '@angular/build-tooling/bazel/benchmark/driver-utilities';
 import {$} from 'protractor';
 
 describe('change detection benchmark', () => {

modules/benchmarks/src/change_detection/change_detection.perf-spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {runBenchmark, verifyNoBrowserErrors} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
+import {runBenchmark, verifyNoBrowserErrors} from '@angular/build-tooling/bazel/benchmark/driver-utilities';
 import {$} from 'protractor';
 
 interface Worker {

modules/benchmarks/src/change_detection/transplanted_views/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "app_bundle", "ng_module", "ts_devserver")
-load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
+load("@npm//@angular/build-tooling/bazel/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
 load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

modules/benchmarks/src/class_bindings/BUILD.bazel

@@ -1,12 +1,12 @@
-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")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 
 component_benchmark(
     name = "benchmark",
     driver = ":class_bindings.perf-spec.ts",
     driver_deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//@types/jasmine",
         "@npm//protractor",
     ],

modules/benchmarks/src/class_bindings/class_bindings.perf-spec.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 {$, browser} from 'protractor';
 
 describe('class bindings perf', () => {

modules/benchmarks/src/expanding_rows/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "app_bundle", "ng_module", "ts_devserver", "ts_library")
-load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
+load("@npm//@angular/build-tooling/bazel/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 
@@ -26,7 +26,7 @@ ts_library(
     srcs = ["expanding_rows.perf-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
     ],
 )

modules/benchmarks/src/expanding_rows/expanding_rows.perf-spec.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 {$, browser} from 'protractor';
 
 describe('benchmarks', () => {

modules/benchmarks/src/js-web-frameworks/BUILD.bazel

@@ -8,7 +8,7 @@ ts_library(
     srcs = ["js-web-frameworks.perf-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
     ],
 )

modules/benchmarks/src/js-web-frameworks/js-web-frameworks.perf-spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {runBenchmark, verifyNoBrowserErrors} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
+import {runBenchmark, verifyNoBrowserErrors} from '@angular/build-tooling/bazel/benchmark/driver-utilities';
 import {$} from 'protractor';
 
 interface Worker {

modules/benchmarks/src/js-web-frameworks/ng2/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "app_bundle", "ng_module", "ts_devserver")
-load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
+load("@npm//@angular/build-tooling/bazel/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])
 

modules/benchmarks/src/largeform/BUILD.bazel

@@ -8,7 +8,7 @@ ts_library(
     srcs = ["largeform.perf-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
     ],
 )
@@ -19,7 +19,7 @@ ts_library(
     srcs = ["largeform.e2e-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
     ],
 )

modules/benchmarks/src/largeform/largeform.e2e-spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {openBrowser, verifyNoBrowserErrors} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
+import {openBrowser, verifyNoBrowserErrors} from '@angular/build-tooling/bazel/benchmark/driver-utilities';
 import {$, By, element} from 'protractor';
 
 describe('largeform benchmark', () => {

modules/benchmarks/src/largeform/largeform.perf-spec.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {runBenchmark, verifyNoBrowserErrors} from '@angular/dev-infra-private/bazel/benchmark/driver-utilities';
+import {runBenchmark, verifyNoBrowserErrors} from '@angular/build-tooling/bazel/benchmark/driver-utilities';
 import {$} from 'protractor';
 
 interface Worker {

modules/benchmarks/src/largeform/ng2/BUILD.bazel

@@ -1,5 +1,5 @@
 load("//tools:defaults.bzl", "ng_module", "ts_devserver")
-load("@npm//@angular/dev-infra-private/bazel/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
+load("@npm//@angular/build-tooling/bazel/benchmark/component_benchmark:benchmark_test.bzl", "benchmark_test")
 load("//modules/benchmarks:e2e_test.bzl", "e2e_test")
 
 package(default_visibility = ["//modules/benchmarks:__subpackages__"])

modules/benchmarks/src/largetable/BUILD.bazel

@@ -15,7 +15,7 @@ ts_library(
     srcs = ["largetable.perf-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
     ],
 )
@@ -26,7 +26,7 @@ ts_library(
     srcs = ["largetable.e2e-spec.ts"],
     tsconfig = "//modules/benchmarks:tsconfig-e2e.json",
     deps = [
-        "@npm//@angular/dev-infra-private/bazel/benchmark/driver-utilities",
+        "@npm//@angular/build-tooling/bazel/benchmark/driver-utilities",
         "@npm//protractor",
     ],
 )