build: update @angular/dev-infra-private

josephperrott · clydin · commit 5fb900bfb5a4 · 2021-08-12T16:31:31.000-04:00
Update the version of @angular/dev-infra-private being used, migrating to use
the version generated from angular/dev-infra rather than from angular/angular.
diff --git a/.ng-dev/commit-message.ts b/.ng-dev/commit-message.ts
@@ -3,7 +3,7 @@ import {
   COMMIT_TYPES,
   CommitMessageConfig,
   ScopeRequirement,
-} from '@angular/dev-infra-private/commit-message/config';
+} from '@angular/dev-infra-private/ng-dev/commit-message/config';
 import { packages } from '../lib/packages';
 
 /**
diff --git a/.ng-dev/format.ts b/.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.
diff --git a/.ng-dev/github.ts b/.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
@@ -7,4 +7,5 @@ import { GithubConfig } from '@angular/dev-infra-private/utils/config';
 export const github: GithubConfig = {
   owner: 'angular',
   name: 'angular-cli',
+  mainBranchName: 'master',
 };
diff --git a/.ng-dev/merge.ts b/.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';
 
diff --git a/.ng-dev/release.ts b/.ng-dev/release.ts
@@ -1,6 +1,6 @@
 import '../lib/bootstrap-local';
 
-import { ReleaseConfig } from '@angular/dev-infra-private/release/config';
+import { ReleaseConfig } from '@angular/dev-infra-private/ng-dev/release/config';
 import { releasePackages } from '../lib/packages';
 import buildPackages from '../scripts/build';
 
diff --git a/package.json b/package.json
@@ -73,7 +73,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#36a3079e3fb1c7527cf427d54ec2b57af45dd46e",
+    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#de0ec5f0034809f21c3a43139fe3a6032f4fb7fb",
     "@angular/forms": "12.2.1",
     "@angular/localize": "12.2.1",
     "@angular/material": "12.2.1",
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { FormatConfig } from '@angular/dev-infra-private/format/config';`
	`1`	`+import { FormatConfig } from '@angular/dev-infra-private/ng-dev/format/config';`
`2`	`2`
`3`	`3`	`/**`
`4`	`4`	* Configuration for the `ng-dev format` command.