Skip to content

Commit b4f9183

Browse files
josephperrottatscott
authored andcommitted
build: update configuration for ng-dev
Update the ng-dev configuration to match updated config definitions with new verison.
1 parent 2a02eaf commit b4f9183

File tree

3 files changed

+98
-25
lines changed

3 files changed

+98
-25
lines changed

.ng-dev/merge.ts

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,28 @@
1-
import {DevInfraMergeConfig} from '@angular/dev-infra-private/pr/merge/config'
2-
import {getDefaultTargetLabelConfiguration} from '@angular/dev-infra-private/pr/merge/defaults';
3-
import {ReleaseConfig} from '@angular/dev-infra-private/release/config';
4-
5-
import {github} from './github'
1+
import {PullRequestConfig, ReleaseConfig} from '@angular/dev-infra-private/ng-dev';
62

73
/** Configuration for the `ng-dev release` command, defined here for use by the merge config. */
84
export const release: ReleaseConfig = {
9-
npmPackages: ['@angular/language-server'],
5+
representativeNpmPackage: '@angular/language-server',
6+
npmPackages: [{name: '@angular/language-server'}],
107
buildPackages: async () => [],
11-
generateReleaseNotesForHead: async () => {},
128
};
139

1410

1511
/**
1612
* Configuration for the merge tool in `ng-dev`. This sets up the labels which
1713
* are respected by the merge script (e.g. the target labels).
1814
*/
19-
export const merge: DevInfraMergeConfig['merge'] = async api => {
20-
return {
21-
// By default, the merge script merges locally with `git cherry-pick` and autosquash.
22-
// This has the downside of pull requests showing up as `Closed` instead of `Merged`.
23-
// In the components repository, since we don't use fixup or squash commits, we can
24-
// use the Github API merge strategy. That way we ensure that PRs show up as `Merged`.
25-
githubApiMerge: {
26-
default: 'squash',
27-
labels: [
28-
{pattern: 'preserve commits', method: 'rebase'},
29-
],
30-
},
31-
claSignedLabel: 'cla: yes',
32-
mergeReadyLabel: 'action: merge',
33-
commitMessageFixupLabel: 'commit message fixup',
34-
labels: await getDefaultTargetLabelConfiguration(api, github, release),
35-
};
15+
export const merge: PullRequestConfig = {
16+
// By default, the merge script merges locally with `git cherry-pick` and autosquash.
17+
// This has the downside of pull requests showing up as `Closed` instead of `Merged`.
18+
// In the components repository, since we don't use fixup or squash commits, we can
19+
// use the Github API merge strategy. That way we ensure that PRs show up as `Merged`.
20+
githubApiMerge: {
21+
default: 'squash',
22+
labels: [
23+
{pattern: 'preserve commits', method: 'rebase'},
24+
],
25+
},
26+
mergeReadyLabel: 'action: merge',
27+
commitMessageFixupLabel: 'commit message fixup'
3628
};

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,7 @@
222222
"jasmine": "3.99.0",
223223
"prettier": "2.5.1",
224224
"tslint": "6.1.3",
225+
"ts-node": "^10.0.0",
225226
"tslint-eslint-rules": "5.4.0",
226227
"vsce": "1.100.1",
227228
"vscode-languageserver-protocol": "3.16.0",

yarn.lock

Lines changed: 81 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@
131131

132132
"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#0598c41ff6f941f71449fc7554a68b59afbd40a9":
133133
version "0.0.0-7e0a7c63ca0f1bef60475dd9d38434c0a74c14e1"
134-
uid "0598c41ff6f941f71449fc7554a68b59afbd40a9"
135134
resolved "https://github.com/angular/dev-infra-private-builds.git#0598c41ff6f941f71449fc7554a68b59afbd40a9"
136135
dependencies:
137136
"@angular-devkit/build-angular" "14.0.0-next.12"
@@ -1144,6 +1143,18 @@
11441143
dependencies:
11451144
google-protobuf "^3.6.1"
11461145

1146+
"@cspotcode/[email protected]":
1147+
version "0.8.0"
1148+
resolved "https://registry.yarnpkg.com/@cspotcode/source-map-consumer/-/source-map-consumer-0.8.0.tgz#33bf4b7b39c178821606f669bbc447a6a629786b"
1149+
integrity sha512-41qniHzTU8yAGbCp04ohlmSrZf8bkf/iJsl3V0dRGsQN/5GFfx+LbCSsCpp2gqrqjTVg/K6O8ycoV35JIwAzAg==
1150+
1151+
"@cspotcode/[email protected]":
1152+
version "0.7.0"
1153+
resolved "https://registry.yarnpkg.com/@cspotcode/source-map-support/-/source-map-support-0.7.0.tgz#4789840aa859e46d2f3173727ab707c66bf344f5"
1154+
integrity sha512-X4xqRHqN8ACt2aHVe51OxeA2HjbcL4MqFqXkrmQszJ1NOUuUu5u6Vqx/0lZSVNku7velL5FC/s5uEAj1lsBMhA==
1155+
dependencies:
1156+
"@cspotcode/source-map-consumer" "0.8.0"
1157+
11471158
"@csstools/postcss-color-function@^1.0.3":
11481159
version "1.1.0"
11491160
resolved "https://registry.yarnpkg.com/@csstools/postcss-color-function/-/postcss-color-function-1.1.0.tgz#229966327747f58fbe586de35daa139db3ce1e5d"
@@ -1450,6 +1461,26 @@
14501461
resolved "https://registry.yarnpkg.com/@tootallnate/once/-/once-1.1.2.tgz#ccb91445360179a04e7fe6aff78c00ffc1eeaf82"
14511462
integrity sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==
14521463

1464+
"@tsconfig/node10@^1.0.7":
1465+
version "1.0.8"
1466+
resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
1467+
integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==
1468+
1469+
"@tsconfig/node12@^1.0.7":
1470+
version "1.0.9"
1471+
resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c"
1472+
integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==
1473+
1474+
"@tsconfig/node14@^1.0.0":
1475+
version "1.0.1"
1476+
resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2"
1477+
integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==
1478+
1479+
"@tsconfig/node16@^1.0.2":
1480+
version "1.0.2"
1481+
resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
1482+
integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
1483+
14531484
14541485
version "1.0.38"
14551486
resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9"
@@ -1870,6 +1901,11 @@ acorn-import-assertions@^1.7.6:
18701901
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz#ba2b5939ce62c238db6d93d81c9b111b29b855e9"
18711902
integrity sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==
18721903

1904+
acorn-walk@^8.1.1:
1905+
version "8.2.0"
1906+
resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-8.2.0.tgz#741210f2e2426454508853a2f44d0ab83b7f69c1"
1907+
integrity sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==
1908+
18731909
acorn@^8.4.1, acorn@^8.5.0:
18741910
version "8.7.1"
18751911
resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
@@ -2008,6 +2044,11 @@ anymatch@~3.1.2:
20082044
normalize-path "^3.0.0"
20092045
picomatch "^2.0.4"
20102046

2047+
arg@^4.1.0:
2048+
version "4.1.3"
2049+
resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
2050+
integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
2051+
20112052
argparse@^1.0.7, argparse@~1.0.9:
20122053
version "1.0.10"
20132054
resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -2842,6 +2883,11 @@ cosmiconfig@^7.0.0:
28422883
path-type "^4.0.0"
28432884
yaml "^1.10.0"
28442885

2886+
create-require@^1.1.0:
2887+
version "1.1.1"
2888+
resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
2889+
integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
2890+
28452891
28462892
version "0.0.16"
28472893
resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.16.tgz#ffa2c5561a65b43c53b940036237ce72dcebfe93"
@@ -4896,6 +4942,11 @@ make-dir@^3.0.2, make-dir@^3.1.0:
48964942
dependencies:
48974943
semver "^6.0.0"
48984944

4945+
make-error@^1.1.1:
4946+
version "1.3.6"
4947+
resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
4948+
integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
4949+
48994950
markdown-it@^10.0.0:
49004951
version "10.0.0"
49014952
resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-10.0.0.tgz#abfc64f141b1722d663402044e43927f1f50a8dc"
@@ -7015,6 +7066,25 @@ [email protected]:
70157066
resolved "https://registry.yarnpkg.com/true-case-path/-/true-case-path-2.2.1.tgz#c5bf04a5bbec3fd118be4084461b3a27c4d796bf"
70167067
integrity sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==
70177068

7069+
ts-node@^10.0.0:
7070+
version "10.7.0"
7071+
resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5"
7072+
integrity sha512-TbIGS4xgJoX2i3do417KSaep1uRAW/Lu+WAL2doDHC0D6ummjirVOXU5/7aiZotbQ5p1Zp9tP7U6cYhA0O7M8A==
7073+
dependencies:
7074+
"@cspotcode/source-map-support" "0.7.0"
7075+
"@tsconfig/node10" "^1.0.7"
7076+
"@tsconfig/node12" "^1.0.7"
7077+
"@tsconfig/node14" "^1.0.0"
7078+
"@tsconfig/node16" "^1.0.2"
7079+
acorn "^8.4.1"
7080+
acorn-walk "^8.1.1"
7081+
arg "^4.1.0"
7082+
create-require "^1.1.0"
7083+
diff "^4.0.1"
7084+
make-error "^1.1.1"
7085+
v8-compile-cache-lib "^3.0.0"
7086+
yn "3.1.1"
7087+
70187088
70197089
version "1.9.0"
70207090
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.0.tgz#e37a86fda8cbbaf23a057f473c9f4dc64e5fc2e8"
@@ -7246,6 +7316,11 @@ uuid@^8.3.2:
72467316
resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
72477317
integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
72487318

7319+
v8-compile-cache-lib@^3.0.0:
7320+
version "3.0.1"
7321+
resolved "https://registry.yarnpkg.com/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz#6336e8d71965cb3d35a1bbb7868445a7c05264bf"
7322+
integrity sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==
7323+
72497324
validator@^13.7.0:
72507325
version "13.7.0"
72517326
resolved "https://registry.yarnpkg.com/validator/-/validator-13.7.0.tgz#4f9658ba13ba8f3d82ee881d3516489ea85c0857"
@@ -7717,6 +7792,11 @@ yazl@^2.2.2:
77177792
dependencies:
77187793
buffer-crc32 "~0.2.3"
77197794

7795+
7796+
version "3.1.1"
7797+
resolved "https://registry.yarnpkg.com/yn/-/yn-3.1.1.tgz#1e87401a09d767c1d5eab26a6e4c185182d2eb50"
7798+
integrity sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==
7799+
77207800
z-schema@~5.0.2:
77217801
version "5.0.3"
77227802
resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-5.0.3.tgz#68fafb9b735fc7f3c89eabb3e5a6353b4d7b4935"

0 commit comments

Comments
 (0)