From c250c81ed34e572bfca498e35498c59d6e81ac4b Mon Sep 17 00:00:00 2001 From: Angular Robot Date: Thu, 20 Mar 2025 17:40:54 +0000 Subject: [PATCH 1/2] build: update octokit dependencies Closes #2670 as a pr takeover --- package.json | 8 ++--- yarn.lock | 90 +++++++++++++++++++++++----------------------------- 2 files changed, 43 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index 2beb53e96..635b4aa87 100644 --- a/package.json +++ b/package.json @@ -79,12 +79,12 @@ "@octokit/core": "6.1.4", "@octokit/graphql": "8.2.1", "@octokit/graphql-schema": "patch:@octokit/graphql-schema@npm%3A15.3.0#~/.yarn/patches/@octokit-graphql-schema-npm-15.3.0-4046a59648.patch", - "@octokit/openapi-types": "24.1.0", - "@octokit/plugin-paginate-rest": "11.4.3", - "@octokit/plugin-rest-endpoint-methods": "13.3.1", + "@octokit/openapi-types": "24.2.0", + "@octokit/plugin-paginate-rest": "11.6.0", + "@octokit/plugin-rest-endpoint-methods": "13.5.0", "@octokit/request-error": "6.1.7", "@octokit/rest": "21.1.1", - "@octokit/types": "13.8.1", + "@octokit/types": "13.10.0", "@octokit/webhooks-definitions": "3.67.3", "@octokit/webhooks-types": "7.6.1", "@openid/appauth": "^1.3.1", diff --git a/yarn.lock b/yarn.lock index 1d9db8ca1..2c8f47e68 100644 --- a/yarn.lock +++ b/yarn.lock @@ -262,12 +262,12 @@ __metadata: "@octokit/core": "npm:6.1.4" "@octokit/graphql": "npm:8.2.1" "@octokit/graphql-schema": "patch:@octokit/graphql-schema@npm%3A15.3.0#~/.yarn/patches/@octokit-graphql-schema-npm-15.3.0-4046a59648.patch" - "@octokit/openapi-types": "npm:24.1.0" - "@octokit/plugin-paginate-rest": "npm:11.4.3" - "@octokit/plugin-rest-endpoint-methods": "npm:13.3.1" + "@octokit/openapi-types": "npm:24.2.0" + "@octokit/plugin-paginate-rest": "npm:11.6.0" + "@octokit/plugin-rest-endpoint-methods": "npm:13.5.0" "@octokit/request-error": "npm:6.1.7" "@octokit/rest": "npm:21.1.1" - "@octokit/types": "npm:13.8.1" + "@octokit/types": "npm:13.10.0" "@octokit/webhooks-definitions": "npm:3.67.3" "@octokit/webhooks-types": "npm:7.6.1" "@openid/appauth": "npm:^1.3.1" @@ -1563,7 +1563,7 @@ __metadata: languageName: node linkType: hard -"@firebase/database-types@npm:1.0.10, @firebase/database-types@npm:^1.0.6": +"@firebase/database-types@npm:1.0.10": version: 1.0.10 resolution: "@firebase/database-types@npm:1.0.10" dependencies: @@ -1573,6 +1573,16 @@ __metadata: languageName: node linkType: hard +"@firebase/database-types@npm:^1.0.6": + version: 1.0.9 + resolution: "@firebase/database-types@npm:1.0.9" + dependencies: + "@firebase/app-types": "npm:0.9.3" + "@firebase/util": "npm:1.11.0" + checksum: 10c0/95a6e1ba8ad5fcc0786f47088dd703e5fc7a0d6ad4d712b2feec0065cefae7683327d7e90320f4a025015ddb72543db9c62a73277589bc965963251f299fefbb + languageName: node + linkType: hard + "@firebase/database@npm:1.0.14": version: 1.0.14 resolution: "@firebase/database@npm:1.0.14" @@ -3132,10 +3142,10 @@ __metadata: languageName: node linkType: hard -"@octokit/openapi-types@npm:24.1.0": - version: 24.1.0 - resolution: "@octokit/openapi-types@npm:24.1.0" - checksum: 10c0/87d65951b52b6645017d9c6933fdfb62ff93c28450d790aa05a7c29ec9c9d026789838afaf396cf0ea121ccd6eaf45ae0d0709551e0da7b563256ae1de857030 +"@octokit/openapi-types@npm:24.2.0, @octokit/openapi-types@npm:^24.2.0": + version: 24.2.0 + resolution: "@octokit/openapi-types@npm:24.2.0" + checksum: 10c0/8f47918b35e9b7f6109be6f7c8fc3a64ad13a48233112b29e92559e64a564b810eb3ebf81b4cd0af1bb2989d27b9b95cca96e841ec4e23a3f68703cefe62fd9e languageName: node linkType: hard @@ -3146,25 +3156,14 @@ __metadata: languageName: node linkType: hard -"@octokit/openapi-types@npm:^24.0.0, @octokit/openapi-types@npm:^24.2.0": - version: 24.2.0 - resolution: "@octokit/openapi-types@npm:24.2.0" - checksum: 10c0/8f47918b35e9b7f6109be6f7c8fc3a64ad13a48233112b29e92559e64a564b810eb3ebf81b4cd0af1bb2989d27b9b95cca96e841ec4e23a3f68703cefe62fd9e - languageName: node - linkType: hard - -"@octokit/plugin-paginate-rest@npm:11.4.3": - version: 11.4.3 - resolution: "@octokit/plugin-paginate-rest@npm:11.4.3" - dependencies: - "@octokit/types": "npm:^13.7.0" - peerDependencies: - "@octokit/core": ">=6" - checksum: 10c0/132fa9c4eacec84d8025866775f0325a752a4c7496a61ebafbd72c80626ead44d1efdae738f1dffd70e2bf3a34e007693ea2356fca5c2a1be445ac466231c395 +"@octokit/openapi-types@npm:^23.0.1": + version: 23.0.1 + resolution: "@octokit/openapi-types@npm:23.0.1" + checksum: 10c0/ab734ceb26343d9f051a59503b8cb5bdc7fec9ca044b60511b227179bec73141dd9144a6b2d68bcd737741881b136c1b7d5392da89ae2e35e39acc489e5eb4c1 languageName: node linkType: hard -"@octokit/plugin-paginate-rest@npm:^11.4.2": +"@octokit/plugin-paginate-rest@npm:11.6.0, @octokit/plugin-paginate-rest@npm:^11.4.2": version: 11.6.0 resolution: "@octokit/plugin-paginate-rest@npm:11.6.0" dependencies: @@ -3195,14 +3194,14 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-rest-endpoint-methods@npm:13.3.1": - version: 13.3.1 - resolution: "@octokit/plugin-rest-endpoint-methods@npm:13.3.1" +"@octokit/plugin-rest-endpoint-methods@npm:13.5.0, @octokit/plugin-rest-endpoint-methods@npm:^13.3.0": + version: 13.5.0 + resolution: "@octokit/plugin-rest-endpoint-methods@npm:13.5.0" dependencies: - "@octokit/types": "npm:^13.8.0" + "@octokit/types": "npm:^13.10.0" peerDependencies: "@octokit/core": ">=6" - checksum: 10c0/bb9c16c4a05299ed32d871c170c658db5bb81104a276cc2dda80b8ed3038a467124ef5c7d6f3a170a215197f0507c15915f0dc91f0651233d992cee8a9cf3eb0 + checksum: 10c0/0dd5fcdc01ac82abeab26fa32fd1c504732918bc70ad8e16924dd4d155dfd4bc8b57f2326c5012276885b9d59be3eb1e8d0b2576f5915a3b3343f26359cdba5e languageName: node linkType: hard @@ -3217,17 +3216,6 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-rest-endpoint-methods@npm:^13.3.0": - version: 13.5.0 - resolution: "@octokit/plugin-rest-endpoint-methods@npm:13.5.0" - dependencies: - "@octokit/types": "npm:^13.10.0" - peerDependencies: - "@octokit/core": ">=6" - checksum: 10c0/0dd5fcdc01ac82abeab26fa32fd1c504732918bc70ad8e16924dd4d155dfd4bc8b57f2326c5012276885b9d59be3eb1e8d0b2576f5915a3b3343f26359cdba5e - languageName: node - linkType: hard - "@octokit/request-error@npm:6.1.7, @octokit/request-error@npm:^6.1.7": version: 6.1.7 resolution: "@octokit/request-error@npm:6.1.7" @@ -3285,12 +3273,12 @@ __metadata: languageName: node linkType: hard -"@octokit/types@npm:13.8.1": - version: 13.8.1 - resolution: "@octokit/types@npm:13.8.1" +"@octokit/types@npm:13.10.0, @octokit/types@npm:^13.10.0": + version: 13.10.0 + resolution: "@octokit/types@npm:13.10.0" dependencies: - "@octokit/openapi-types": "npm:^24.0.0" - checksum: 10c0/9e21520faad0788c217eda0555516e3b071b9d50ca700a192f4b2e779c2393b3978214bc6c3ed8fadd8c8bc77f3ba4c2a9d35170d795d8e4ba7254d9c7b275b7 + "@octokit/openapi-types": "npm:^24.2.0" + checksum: 10c0/f66a401b89d653ec28e5c1529abdb7965752db4d9d40fa54c80e900af4c6bf944af6bd0a83f5b4f1eecb72e3d646899dfb27ffcf272ac243552de7e3b97a038d languageName: node linkType: hard @@ -3303,12 +3291,12 @@ __metadata: languageName: node linkType: hard -"@octokit/types@npm:^13.0.0, @octokit/types@npm:^13.1.0, @octokit/types@npm:^13.10.0, @octokit/types@npm:^13.6.2, @octokit/types@npm:^13.7.0, @octokit/types@npm:^13.8.0": - version: 13.10.0 - resolution: "@octokit/types@npm:13.10.0" +"@octokit/types@npm:^13.0.0, @octokit/types@npm:^13.1.0, @octokit/types@npm:^13.6.2, @octokit/types@npm:^13.8.0": + version: 13.8.0 + resolution: "@octokit/types@npm:13.8.0" dependencies: - "@octokit/openapi-types": "npm:^24.2.0" - checksum: 10c0/f66a401b89d653ec28e5c1529abdb7965752db4d9d40fa54c80e900af4c6bf944af6bd0a83f5b4f1eecb72e3d646899dfb27ffcf272ac243552de7e3b97a038d + "@octokit/openapi-types": "npm:^23.0.1" + checksum: 10c0/e08c2fcf10e374f18e4c9fa12a6ada33a40f112d1209012a39f0ce40ae7aa9dcf0598b6007b467f63cc4a97e7b1388d6eed34ddef61494655e08b5a95afaad97 languageName: node linkType: hard From 8620fd885c2b7d5d99e8d938492106d3e9b363df Mon Sep 17 00:00:00 2001 From: Joey Perrott Date: Fri, 21 Mar 2025 09:13:52 -0600 Subject: [PATCH 2/2] fixup! build: update octokit dependencies --- ng-dev/pr/merge/strategies/api-merge.ts | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/ng-dev/pr/merge/strategies/api-merge.ts b/ng-dev/pr/merge/strategies/api-merge.ts index e689e8c5d..84a1aba85 100644 --- a/ng-dev/pr/merge/strategies/api-merge.ts +++ b/ng-dev/pr/merge/strategies/api-merge.ts @@ -196,13 +196,10 @@ export class GithubApiMergeStrategy extends MergeStrategy { /** Gets all commit messages of commits in the pull request. */ private async _getPullRequestCommitMessages({prNumber}: PullRequest) { - const allCommits: OctokitPullRequestCommitsList = await this.git.github.paginate( - this.git.github.pulls.listCommits, - { - ...this.git.remoteParams, - pull_number: prNumber, - }, - ); + const allCommits = await this.git.github.paginate(this.git.github.pulls.listCommits, { + ...this.git.remoteParams, + pull_number: prNumber, + }); return allCommits.map(({commit}) => commit.message); }