diff --git a/.ng-dev/pull-request.ts b/.ng-dev/pull-request.ts index cec9b1982164..ec2fc6d80ce0 100644 --- a/.ng-dev/pull-request.ts +++ b/.ng-dev/pull-request.ts @@ -9,7 +9,6 @@ export const pullRequest: PullRequestConfig = { default: 'rebase', labels: [{ pattern: 'squash commits', method: 'squash' }], }, - claSignedLabel: 'cla: yes', mergeReadyLabel: /^action: merge(-assistance)?/, caretakerNoteLabel: /(action: merge-assistance)/, commitMessageFixupLabel: 'commit message fixup', diff --git a/.ng-dev/release.ts b/.ng-dev/release.ts index c6071a9313f6..874d4b1679f2 100644 --- a/.ng-dev/release.ts +++ b/.ng-dev/release.ts @@ -4,10 +4,14 @@ import { ReleaseConfig } from '@angular/dev-infra-private/ng-dev/release/config' import { releasePackages } from '../lib/packages'; import buildPackages from '../scripts/build'; -const npmPackages = Object.keys(releasePackages); +const npmPackages = Object.entries(releasePackages).map(([name, { experimental }]) => ({ + name, + experimental, +})); /** Configuration for the `ng-dev release` command. */ export const release: ReleaseConfig = { + representativeNpmPackage: '@angular/cli', npmPackages, buildPackages: () => buildPackages(), releaseNotes: { diff --git a/package.json b/package.json index eab57806718d..4e8fb58c9b2e 100644 --- a/package.json +++ b/package.json @@ -71,7 +71,7 @@ "@angular/compiler": "13.1.0", "@angular/compiler-cli": "13.1.0", "@angular/core": "13.1.0", - "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#d206b030f3dc60a85777604a8f3d1bc8156454f2", + "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#2156ef860d69f7001c01e1fcb2c7087f8cbf8e5d", "@angular/forms": "13.1.0", "@angular/localize": "13.1.0", "@angular/material": "13.1.0", diff --git a/yarn.lock b/yarn.lock index 843398ca22aa..3b08ea88b06f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -211,10 +211,9 @@ dependencies: tslib "^2.0.0" -"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#d206b030f3dc60a85777604a8f3d1bc8156454f2": - version "0.0.0-a480a99a0d757e3b6fe9dec8ce6d3a60149efc13" - uid d206b030f3dc60a85777604a8f3d1bc8156454f2 - resolved "https://github.com/angular/dev-infra-private-builds.git#d206b030f3dc60a85777604a8f3d1bc8156454f2" +"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#2156ef860d69f7001c01e1fcb2c7087f8cbf8e5d": + version "0.0.0-0b4cae4acd9d42f33af92951947a30d6aa165070" + resolved "https://github.com/angular/dev-infra-private-builds.git#2156ef860d69f7001c01e1fcb2c7087f8cbf8e5d" dependencies: "@actions/core" "^1.4.0" "@actions/github" "^5.0.0" @@ -267,6 +266,7 @@ typed-graphqlify "^3.1.1" typescript "~4.5.0" uuid "^8.3.2" + which "^2.0.2" yaml "^1.10.0" yargs "^17.0.0" @@ -9662,7 +9662,6 @@ sass@1.44.0, sass@^1.32.8: "sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz": version "0.0.0" - uid "992e2cb0d91e54b27a4f5bbd2049f3b774718115" resolved "https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz#992e2cb0d91e54b27a4f5bbd2049f3b774718115" saucelabs@^1.5.0: @@ -10798,12 +10797,7 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@4.5.3: - version "4.5.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.3.tgz#afaa858e68c7103317d89eb90c5d8906268d353c" - integrity sha512-eVYaEHALSt+s9LbvgEv4Ef+Tdq7hBiIZgii12xXJnukryt3pMgJf6aKhoCZ3FWQsu6sydEnkg11fYXLzhLBjeQ== - -typescript@~4.5.2: +typescript@4.5.3, typescript@~4.5.2: version "4.5.3" resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.5.3.tgz#afaa858e68c7103317d89eb90c5d8906268d353c" integrity sha512-eVYaEHALSt+s9LbvgEv4Ef+Tdq7hBiIZgii12xXJnukryt3pMgJf6aKhoCZ3FWQsu6sydEnkg11fYXLzhLBjeQ==