build: update ng-dev tool

.ng-dev/caretaker.ts

@@ -0,0 +1,16 @@
+import { CaretakerConfig } from '@angular/dev-infra-private/ng-dev';
+
+/** The configuration for `ng-dev caretaker` commands. */
+export const caretaker: CaretakerConfig = {
+  githubQueries: [
+    {
+      name: 'Merge Queue',
+      query: `is:pr is:open status:success label:"action: merge"`,
+    },
+    {
+      name: 'Merge Assistance Queue',
+      query: `is:pr is:open label:"action: merge-assistance"`,
+    },
+  ],
+  caretakerGroup: 'angular-cli-caretaker',
+};

.ng-dev/commit-message.ts

@@ -3,7 +3,7 @@ import {
   COMMIT_TYPES,
   CommitMessageConfig,
   ScopeRequirement,
-} from '@angular/dev-infra-private/ng-dev/commit-message/config';
+} from '@angular/dev-infra-private/ng-dev';
 import { packages } from '../lib/packages';
 
 /**

.ng-dev/config.ts

@@ -1,5 +1,6 @@
 export { commitMessage } from './commit-message';
 export { format } from './format';
 export { github } from './github';
-export { merge } from './merge';
+export { pullRequest } from './pull-request';
 export { release } from './release';
+export { caretaker } from './caretaker';

.ng-dev/format.ts

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

.ng-dev/github.ts

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

.ng-dev/pull-request.ts

@@ -0,0 +1,15 @@
+import { PullRequestConfig } from '@angular/dev-infra-private/ng-dev';
+
+/**
+ * Configuration for the merge tool in `ng-dev`. This sets up the labels which
+ * are respected by the merge script (e.g. the target labels).
+ */
+export const pullRequest: PullRequestConfig = {
+  githubApiMerge: {
+    default: 'rebase',
+    labels: [{ pattern: 'squash commits', method: 'squash' }],
+  },
+  mergeReadyLabel: /^action: merge(-assistance)?/,
+  caretakerNoteLabel: /(action: merge-assistance)/,
+  commitMessageFixupLabel: 'commit message fixup',
+};

.ng-dev/release.ts

@@ -1,13 +1,17 @@
 import '../lib/bootstrap-local';
 
-import { ReleaseConfig } from '@angular/dev-infra-private/ng-dev/release/config';
+import { ReleaseConfig } from '@angular/dev-infra-private/ng-dev';
 import { releasePackages } from '../lib/packages';
 import buildPackages from '../scripts/build';
 
-const npmPackages = Object.keys(releasePackages);
+const npmPackages = Object.entries(releasePackages).map(([name, { experimental }]) => ({
+  name,
+  experimental,
+}));
 
 /** Configuration for the `ng-dev release` command. */
 export const release: ReleaseConfig = {
+  representativeNpmPackage: '@angular/cli',
   npmPackages,
   buildPackages: () => buildPackages(),
   releaseNotes: {

.ng-dev/tsconfig.json

@@ -0,0 +1,8 @@
+{
+  "extends": "../tsconfig.json",
+  "compilerOptions": {
+    "noEmit": true
+  },
+  "include": ["**/*.ts"],
+  "exclude": []
+}

package.json

@@ -75,7 +75,7 @@
     "@angular/compiler": "12.2.1",
     "@angular/compiler-cli": "12.2.1",
     "@angular/core": "12.2.1",
-    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#07a43c542704985a77ecabb4be12038e67419a65",
+    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#2fe60016e0ce6f1e53d4f5c5a1feb29d64ecd979",
     "@angular/forms": "12.2.1",
     "@angular/localize": "12.2.1",
     "@angular/material": "12.1.4",