File tree Expand file tree Collapse file tree 4 files changed +21
-13
lines changed Expand file tree Collapse file tree 4 files changed +21
-13
lines changed Original file line number Diff line number Diff line change
1
+ import { format } from './format' ;
1
2
import { github } from './github' ;
2
- import { merge } from './merge ' ;
3
+ import { pullRequest } from './pullRequest ' ;
3
4
4
5
export {
6
+ format ,
5
7
github ,
6
- merge ,
8
+ pullRequest ,
7
9
}
Original file line number Diff line number Diff line change
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
+ } ;
Original file line number Diff line number Diff line change 1
- import { GithubConfig } from '@angular/dev-infra-private/utils/config ' ;
1
+ import { GithubConfig } from '@angular/dev-infra-private/ng-dev ' ;
2
2
3
3
/**
4
4
* Github configuration for the `ng-dev` toolset.
5
5
*/
6
6
export const github : GithubConfig = {
7
7
name : 'vscode-ng-language-service' ,
8
8
owner : 'angular' ,
9
+ mainBranchName : 'main' ,
9
10
} ;
Original file line number Diff line number Diff line change 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' ;
10
2
11
3
/**
12
4
* Configuration for the merge tool in `ng-dev`. This sets up the labels which
13
5
* are respected by the merge script (e.g. the target labels).
14
6
*/
15
- export const merge : PullRequestConfig = {
7
+ export const pullRequest : PullRequestConfig = {
16
8
// By default, the merge script merges locally with `git cherry-pick` and autosquash.
17
9
// This has the downside of pull requests showing up as `Closed` instead of `Merged`.
18
10
// In the components repository, since we don't use fixup or squash commits, we can
You can’t perform that action at this time.
0 commit comments