build: replace ng-dev MergeConfig wiith PullRequestConfig

More info: angular/dev-infra@c3f5729
angular · Sep 22, 2021 · b99371e · b99371e · edward590 · Aug 16, 2022
1 parent 5adfad3
commit b99371e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.ng-dev/config.ts b/.ng-dev/config.ts
@@ -1,5 +1,5 @@
 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';
diff --git a/.ng-dev/merge.ts → .ng-dev/pull-request.ts b/.ng-dev/merge.ts → .ng-dev/pull-request.ts
@@ -1,10 +1,10 @@
-import { MergeConfig } from '@angular/dev-infra-private/ng-dev/pr/merge/config';
+import { PullRequestConfig } from '@angular/dev-infra-private/ng-dev/pr/config';
 
 /**
  * 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 merge: MergeConfig = {
+export const pullRequest: PullRequestConfig = {
   githubApiMerge: {
     default: 'rebase',
     labels: [{ pattern: 'squash commits', method: 'squash' }],