Skip to content

Commit 16c32f7

Browse files
iowillhoitiowillhoit
authored
Merge pull request #1335 from salesforcecli/sh/bump-octokit
W-17868231 - fix: bump octokit dependencies
2 parents f58ccce + 7eda59c commit 16c32f7

File tree

4 files changed

+80
-101
lines changed

4 files changed

+80
-101
lines changed

‎package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
},
1111
"dependencies": {
1212
"@oclif/core": "^4.2.6",
13-
"@octokit/core": "^4.2.4",
14-
"@octokit/plugin-paginate-rest": "^11.4.1",
15-
"@octokit/plugin-throttling": "^5.2.3",
13+
"@octokit/core": "^6.1.4",
14+
"@octokit/plugin-paginate-rest": "^11.4.2",
15+
"@octokit/plugin-throttling": "^9.4.0",
1616
"@salesforce/cli-plugins-testkit": "^5.3.39",
1717
"@salesforce/core": "^8.8.2",
1818
"@salesforce/kit": "^3.2.0",

‎src/commands/cli/release/automerge.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
99
import { Octokit } from '@octokit/core';
1010
import { components } from '@octokit/openapi-types';
1111
import { Env } from '@salesforce/kit';
12-
import { ensureString } from '@salesforce/ts-types';
12+
import { type AnyJson, ensureString } from '@salesforce/ts-types';
1313
import { Messages, SfError } from '@salesforce/core';
1414

1515
Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
@@ -124,7 +124,7 @@ export default class AutoMerge extends SfCommand<void> {
124124

125125
this.info('Run with --verbose to see PR merge response');
126126
if (verbose) {
127-
this.styledJSON(mergeResult);
127+
this.styledJSON(mergeResult as unknown as AnyJson);
128128
}
129129
} else {
130130
this.logSuccess(`Dry run successful: ${prData.number} | ${prData.title}`);
@@ -147,7 +147,7 @@ export default class AutoMerge extends SfCommand<void> {
147147
per_page: 50,
148148
});
149149

150-
if (verbose) this.styledJSON(checkRunResponse);
150+
if (verbose) this.styledJSON(checkRunResponse as unknown as AnyJson);
151151

152152
return checkRunResponse.data.check_runs.every(
153153
(cr) =>

‎src/commands/dependabot/automerge.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
99
import { Octokit } from '@octokit/core';
1010
import { Env } from '@salesforce/kit';
11-
import { ensureString } from '@salesforce/ts-types';
11+
import { type AnyJson, ensureString } from '@salesforce/ts-types';
1212
import { Messages } from '@salesforce/core';
1313
import { maxVersionBumpFlag, getOwnerAndRepo } from '../../dependabot.js';
1414

@@ -130,7 +130,7 @@ export default class AutoMerge extends SfCommand<void> {
130130
opts.commit_title = `Merge pull request #${prToMerge.number} from ${prToMerge.head.ref} [skip ci]`;
131131
}
132132
const mergeResult = await this.octokit.request('PUT /repos/{owner}/{repo}/pulls/{pull_number}/merge', opts);
133-
this.styledJSON(mergeResult);
133+
this.styledJSON(mergeResult as unknown as AnyJson);
134134
} else {
135135
this.log(`dry run ${prToMerge.number.toString()} | ${prToMerge.title}`);
136136
}

‎yarn.lock

Lines changed: 72 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -1704,102 +1704,86 @@
17041704
strip-ansi "^7.1.0"
17051705
wrap-ansi "^9.0.0"
17061706

1707-
"@octokit/auth-token@^3.0.0":
1708-
version "3.0.4"
1709-
resolved "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-3.0.4.tgz"
1710-
integrity sha512-TWFX7cZF2LXoCvdmJWY7XVPi74aSY0+FfBZNSXEXFkMpjcqsQwDSYVv5FhRFaI0V1ECnwbz4j59T/G+rXNWaIQ==
1711-
1712-
"@octokit/core@^4.2.4":
1713-
version "4.2.4"
1714-
resolved "https://registry.npmjs.org/@octokit/core/-/core-4.2.4.tgz"
1715-
integrity sha512-rYKilwgzQ7/imScn3M9/pFfUf4I1AZEH3KhyJmtPdE2zfaXAn2mFfUy4FbKewzc2We5y/LlKLj36fWJLKC2SIQ==
1716-
dependencies:
1717-
"@octokit/auth-token" "^3.0.0"
1718-
"@octokit/graphql" "^5.0.0"
1719-
"@octokit/request" "^6.0.0"
1720-
"@octokit/request-error" "^3.0.0"
1721-
"@octokit/types" "^9.0.0"
1722-
before-after-hook "^2.2.0"
1723-
universal-user-agent "^6.0.0"
1724-
1725-
"@octokit/endpoint@^7.0.0":
1726-
version "7.0.5"
1727-
resolved "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-7.0.5.tgz"
1728-
integrity sha512-LG4o4HMY1Xoaec87IqQ41TQ+glvIeTKqfjkCEmt5AIwDZJwQeVZFIEYXrYY6yLwK+pAScb9Gj4q+Nz2qSw1roA==
1729-
dependencies:
1730-
"@octokit/types" "^9.0.0"
1731-
is-plain-object "^5.0.0"
1732-
universal-user-agent "^6.0.0"
1733-
1734-
"@octokit/graphql@^5.0.0":
1735-
version "5.0.6"
1736-
resolved "https://registry.npmjs.org/@octokit/graphql/-/graphql-5.0.6.tgz"
1737-
integrity sha512-Fxyxdy/JH0MnIB5h+UQ3yCoh1FG4kWXfFKkpWqjZHw/p+Kc8Y44Hu/kCgNBT6nU1shNumEchmW/sUO1JuQnPcw==
1738-
dependencies:
1739-
"@octokit/request" "^6.0.0"
1740-
"@octokit/types" "^9.0.0"
1741-
universal-user-agent "^6.0.0"
1742-
1743-
"@octokit/openapi-types@^17.2.0":
1744-
version "17.2.0"
1745-
resolved "https://registry.npmjs.org/@octokit/openapi-types/-/openapi-types-17.2.0.tgz"
1746-
integrity sha512-MazrFNx4plbLsGl+LFesMo96eIXkFgEtaKbnNpdh4aQ0VM10aoylFsTYP1AEjkeoRNZiiPe3T6Gl2Hr8dJWdlQ==
1707+
"@octokit/auth-token@^5.0.0":
1708+
version "5.1.2"
1709+
resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-5.1.2.tgz#68a486714d7a7fd1df56cb9bc89a860a0de866de"
1710+
integrity sha512-JcQDsBdg49Yky2w2ld20IHAlwr8d/d8N6NiOXbtuoPCqzbsiJgF633mVUw3x4mo0H5ypataQIX7SFu3yy44Mpw==
1711+
1712+
"@octokit/core@^6.1.4":
1713+
version "6.1.4"
1714+
resolved "https://registry.yarnpkg.com/@octokit/core/-/core-6.1.4.tgz#f5ccf911cc95b1ce9daf6de425d1664392f867db"
1715+
integrity sha512-lAS9k7d6I0MPN+gb9bKDt7X8SdxknYqAMh44S5L+lNqIN2NuV8nvv3g8rPp7MuRxcOpxpUIATWprO0C34a8Qmg==
1716+
dependencies:
1717+
"@octokit/auth-token" "^5.0.0"
1718+
"@octokit/graphql" "^8.1.2"
1719+
"@octokit/request" "^9.2.1"
1720+
"@octokit/request-error" "^6.1.7"
1721+
"@octokit/types" "^13.6.2"
1722+
before-after-hook "^3.0.2"
1723+
universal-user-agent "^7.0.0"
1724+
1725+
"@octokit/endpoint@^10.1.3":
1726+
version "10.1.3"
1727+
resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-10.1.3.tgz#bfe8ff2ec213eb4216065e77654bfbba0fc6d4de"
1728+
integrity sha512-nBRBMpKPhQUxCsQQeW+rCJ/OPSMcj3g0nfHn01zGYZXuNDvvXudF/TYY6APj5THlurerpFN4a/dQAIAaM6BYhA==
1729+
dependencies:
1730+
"@octokit/types" "^13.6.2"
1731+
universal-user-agent "^7.0.2"
1732+
1733+
"@octokit/graphql@^8.1.2":
1734+
version "8.2.1"
1735+
resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-8.2.1.tgz#0cb83600e6b4009805acc1c56ae8e07e6c991b78"
1736+
integrity sha512-n57hXtOoHrhwTWdvhVkdJHdhTv0JstjDbDRhJfwIRNfFqmSo1DaK/mD2syoNUoLCyqSjBpGAKOG0BuwF392slw==
1737+
dependencies:
1738+
"@octokit/request" "^9.2.2"
1739+
"@octokit/types" "^13.8.0"
1740+
universal-user-agent "^7.0.0"
17471741

17481742
"@octokit/openapi-types@^23.0.1":
17491743
version "23.0.1"
17501744
resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-23.0.1.tgz#3721646ecd36b596ddb12650e0e89d3ebb2dd50e"
17511745
integrity sha512-izFjMJ1sir0jn0ldEKhZ7xegCTj/ObmEDlEfpFrx4k/JyZSMRHbO3/rBwgE7f3m2DHt+RrNGIVw4wSmwnm3t/g==
17521746

1753-
"@octokit/plugin-paginate-rest@^11.4.1":
1754-
version "11.4.1"
1755-
resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.4.1.tgz#2ad42378683143c59ced0f091404be354e753aa0"
1756-
integrity sha512-GHQGdIv6Y/I+QzYbQWLVvL6bZhDhCJcwnL381vnX82lpJy4brA3/jRwYN5Lsmc57UhjBG9vH1KvyxgqLYZZGPQ==
1747+
"@octokit/plugin-paginate-rest@^11.4.2":
1748+
version "11.4.2"
1749+
resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-11.4.2.tgz#8f46a1de74c35e016c86701ef4ea0e8ef25a06e0"
1750+
integrity sha512-BXJ7XPCTDXFF+wxcg/zscfgw2O/iDPtNSkwwR1W1W5c4Mb3zav/M2XvxQ23nVmKj7jpweB4g8viMeCQdm7LMVA==
17571751
dependencies:
17581752
"@octokit/types" "^13.7.0"
17591753

1760-
"@octokit/plugin-throttling@^5.2.3":
1761-
version "5.2.3"
1762-
resolved "https://registry.npmjs.org/@octokit/plugin-throttling/-/plugin-throttling-5.2.3.tgz"
1763-
integrity sha512-C9CFg9mrf6cugneKiaI841iG8DOv6P5XXkjmiNNut+swePxQ7RWEdAZRp5rJoE1hjsIqiYcKa/ZkOQ+ujPI39Q==
1754+
"@octokit/plugin-throttling@^9.4.0":
1755+
version "9.4.0"
1756+
resolved "https://registry.yarnpkg.com/@octokit/plugin-throttling/-/plugin-throttling-9.4.0.tgz#4ed134fe97262361feb0208b7d8df63b35c72eb7"
1757+
integrity sha512-IOlXxXhZA4Z3m0EEYtrrACkuHiArHLZ3CvqWwOez/pURNqRuwfoFlTPbN5Muf28pzFuztxPyiUiNwz8KctdZaQ==
17641758
dependencies:
1765-
"@octokit/types" "^9.0.0"
1759+
"@octokit/types" "^13.7.0"
17661760
bottleneck "^2.15.3"
17671761

1768-
"@octokit/request-error@^3.0.0":
1769-
version "3.0.3"
1770-
resolved "https://registry.npmjs.org/@octokit/request-error/-/request-error-3.0.3.tgz"
1771-
integrity sha512-crqw3V5Iy2uOU5Np+8M/YexTlT8zxCfI+qu+LxUB7SZpje4Qmx3mub5DfEKSO8Ylyk0aogi6TYdf6kxzh2BguQ==
1762+
"@octokit/request-error@^6.1.7":
1763+
version "6.1.7"
1764+
resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-6.1.7.tgz#44fc598f5cdf4593e0e58b5155fe2e77230ff6da"
1765+
integrity sha512-69NIppAwaauwZv6aOzb+VVLwt+0havz9GT5YplkeJv7fG7a40qpLt/yZKyiDxAhgz0EtgNdNcb96Z0u+Zyuy2g==
17721766
dependencies:
1773-
"@octokit/types" "^9.0.0"
1774-
deprecation "^2.0.0"
1775-
once "^1.4.0"
1767+
"@octokit/types" "^13.6.2"
17761768

1777-
"@octokit/request@^6.0.0":
1778-
version "6.2.5"
1779-
resolved "https://registry.npmjs.org/@octokit/request/-/request-6.2.5.tgz"
1780-
integrity sha512-z83E8UIlPNaJUsXpjD8E0V5o/5f+vJJNbNcBwVZsX3/vC650U41cOkTLjq4PKk9BYonQGOnx7N17gvLyNjgGcQ==
1769+
"@octokit/request@^9.2.1", "@octokit/request@^9.2.2":
1770+
version "9.2.2"
1771+
resolved "https://registry.yarnpkg.com/@octokit/request/-/request-9.2.2.tgz#754452ec4692d7fdc32438a14e028eba0e6b2c09"
1772+
integrity sha512-dZl0ZHx6gOQGcffgm1/Sf6JfEpmh34v3Af2Uci02vzUYz6qEN6zepoRtmybWXIGXFIK8K9ylE3b+duCWqhArtg==
17811773
dependencies:
1782-
"@octokit/endpoint" "^7.0.0"
1783-
"@octokit/request-error" "^3.0.0"
1784-
"@octokit/types" "^9.0.0"
1785-
is-plain-object "^5.0.0"
1786-
node-fetch "^2.6.7"
1787-
universal-user-agent "^6.0.0"
1774+
"@octokit/endpoint" "^10.1.3"
1775+
"@octokit/request-error" "^6.1.7"
1776+
"@octokit/types" "^13.6.2"
1777+
fast-content-type-parse "^2.0.0"
1778+
universal-user-agent "^7.0.2"
17881779

1789-
"@octokit/types@^13.7.0":
1780+
"@octokit/types@^13.6.2", "@octokit/types@^13.7.0", "@octokit/types@^13.8.0":
17901781
version "13.8.0"
17911782
resolved "https://registry.yarnpkg.com/@octokit/types/-/types-13.8.0.tgz#3815885e5abd16ed9ffeea3dced31d37ce3f8a0a"
17921783
integrity sha512-x7DjTIbEpEWXK99DMd01QfWy0hd5h4EN+Q7shkdKds3otGQP+oWE/y0A76i1OvH9fygo4ddvNf7ZvF0t78P98A==
17931784
dependencies:
17941785
"@octokit/openapi-types" "^23.0.1"
17951786

1796-
"@octokit/types@^9.0.0":
1797-
version "9.2.3"
1798-
resolved "https://registry.npmjs.org/@octokit/types/-/types-9.2.3.tgz"
1799-
integrity sha512-MMeLdHyFIALioycq+LFcA71v0S2xpQUX2cw6pPbHQjaibcHYwLnmK/kMZaWuGfGfjBJZ3wRUq+dOaWsvrPJVvA==
1800-
dependencies:
1801-
"@octokit/openapi-types" "^17.2.0"
1802-
18031787
"@pkgjs/parseargs@^0.11.0":
18041788
version "0.11.0"
18051789
resolved "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz"
@@ -3374,10 +3358,10 @@ basic-ftp@^5.0.2:
33743358
resolved "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.3.tgz"
33753359
integrity sha512-QHX8HLlncOLpy54mh+k/sWIFd0ThmRqwe9ZjELybGZK+tZ8rUb9VO0saKJUROTbE+KhzDUT7xziGpGrW8Kmd+g==
33763360

3377-
before-after-hook@^2.2.0:
3378-
version "2.2.3"
3379-
resolved "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.3.tgz"
3380-
integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
3361+
before-after-hook@^3.0.2:
3362+
version "3.0.2"
3363+
resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-3.0.2.tgz#d5665a5fa8b62294a5aa0a499f933f4a1016195d"
3364+
integrity sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A==
33813365

33823366
bin-links@^5.0.0:
33833367
version "5.0.0"
@@ -4325,11 +4309,6 @@ delayed-stream@~1.0.0:
43254309
resolved "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"
43264310
integrity sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==
43274311

4328-
deprecation@^2.0.0:
4329-
version "2.3.1"
4330-
resolved "https://registry.npmjs.org/deprecation/-/deprecation-2.3.1.tgz"
4331-
integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
4332-
43334312
detect-indent@^6.0.0:
43344313
version "6.1.0"
43354314
resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-6.1.0.tgz#592485ebbbf6b3b1ab2be175c8393d04ca0d57e6"
@@ -4909,6 +4888,11 @@ external-editor@^3.1.0:
49094888
iconv-lite "^0.4.24"
49104889
tmp "^0.0.33"
49114890

4891+
fast-content-type-parse@^2.0.0:
4892+
version "2.0.1"
4893+
resolved "https://registry.yarnpkg.com/fast-content-type-parse/-/fast-content-type-parse-2.0.1.tgz#c236124534ee2cb427c8d8e5ba35a4856947847b"
4894+
integrity sha512-nGqtvLrj5w0naR6tDPfB4cUmYCqouzyQiz6C5y/LtcDllJdrcc6WaWW6iXyIIOErTa/XRybj28aasdn4LkVk6Q==
4895+
49124896
fast-copy@^3.0.2:
49134897
version "3.0.2"
49144898
resolved "https://registry.yarnpkg.com/fast-copy/-/fast-copy-3.0.2.tgz#59c68f59ccbcac82050ba992e0d5c389097c9d35"
@@ -6049,11 +6033,6 @@ is-plain-obj@^4.1.0:
60496033
resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-4.1.0.tgz#d65025edec3657ce032fd7db63c97883eaed71f0"
60506034
integrity sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==
60516035

6052-
is-plain-object@^5.0.0:
6053-
version "5.0.0"
6054-
resolved "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz"
6055-
integrity sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==
6056-
60576036
is-regex@^1.1.4:
60586037
version "1.1.4"
60596038
resolved "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"
@@ -7301,7 +7280,7 @@ node-emoji@^1.10.0:
73017280
dependencies:
73027281
lodash "^4.17.21"
73037282

7304-
node-fetch@^2.6.1, node-fetch@^2.6.7, node-fetch@^2.6.9:
7283+
node-fetch@^2.6.1, node-fetch@^2.6.9:
73057284
version "2.7.0"
73067285
resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz"
73077286
integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==
@@ -9693,10 +9672,10 @@ unique-slug@^5.0.0:
96939672
dependencies:
96949673
imurmurhash "^0.1.4"
96959674

9696-
universal-user-agent@^6.0.0:
9697-
version "6.0.0"
9698-
resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz"
9699-
integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w==
9675+
universal-user-agent@^7.0.0, universal-user-agent@^7.0.2:
9676+
version "7.0.2"
9677+
resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-7.0.2.tgz#52e7d0e9b3dc4df06cc33cb2b9fd79041a54827e"
9678+
integrity sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q==
97009679

97019680
universalify@^0.1.0:
97029681
version "0.1.2"

0 commit comments

Comments
 (0)