Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@

# Misc
/* @angular/dev-infra-components @jelbourn
/.ng-dev/** @angular/dev-infra-components
/.github/** @angular/dev-infra-components @jelbourn
/.vscode/** @angular/dev-infra-components @mmalerba
/src/* @jelbourn
Expand Down
7 changes: 7 additions & 0 deletions .ng-dev/config.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import {github} from './github';
import {merge} from './merge';

module.exports = {
github,
merge,
};
10 changes: 10 additions & 0 deletions .ng-dev/github.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import {GithubConfig} from '@angular/dev-infra-private/utils/config';

/**
* Github configuration for the ng-dev command. This repository is
* uses as remote for the merge script.
*/
export const github: GithubConfig = {
owner: 'angular',
name: 'components'
};
19 changes: 2 additions & 17 deletions .ng-dev-config.ts → .ng-dev/merge.ts
Original file line number Diff line number Diff line change
@@ -1,22 +1,12 @@
import {MergeConfig} from '@angular/dev-infra-private/pr/merge/config';
import {determineMergeBranches} from '@angular/dev-infra-private/pr/merge/determine-merge-branches';
import {GithubConfig} from '@angular/dev-infra-private/utils/config';

/**
* Github configuration for the ng-dev command. This repository is
* uses as remote for the merge script.
*/
const github: GithubConfig = {
owner: 'angular',
name: 'components'
};

/**
* 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).
*/
const merge = (): MergeConfig => {
const currentVersion = require('./package.json').version;
export const merge = (): MergeConfig => {
const currentVersion = require('../package.json').version;
// We use the `@angular/cdk` as source of truth for the latest published version in NPM.
// Any package from the monorepo could technically work and result in the same version.
const {minor, patch} = determineMergeBranches(currentVersion, '@angular/cdk');
Expand Down Expand Up @@ -57,8 +47,3 @@ const merge = (): MergeConfig => {
],
};
};

module.exports = {
github,
merge,
};