build: update dev-infra packages and account for build-tooling split from ng-dev

devversion · alan-agius4 · commit 652a4af42669 · 2022-07-27T18:38:23.000+02:00
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.
diff --git a/.bazelrc b/.bazelrc
@@ -118,8 +118,8 @@ build:remote --jobs=150
 
 # 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 --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=//tools:rbe_platform_with_network_access
 build:remote --host_platform=//tools:rbe_platform_with_network_access
 build:remote --platforms=//tools:rbe_platform_with_network_access
diff --git a/.ng-dev/caretaker.mts b/.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 = {
diff --git a/.ng-dev/commit-message.mts b/.ng-dev/commit-message.mts
@@ -1,4 +1,4 @@
-import { CommitMessageConfig } from '@angular/dev-infra-private/ng-dev';
+import { CommitMessageConfig } from '@angular/ng-dev';
 import packages from '../lib/packages.js';
 
 /**
diff --git a/.ng-dev/format.mts b/.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.
diff --git a/.ng-dev/github.mts b/.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
diff --git a/.ng-dev/pull-request.mts b/.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
diff --git a/.ng-dev/release.mts b/.ng-dev/release.mts
@@ -1,6 +1,6 @@
 import '../lib/bootstrap-local.js';
 
-import { ReleaseConfig } from '@angular/dev-infra-private/ng-dev';
+import { ReleaseConfig } from '@angular/ng-dev';
 import packages from '../lib/packages.js';
 import buildPackages from '../scripts/build.js';
 
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
     "build:bazel": "node ./bin/devkit-admin build-bazel",
     "build-tsc": "tsc -p tsconfig.json",
     "lint": "eslint --cache --max-warnings=0 \"**/*.ts\"",
-    "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",
     "templates": "node ./bin/devkit-admin templates",
     "validate": "node ./bin/devkit-admin validate",
     "postinstall": "yarn webdriver-update && yarn husky install",
@@ -65,15 +65,16 @@
   "devDependencies": {
     "@ampproject/remapping": "2.2.0",
     "@angular/animations": "14.0.5",
+    "@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#1addc303bef0b6acc0dca0961e9e642629f3a5cd",
     "@angular/cdk": "14.0.4",
     "@angular/common": "14.0.5",
     "@angular/compiler": "14.0.5",
     "@angular/compiler-cli": "14.0.5",
     "@angular/core": "14.0.5",
-    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#294d737341a13e130fb7184268c0653c335ef388",
     "@angular/forms": "14.0.5",
     "@angular/localize": "14.0.5",
     "@angular/material": "14.0.4",
+    "@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#865c7687cdca2bd512040330e1677eecaa26e46a",
     "@angular/platform-browser": "14.0.5",
     "@angular/platform-browser-dynamic": "14.0.5",
     "@angular/platform-server": "14.0.5",
diff --git a/packages/angular_devkit/architect/BUILD.bazel b/packages/angular_devkit/architect/BUILD.bazel
@@ -8,7 +8,7 @@ load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 # @external_begin
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
-load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 # @external_end
 
 licenses(["notice"])  # MIT
diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel
@@ -6,7 +6,7 @@
 load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
 load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
-load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 
 licenses(["notice"])  # MIT
 
diff --git a/packages/angular_devkit/build_webpack/BUILD.bazel b/packages/angular_devkit/build_webpack/BUILD.bazel
@@ -6,7 +6,7 @@
 load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
 load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 load("//tools:ts_json_schema.bzl", "ts_json_schema")
-load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 
 licenses(["notice"])  # MIT
 
diff --git a/packages/angular_devkit/core/BUILD.bazel b/packages/angular_devkit/core/BUILD.bazel
@@ -2,7 +2,7 @@ load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
 load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 # @external_begin
-load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 # @external_end
 
 # Copyright Google Inc. All Rights Reserved.
diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel
@@ -2,7 +2,7 @@ load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
 load("//tools:defaults.bzl", "pkg_npm", "ts_library")
 
 # @external_begin
-load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 # @external_end
 
 # Copyright Google Inc. All Rights Reserved.
diff --git a/packages/ngtools/webpack/BUILD.bazel b/packages/ngtools/webpack/BUILD.bazel
@@ -5,7 +5,7 @@
 
 load("@npm//@bazel/jasmine:index.bzl", "jasmine_node_test")
 load("//tools:defaults.bzl", "pkg_npm", "ts_library")
-load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
+load("@npm//@angular/build-tooling/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 
 licenses(["notice"])  # MIT
 
diff --git a/scripts/templates.ts b/scripts/templates.ts
@@ -18,7 +18,7 @@ async function _runTemplate(inputPath: string, outputPath: string, logger: loggi
 
   // TODO(ESM): Consider making this an actual import statement.
   const { COMMIT_TYPES, ScopeRequirement } = await new Function(
-    `return import('@angular/dev-infra-private/ng-dev');`,
+    `return import('@angular/ng-dev');`,
   )();
 
   const template = require(inputPath).default;
diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
@@ -34,7 +34,7 @@ platform(
     exec_properties = {
         "dockerNetwork": "standard",
     },
-    parents = ["@npm//@angular/dev-infra-private/bazel/remote-execution:platform"],
+    parents = ["@npm//@angular/build-tooling/bazel/remote-execution:platform"],
 )
 
 # @external_end
diff --git a/tools/defaults.bzl b/tools/defaults.bzl
@@ -3,7 +3,7 @@
 load("@npm//@bazel/concatjs/internal:build_defs.bzl", _ts_library = "ts_library_macro")
 load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin", _js_library = "js_library", _pkg_npm = "pkg_npm")
 load("@rules_pkg//:pkg.bzl", "pkg_tar")
-load("@npm//@angular/dev-infra-private/bazel:extract_js_module_output.bzl", "extract_js_module_output")
+load("@npm//@angular/build-tooling/bazel:extract_js_module_output.bzl", "extract_js_module_output")
 load("@aspect_bazel_lib//lib:utils.bzl", "to_label")
 load("@aspect_bazel_lib//lib:jq.bzl", "jq")
 load("@aspect_bazel_lib//lib:copy_to_directory.bzl", "copy_to_directory")
diff --git a/yarn.lock b/yarn.lock
@@ -10,23 +10,23 @@
     "@jridgewell/gen-mapping" "^0.1.0"
     "@jridgewell/trace-mapping" "^0.3.9"
 
-"@angular-devkit/architect@0.1401.0-next.4":
-  version "0.1401.0-next.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1401.0-next.4.tgz#5e63f645f47c42f9bfe13296cb0c561cc182c284"
-  integrity sha512-jPL5rlJX06J7g7FagL3FGnd/srKlg7TjwgU8EIXyIhZKVzT/jJEjY3esi6n0bBOXsErwU1SuF95s9x0W0vRvRg==
+"@angular-devkit/architect@0.1401.0-rc.3":
+  version "0.1401.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.1401.0-rc.3.tgz#55444857b8c041bfcfa57825047933588e917374"
+  integrity sha512-ODAKO/cQNCpcTL+TIDxU6lPJB6kYT7raMg68JGc0bCiV82BEBZPE94xAIs/NA3B18WWEB6AxX6QgSVp1r963bg==
   dependencies:
-    "@angular-devkit/core" "14.1.0-next.4"
+    "@angular-devkit/core" "14.1.0-rc.3"
     rxjs "6.6.7"
 
-"@angular-devkit/build-angular@14.1.0-next.4":
-  version "14.1.0-next.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-14.1.0-next.4.tgz#2c8ac035d757fc44af73943814bc05c7898a31be"
-  integrity sha512-H5WOmUkQpk29GQF2YCfi72fZH1/XVjWRlgoxpV6cP+tmHk5XDH43uSk8lFVGfw+S2+2XguJORYsJgks4CvquIA==
+"@angular-devkit/build-angular@14.1.0-rc.3":
+  version "14.1.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-14.1.0-rc.3.tgz#ce1ea6fd47e723b84ed33a373997dafa6bdc30f4"
+  integrity sha512-O+68mRbaGdXXxsXxOboxwaKEtfx4++kmU+Wqz1DrYNBxNkBrS4/kVIO94YBvVI0zMRJ5wgnakqw/Be9MCIi2uQ==
   dependencies:
     "@ampproject/remapping" "2.2.0"
-    "@angular-devkit/architect" "0.1401.0-next.4"
-    "@angular-devkit/build-webpack" "0.1401.0-next.4"
-    "@angular-devkit/core" "14.1.0-next.4"
+    "@angular-devkit/architect" "0.1401.0-rc.3"
+    "@angular-devkit/build-webpack" "0.1401.0-rc.3"
+    "@angular-devkit/core" "14.1.0-rc.3"
     "@babel/core" "7.18.6"
     "@babel/generator" "7.18.7"
     "@babel/helper-annotate-as-pure" "7.18.6"
@@ -37,7 +37,7 @@
     "@babel/runtime" "7.18.6"
     "@babel/template" "7.18.6"
     "@discoveryjs/json-ext" "0.5.7"
-    "@ngtools/webpack" "14.1.0-next.4"
+    "@ngtools/webpack" "14.1.0-rc.3"
     ansi-colors "4.1.3"
     babel-loader "8.2.5"
     babel-plugin-istanbul "6.1.1"
@@ -88,18 +88,18 @@
   optionalDependencies:
     esbuild "0.14.48"
 
-"@angular-devkit/build-webpack@0.1401.0-next.4":
-  version "0.1401.0-next.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1401.0-next.4.tgz#4d893b086e76114f34ad77f8eb06c082bb924bd5"
-  integrity sha512-/gOTPmc8OZgMP0n8ec/FMfhTveVHIJyPR68/5IARUnpbUHEmJPZL98zahDgcFST3B05Fg8Xq1rmKOq13oV5Khg==
+"@angular-devkit/build-webpack@0.1401.0-rc.3":
+  version "0.1401.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.1401.0-rc.3.tgz#8634d47e669b8a47ece8e12b71e2a2f5726a6a56"
+  integrity sha512-he1xa9A9hEFjxZUoEEVfG7dOmNqsvuxJHPNCvQsM2vx7qzxW0/aZaNJEHi6bY9loDJjAftvd9zYprmeloxTdmQ==
   dependencies:
-    "@angular-devkit/architect" "0.1401.0-next.4"
+    "@angular-devkit/architect" "0.1401.0-rc.3"
     rxjs "6.6.7"
 
-"@angular-devkit/core@14.1.0-next.4":
-  version "14.1.0-next.4"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-14.1.0-next.4.tgz#af9885036517252380ff13817b9c2175f63c26cf"
-  integrity sha512-RU6HIO47jnDr4LmVgwiwxtAh1ZftKKkLTh6JdF3O+TyxVIczXAG9fAv0fGEEocCWXjR3+CNPOizMtpPp9H7Seg==
+"@angular-devkit/core@14.1.0-rc.3":
+  version "14.1.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-14.1.0-rc.3.tgz#b9d69c5216e7b7ac3f035a93b341d3480ff71e99"
+  integrity sha512-KTrKoRJ12kuO1MVRJamaNc2v8avq0/roZ0dVlazXASs+BWlG/6x8fpBqF5ZodTF8M+rfYLkOSpJFlkWOBWkkyA==
   dependencies:
     ajv "8.11.0"
     ajv-formats "2.1.1"
@@ -122,6 +122,42 @@
     "@angular/core" "^13.0.0 || ^14.0.0-0"
     reflect-metadata "^0.1.13"
 
+"@angular/build-tooling@https://github.com/angular/dev-infra-private-build-tooling-builds.git#1addc303bef0b6acc0dca0961e9e642629f3a5cd":
+  version "0.0.0-fa61d03a603e04af2b66f3598f1af01da1e1cfb1"
+  resolved "https://github.com/angular/dev-infra-private-build-tooling-builds.git#1addc303bef0b6acc0dca0961e9e642629f3a5cd"
+  dependencies:
+    "@angular-devkit/build-angular" "14.1.0-rc.3"
+    "@angular/benchpress" "0.3.0"
+    "@babel/core" "^7.16.0"
+    "@bazel/buildifier" "5.1.0"
+    "@bazel/concatjs" "5.5.2"
+    "@bazel/esbuild" "5.5.2"
+    "@bazel/protractor" "5.5.2"
+    "@bazel/runfiles" "5.5.2"
+    "@bazel/terser" "5.5.2"
+    "@bazel/typescript" "5.5.2"
+    "@microsoft/api-extractor" "7.28.4"
+    "@types/browser-sync" "^2.26.3"
+    "@types/node" "16.10.9"
+    "@types/selenium-webdriver" "^4.0.18"
+    "@types/send" "^0.17.1"
+    "@types/tmp" "^0.2.1"
+    "@types/uuid" "^8.3.1"
+    "@types/yargs" "^17.0.0"
+    browser-sync "^2.27.7"
+    clang-format "1.8.0"
+    prettier "2.7.1"
+    protractor "^7.0.0"
+    selenium-webdriver "4.3.1"
+    send "^0.18.0"
+    source-map "^0.7.4"
+    tmp "^0.2.1"
+    "true-case-path" "^2.2.1"
+    tslib "^2.3.0"
+    typescript "~4.7.3"
+    uuid "^8.3.2"
+    yargs "^17.0.0"
+
 "@angular/cdk@14.0.4":
   version "14.0.4"
   resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-14.0.4.tgz#cae73d34d37c33c825125d233957b37fe2f81656"
@@ -168,44 +204,6 @@
   dependencies:
     tslib "^2.3.0"
 
-"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#294d737341a13e130fb7184268c0653c335ef388":
-  version "0.0.0-2eca9e5ee9e09a0d8c25ff37d3f063982478b411"
-  uid "294d737341a13e130fb7184268c0653c335ef388"
-  resolved "https://github.com/angular/dev-infra-private-builds.git#294d737341a13e130fb7184268c0653c335ef388"
-  dependencies:
-    "@angular-devkit/build-angular" "14.1.0-next.4"
-    "@angular/benchpress" "0.3.0"
-    "@babel/core" "^7.16.0"
-    "@bazel/buildifier" "5.1.0"
-    "@bazel/concatjs" "5.5.2"
-    "@bazel/esbuild" "5.5.2"
-    "@bazel/protractor" "5.5.2"
-    "@bazel/runfiles" "5.5.2"
-    "@bazel/terser" "5.5.2"
-    "@bazel/typescript" "5.5.2"
-    "@microsoft/api-extractor" "7.28.4"
-    "@types/browser-sync" "^2.26.3"
-    "@types/node" "16.10.9"
-    "@types/selenium-webdriver" "^4.0.18"
-    "@types/send" "^0.17.1"
-    "@types/tmp" "^0.2.1"
-    "@types/uuid" "^8.3.1"
-    "@types/yargs" "^17.0.0"
-    "@yarnpkg/lockfile" "^1.1.0"
-    browser-sync "^2.27.7"
-    clang-format "1.8.0"
-    prettier "2.7.1"
-    protractor "^7.0.0"
-    selenium-webdriver "4.3.1"
-    send "^0.18.0"
-    source-map "^0.7.4"
-    tmp "^0.2.1"
-    "true-case-path" "^2.2.1"
-    tslib "^2.3.0"
-    typescript "~4.7.3"
-    uuid "^8.3.2"
-    yargs "^17.0.0"
-
 "@angular/forms@14.0.5":
   version "14.0.5"
   resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-14.0.5.tgz#d9d749352f9d3945c83af1cc3a9df8bafb60327e"
@@ -229,6 +227,13 @@
   dependencies:
     tslib "^2.3.0"
 
+"@angular/ng-dev@https://github.com/angular/dev-infra-private-ng-dev-builds.git#865c7687cdca2bd512040330e1677eecaa26e46a":
+  version "0.0.0-fa61d03a603e04af2b66f3598f1af01da1e1cfb1"
+  resolved "https://github.com/angular/dev-infra-private-ng-dev-builds.git#865c7687cdca2bd512040330e1677eecaa26e46a"
+  dependencies:
+    "@yarnpkg/lockfile" "^1.1.0"
+    typescript "~4.7.3"
+
 "@angular/platform-browser-dynamic@14.0.5":
   version "14.0.5"
   resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-14.0.5.tgz#6b31c1fdeebd57e36e7f7e5ca7445fc2abb607c7"
@@ -1536,10 +1541,10 @@
   resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.14.1.tgz#155ef21065427901994e765da8a0ba0eaae8b8bd"
   integrity sha512-6Wci+Tp3CgPt/B9B0a3J4s3yMgLNSku6w5TV6mN+61C71UqsRBv2FUibBf3tPGlNxebgPHMEUzKpb1ggE8KCKw==
 
-"@ngtools/webpack@14.1.0-next.4":
-  version "14.1.0-next.4"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-14.1.0-next.4.tgz#94cebdff456ba4169d19a2741cc787748547b3eb"
-  integrity sha512-ziW+ElIhgrwFLM7nBkcwtli7iA6RMzZnvBAgQAEkRhyi9l969m/LSidAC73U0l06JiBWOzZAiGBgR/kd3uFW+w==
+"@ngtools/webpack@14.1.0-rc.3":
+  version "14.1.0-rc.3"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-14.1.0-rc.3.tgz#3cca4d15f464c56d287788b0723040fa0284d4bb"
+  integrity sha512-9zKcMBWQkeFA8Ws6bf9fcJHOMq2W+VojL+PDQO6IYDqUW9hIMcR57FfiUilM5eu+wn0VanIx887CehIwywCZbQ==
 
 "@nodelib/fs.scandir@2.1.5":
   version "2.1.5"
@@ -9494,7 +9499,6 @@ sass@1.53.0, sass@^1.49.9:
 
 "sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.7.1-linux.tar.gz":
   version "0.0.0"
-  uid e5d7f82ad98251a653d1b0537f1103e49eda5e11
   resolved "https://saucelabs.com/downloads/sc-4.7.1-linux.tar.gz#e5d7f82ad98251a653d1b0537f1103e49eda5e11"
 
 saucelabs@^1.5.0:

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CaretakerConfig } from '@angular/dev-infra-private/ng-dev';`
	`1`	`+import { CaretakerConfig } from '@angular/ng-dev';`
`2`	`2`
`3`	`3`	/** The configuration for `ng-dev caretaker` commands. */
`4`	`4`	`export const caretaker: CaretakerConfig = {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { CommitMessageConfig } from '@angular/dev-infra-private/ng-dev';`
	`1`	`+import { CommitMessageConfig } from '@angular/ng-dev';`
`2`	`2`	`import packages from '../lib/packages.js';`
`3`	`3`
`4`	`4`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { FormatConfig } from '@angular/dev-infra-private/ng-dev';`
	`1`	`+import { FormatConfig } from '@angular/ng-dev';`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	* Configuration for the `ng-dev format` command.
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { GithubConfig } from '@angular/dev-infra-private/ng-dev';`
	`1`	`+import { GithubConfig } from '@angular/ng-dev';`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	`* Github configuration for the ng-dev command. This repository is`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { PullRequestConfig } from '@angular/dev-infra-private/ng-dev';`
	`1`	`+import { PullRequestConfig } from '@angular/ng-dev';`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	* Configuration for the merge tool in `ng-dev`. This sets up the labels which