Skip to content

Commit 6c17dcb

Browse files
committed
fix(dev-infra): fix ng-dev configuration
1 parent 6e3d642 commit 6c17dcb

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

.ng-dev/config.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1+
import {format} from './format';
12
import {github} from './github';
2-
import {merge} from './merge';
3+
import {pullRequest} from './pullRequest';
34

45
export {
6+
format,
57
github,
6-
merge,
8+
pullRequest,
79
}

.ng-dev/format.ts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import {FormatConfig} from '@angular/dev-infra-private/ng-dev';
2+
3+
/**
4+
* Configuration for the `ng-dev format` command.
5+
*/
6+
export const format: FormatConfig = {
7+
'clang-format': {
8+
'matchers': [
9+
'**/*.{js,ts}',
10+
],
11+
},
12+
'buildifier': true,
13+
};

.ng-dev/github.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
import {GithubConfig} from '@angular/dev-infra-private/utils/config';
1+
import {GithubConfig} from '@angular/dev-infra-private/ng-dev';
22

33
/**
44
* Github configuration for the `ng-dev` toolset.
55
*/
66
export const github: GithubConfig = {
77
name: 'vscode-ng-language-service',
88
owner: 'angular',
9+
mainBranchName: 'main',
910
};

.ng-dev/merge.ts renamed to .ng-dev/pullRequest.ts

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,10 @@
1-
import {PullRequestConfig, ReleaseConfig} from '@angular/dev-infra-private/ng-dev';
2-
3-
/** Configuration for the `ng-dev release` command, defined here for use by the merge config. */
4-
export const release: ReleaseConfig = {
5-
representativeNpmPackage: '@angular/language-server',
6-
npmPackages: [{name: '@angular/language-server'}],
7-
buildPackages: async () => [],
8-
};
9-
1+
import {PullRequestConfig} from '@angular/dev-infra-private/ng-dev';
102

113
/**
124
* Configuration for the merge tool in `ng-dev`. This sets up the labels which
135
* are respected by the merge script (e.g. the target labels).
146
*/
15-
export const merge: PullRequestConfig = {
7+
export const pullRequest: PullRequestConfig = {
168
// By default, the merge script merges locally with `git cherry-pick` and autosquash.
179
// This has the downside of pull requests showing up as `Closed` instead of `Merged`.
1810
// In the components repository, since we don't use fixup or squash commits, we can

0 commit comments

Comments
 (0)