diff --git a/.yarn/cache/@octokit-openapi-types-npm-11.2.0-10b7a5c509-eb373ea496.zip b/.yarn/cache/@octokit-openapi-types-npm-11.2.0-10b7a5c509-eb373ea496.zip deleted file mode 100644 index 8f882910f..000000000 Binary files a/.yarn/cache/@octokit-openapi-types-npm-11.2.0-10b7a5c509-eb373ea496.zip and /dev/null differ diff --git a/.yarn/cache/@octokit-openapi-types-npm-12.11.0-cc40f04bc8-8a7d4bd628.zip b/.yarn/cache/@octokit-openapi-types-npm-12.11.0-cc40f04bc8-8a7d4bd628.zip new file mode 100644 index 000000000..359bfcb0a Binary files /dev/null and b/.yarn/cache/@octokit-openapi-types-npm-12.11.0-cc40f04bc8-8a7d4bd628.zip differ diff --git a/.yarn/cache/@octokit-openapi-types-npm-16.0.0-2fe91e346e-844f30a545.zip b/.yarn/cache/@octokit-openapi-types-npm-16.0.0-2fe91e346e-844f30a545.zip new file mode 100644 index 000000000..efde9dd96 Binary files /dev/null and b/.yarn/cache/@octokit-openapi-types-npm-16.0.0-2fe91e346e-844f30a545.zip differ diff --git a/.yarn/cache/@octokit-plugin-paginate-rest-npm-2.17.0-4d48903092-c8753cda6f.zip b/.yarn/cache/@octokit-plugin-paginate-rest-npm-2.17.0-4d48903092-c8753cda6f.zip deleted file mode 100644 index 713ee03a5..000000000 Binary files a/.yarn/cache/@octokit-plugin-paginate-rest-npm-2.17.0-4d48903092-c8753cda6f.zip and /dev/null differ diff --git a/.yarn/cache/@octokit-plugin-paginate-rest-npm-2.21.3-82d2ad1bba-acf31de2ba.zip b/.yarn/cache/@octokit-plugin-paginate-rest-npm-2.21.3-82d2ad1bba-acf31de2ba.zip new file mode 100644 index 000000000..f30bb7981 Binary files /dev/null and b/.yarn/cache/@octokit-plugin-paginate-rest-npm-2.21.3-82d2ad1bba-acf31de2ba.zip differ diff --git a/.yarn/cache/@octokit-plugin-rest-endpoint-methods-npm-5.13.0-976c113da3-f331457e43.zip b/.yarn/cache/@octokit-plugin-rest-endpoint-methods-npm-5.13.0-976c113da3-f331457e43.zip deleted file mode 100644 index 4ac318f57..000000000 Binary files a/.yarn/cache/@octokit-plugin-rest-endpoint-methods-npm-5.13.0-976c113da3-f331457e43.zip and /dev/null differ diff --git a/.yarn/cache/@octokit-plugin-rest-endpoint-methods-npm-5.16.2-f54316c392-30fcc50c33.zip b/.yarn/cache/@octokit-plugin-rest-endpoint-methods-npm-5.16.2-f54316c392-30fcc50c33.zip new file mode 100644 index 000000000..1cfa3e631 Binary files /dev/null and b/.yarn/cache/@octokit-plugin-rest-endpoint-methods-npm-5.16.2-f54316c392-30fcc50c33.zip differ diff --git a/.yarn/cache/@octokit-types-npm-6.34.0-1de469b7ee-f122b9aee8.zip b/.yarn/cache/@octokit-types-npm-6.34.0-1de469b7ee-f122b9aee8.zip deleted file mode 100644 index 92ee0a5c7..000000000 Binary files a/.yarn/cache/@octokit-types-npm-6.34.0-1de469b7ee-f122b9aee8.zip and /dev/null differ diff --git a/.yarn/cache/@octokit-types-npm-6.41.0-5788f32962-fd6f75e0b1.zip b/.yarn/cache/@octokit-types-npm-6.41.0-5788f32962-fd6f75e0b1.zip new file mode 100644 index 000000000..bd9985e8c Binary files /dev/null and b/.yarn/cache/@octokit-types-npm-6.41.0-5788f32962-fd6f75e0b1.zip differ diff --git a/.yarn/cache/@octokit-types-npm-8.2.0-017b6699fe-cdb73ba5f1.zip b/.yarn/cache/@octokit-types-npm-8.2.0-017b6699fe-cdb73ba5f1.zip new file mode 100644 index 000000000..05dda19b5 Binary files /dev/null and b/.yarn/cache/@octokit-types-npm-8.2.0-017b6699fe-cdb73ba5f1.zip differ diff --git a/.yarn/cache/probot-npm-12.2.5-bf2c4c427d-d623627c62.zip b/.yarn/cache/probot-npm-12.3.0-6bc0bea729-0dbdf23f4b.zip similarity index 74% rename from .yarn/cache/probot-npm-12.2.5-bf2c4c427d-d623627c62.zip rename to .yarn/cache/probot-npm-12.3.0-6bc0bea729-0dbdf23f4b.zip index 93b50546c..53d25d500 100644 Binary files a/.yarn/cache/probot-npm-12.2.5-bf2c4c427d-d623627c62.zip and b/.yarn/cache/probot-npm-12.3.0-6bc0bea729-0dbdf23f4b.zip differ diff --git a/package.json b/package.json index e373823b9..0212727db 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "jsonwebtoken": "9.0.0", "liwi-mongo": "8.3.1", "lock": "1.1.0", - "probot": "12.2.5", + "probot": "12.3.0", "react": "18.2.0", "react-dom": "18.2.0", "simple-oauth2": "4.3.0", diff --git a/src/context/initRepoLabels.ts b/src/context/initRepoLabels.ts index f672c0ef3..6b11ba6a3 100644 --- a/src/context/initRepoLabels.ts +++ b/src/context/initRepoLabels.ts @@ -92,6 +92,8 @@ export const initRepoLabels = async < name: existingLabel.name !== labelConfig.name && labelConfig.name, color: existingLabel.color !== labelColor && labelColor, description: existingLabel.description !== description && description, + existingLabel, + labelColor, }, 'Needs to update label', ); diff --git a/src/context/repoContext.ts b/src/context/repoContext.ts index 6a38167c4..b51e28418 100644 --- a/src/context/repoContext.ts +++ b/src/context/repoContext.ts @@ -324,7 +324,7 @@ async function initRepoContext< const getNeedsReviewGroupNames = (labels: PullRequestLabels): GroupNames[] => labels .filter((label) => label.id && needsReviewLabelIds.includes(label.id)) - .map((label) => labelIdToGroupName.get(label.id!)) + .map((label) => labelIdToGroupName.get(label.id)) .filter(ExcludesFalsy); const lock = Lock(); diff --git a/src/events/pr-handlers/actions/utils/body/prOptions.ts b/src/events/pr-handlers/actions/utils/body/prOptions.ts index 3d02153af..8186d9a15 100644 --- a/src/events/pr-handlers/actions/utils/body/prOptions.ts +++ b/src/events/pr-handlers/actions/utils/body/prOptions.ts @@ -1,5 +1,5 @@ import type { RepoContext } from 'context/repoContext'; -import type { PullRequestWithDecentData } from 'events/pr-handlers/utils/PullRequestData'; +import type { PullRequestLabels } from 'events/pr-handlers/utils/PullRequestData'; import hasLabelInPR from '../labels/hasLabelInPR'; import type { RepositorySettings } from './repositorySettings'; @@ -61,7 +61,7 @@ export const optionsDescriptions: OptionDisplay[] = [ export const calcDefaultOptions = ( repoContext: RepoContext, - pullRequestLabels: PullRequestWithDecentData['labels'], + pullRequestLabels: PullRequestLabels, ): Options => { const automergeLabel = repoContext.labels['merge/automerge']; const skipCiLabel = repoContext.labels['merge/skip-ci']; diff --git a/src/events/pr-handlers/actions/utils/steps/BaseStepState.ts b/src/events/pr-handlers/actions/utils/steps/BaseStepState.ts index ae7676c0c..28dc4f591 100644 --- a/src/events/pr-handlers/actions/utils/steps/BaseStepState.ts +++ b/src/events/pr-handlers/actions/utils/steps/BaseStepState.ts @@ -1,5 +1,8 @@ import type { RepoContext } from 'context/repoContext'; -import type { PullRequestWithDecentData } from '../../../utils/PullRequestData'; +import type { + PullRequestLabels, + PullRequestWithDecentData, +} from '../../../utils/PullRequestData'; export type StepState = 'not-started' | 'in-progress' | 'failed' | 'passed'; @@ -10,5 +13,5 @@ export interface BaseStepState { export interface CalcStepOptions { repoContext: RepoContext; pullRequest: PullRequestWithDecentData; - labels: PullRequestWithDecentData['labels']; + labels: PullRequestLabels; } diff --git a/src/events/pr-handlers/actions/utils/steps/calcStepsState.ts b/src/events/pr-handlers/actions/utils/steps/calcStepsState.ts index d06de1812..25798a377 100644 --- a/src/events/pr-handlers/actions/utils/steps/calcStepsState.ts +++ b/src/events/pr-handlers/actions/utils/steps/calcStepsState.ts @@ -1,5 +1,8 @@ import type { RepoContext } from 'context/repoContext'; -import type { PullRequestWithDecentData } from 'events/pr-handlers/utils/PullRequestData'; +import type { + PullRequestWithDecentData, + PullRequestLabels, +} from 'events/pr-handlers/utils/PullRequestData'; import type { ChecksStepState } from './checksStep'; import { calcChecksStep } from './checksStep'; import type { CodeReviewStepState } from './codeReviewStep'; @@ -12,7 +15,7 @@ import { calcWriteStep } from './writeStep'; export interface CalcStepsStateOptions { repoContext: RepoContext; pullRequest: PullRequestWithDecentData; - labels?: PullRequestWithDecentData['labels']; + labels?: PullRequestLabels; } export interface StepsState { diff --git a/src/events/pr-handlers/labelsChanged.ts b/src/events/pr-handlers/labelsChanged.ts index 25b6cf0a2..2f49ed67a 100644 --- a/src/events/pr-handlers/labelsChanged.ts +++ b/src/events/pr-handlers/labelsChanged.ts @@ -12,6 +12,7 @@ import { updateReviewStatus } from './actions/updateReviewStatus'; import { updateStatusCheckFromStepsState } from './actions/updateStatusCheckFromStepsState'; import hasLabelInPR from './actions/utils/labels/hasLabelInPR'; import { calcStepsState } from './actions/utils/steps/calcStepsState'; +import type { PullRequestLabels } from './utils/PullRequestData'; import { createPullRequestHandler } from './utils/createPullRequestHandler'; import { fetchPr } from './utils/fetchPr'; @@ -72,7 +73,7 @@ export default function labelsChanged( context.pullRequest({ event: 'APPROVE' }), ); - let labels = updatedPr.labels; + let labels: PullRequestLabels = updatedPr.labels; const autoMergeWithSkipCi = autoMergeSkipCiLabel && repoContext.config.autoMergeRenovateWithSkipCi; diff --git a/src/events/pr-handlers/utils/PullRequestData.ts b/src/events/pr-handlers/utils/PullRequestData.ts index e3438e8ff..fbab49622 100644 --- a/src/events/pr-handlers/utils/PullRequestData.ts +++ b/src/events/pr-handlers/utils/PullRequestData.ts @@ -1,3 +1,4 @@ +import type { LabelResponse } from 'context/initRepoLabels'; import type { CustomExtract, EventsWithRepository } from 'context/repoContext'; import type { ProbotEvent } from 'events/probot-types'; import type { EventsWithPullRequest } from './createPullRequestHandler'; @@ -30,4 +31,6 @@ export type PullRequestWithDecentData = | PullRequestFromRestEndpoint | PullRequestWithDecentDataFromWebhook; -export type PullRequestLabels = PullRequestWithDecentData['labels']; +export type PullRequestLabels = + | PullRequestWithDecentData['labels'] + | LabelResponse[]; diff --git a/yarn.lock b/yarn.lock index 3b6a61fd1..4cd816e62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1372,10 +1372,17 @@ __metadata: languageName: node linkType: hard -"@octokit/openapi-types@npm:^11.2.0": - version: 11.2.0 - resolution: "@octokit/openapi-types@npm:11.2.0" - checksum: eb373ea496bc96bf0233505a0916eb38cb193d1829cab935e1cf1fd21839c402a1d835d3c0326290c756c0ed980a64d0ae73ad3c5d5decde9000f0828aa7ff52 +"@octokit/openapi-types@npm:^12.11.0": + version: 12.11.0 + resolution: "@octokit/openapi-types@npm:12.11.0" + checksum: 8a7d4bd6288cc4085cabe0ca9af2b87c875c303af932cb138aa1b2290eb69d32407759ac23707bb02776466e671244a902e9857896903443a69aff4b6b2b0e3b + languageName: node + linkType: hard + +"@octokit/openapi-types@npm:^16.0.0": + version: 16.0.0 + resolution: "@octokit/openapi-types@npm:16.0.0" + checksum: 844f30a545da380d63c712e0eb733366bc567d1aab34529c79fdfbec3d73810e81d83f06fdab13058a5cbc7dae786db1a9b90b5b61b1e606854ee45d5ec5f194 languageName: node linkType: hard @@ -1390,13 +1397,13 @@ __metadata: linkType: hard "@octokit/plugin-paginate-rest@npm:^2.16.8, @octokit/plugin-paginate-rest@npm:^2.6.2": - version: 2.17.0 - resolution: "@octokit/plugin-paginate-rest@npm:2.17.0" + version: 2.21.3 + resolution: "@octokit/plugin-paginate-rest@npm:2.21.3" dependencies: - "@octokit/types": ^6.34.0 + "@octokit/types": ^6.40.0 peerDependencies: "@octokit/core": ">=2" - checksum: c8753cda6f7ede79d0e9df43a54e56020aa1c9c6887684e0e0d45cb6ee0dcabf460c3e4b8a18edabef711bb269fd826616e99e78dc29fb30d47c210c562603a0 + checksum: acf31de2ba4021bceec7ff49c5b0e25309fc3c009d407f153f928ddf436ab66cd4217344138378d5523f5fb233896e1db58c9c7b3ffd9612a66d760bc5d319ed languageName: node linkType: hard @@ -1410,14 +1417,14 @@ __metadata: linkType: hard "@octokit/plugin-rest-endpoint-methods@npm:^5.0.1, @octokit/plugin-rest-endpoint-methods@npm:^5.12.0": - version: 5.13.0 - resolution: "@octokit/plugin-rest-endpoint-methods@npm:5.13.0" + version: 5.16.2 + resolution: "@octokit/plugin-rest-endpoint-methods@npm:5.16.2" dependencies: - "@octokit/types": ^6.34.0 + "@octokit/types": ^6.39.0 deprecation: ^2.3.1 peerDependencies: "@octokit/core": ">=3" - checksum: f331457e4317130adb456b27df2a99609fb54a4dc2da6f87009e567c7325680c901abf18ad08483535bab4ec1c892e4236f4135a2804603aebb12c0698c678c8 + checksum: 30fcc50c335d1093f03573d9fa3a4b7d027fc98b215c43e07e82ee8dabfa0af0cf1b963feb542312ae32d897a2f68dc671577206f30850215517bebedc5a2c73 languageName: node linkType: hard @@ -1480,12 +1487,21 @@ __metadata: languageName: node linkType: hard -"@octokit/types@npm:^6.0.0, @octokit/types@npm:^6.0.1, @octokit/types@npm:^6.0.3, @octokit/types@npm:^6.1.1, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.34.0": - version: 6.34.0 - resolution: "@octokit/types@npm:6.34.0" +"@octokit/types@npm:^6.0.0, @octokit/types@npm:^6.0.1, @octokit/types@npm:^6.0.3, @octokit/types@npm:^6.1.1, @octokit/types@npm:^6.16.1, @octokit/types@npm:^6.39.0, @octokit/types@npm:^6.40.0": + version: 6.41.0 + resolution: "@octokit/types@npm:6.41.0" dependencies: - "@octokit/openapi-types": ^11.2.0 - checksum: f122b9aee8f6baddd515e34a0913e73b21d4bc82d6ee59d77a8aaf01b4a02c10867dd013003d087a83dc96db23511893669015af6d30c27cece185e21cf1df89 + "@octokit/openapi-types": ^12.11.0 + checksum: fd6f75e0b19b90d1a3d244d2b0c323ed8f2f05e474a281f60a321986683548ef2e0ec2b3a946aa9405d6092e055344455f69f58957c60f58368c8bdda5b7d2ab + languageName: node + linkType: hard + +"@octokit/types@npm:^8.0.0": + version: 8.2.0 + resolution: "@octokit/types@npm:8.2.0" + dependencies: + "@octokit/openapi-types": ^16.0.0 + checksum: cdb73ba5f18d85dc5d5d72ee3152920dfdfc413eeadc827ac201bb807f40e4223f8147a7b2e0bdfde7ea4e1ab8f2e7c0f25f9d30609c5d38a4fdf591d96c709e languageName: node linkType: hard @@ -8490,9 +8506,9 @@ __metadata: languageName: node linkType: hard -"probot@npm:12.2.5": - version: 12.2.5 - resolution: "probot@npm:12.2.5" +"probot@npm:12.3.0": + version: 12.3.0 + resolution: "probot@npm:12.3.0" dependencies: "@octokit/core": ^3.2.4 "@octokit/plugin-enterprise-compatibility": ^1.2.8 @@ -8500,7 +8516,7 @@ __metadata: "@octokit/plugin-rest-endpoint-methods": ^5.0.1 "@octokit/plugin-retry": ^3.0.6 "@octokit/plugin-throttling": ^3.3.4 - "@octokit/types": ^6.1.1 + "@octokit/types": ^8.0.0 "@octokit/webhooks": ^9.8.4 "@probot/get-private-key": ^1.1.0 "@probot/octokit-plugin-config": ^1.0.0 @@ -8529,7 +8545,7 @@ __metadata: uuid: ^8.3.2 bin: probot: bin/probot.js - checksum: d623627c62f213732151b2400d5fea763d80f1c8d93bd70885c6aaad2b9fbbda6a910b410062e36fd23421f90f8738f2d6d094797207a99b1ba69c50881b38a3 + checksum: 0dbdf23f4b99c9c0545637055a21b225820115e3fe7aecd7150f823f025e15bc454fb7a2a77a36f857f4f5e0da6f58a12ca98e19a532d812007fe7a7945e336c languageName: node linkType: hard @@ -9054,7 +9070,7 @@ resolve@^2.0.0-next.3: lock: 1.1.0 nock: 13.3.0 pob-babel: 34.1.0 - probot: 12.2.5 + probot: 12.3.0 react: 18.2.0 react-dom: 18.2.0 simple-oauth2: 4.3.0