From 1805bad7dfa3b38e51af5556b27f4cf523bd9011 Mon Sep 17 00:00:00 2001 From: Katy Bowman Date: Mon, 6 Jan 2025 09:44:41 -0500 Subject: [PATCH 1/2] fix: update versions of @heroku/http-call and debug --- package.json | 4 +-- src/api-client.ts | 2 +- src/deps.ts | 2 +- src/login.ts | 2 +- src/particleboard-client.ts | 2 +- yarn.lock | 59 ++++++++++++++++--------------------- 6 files changed, 32 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 8191dbd..100908b 100644 --- a/package.json +++ b/package.json @@ -5,13 +5,13 @@ "author": "Heroku", "bugs": "https://github.com/heroku/heroku-cli-command/issues", "dependencies": { + "@heroku/http-call": "^5.4.0", "@heroku-cli/color": "^2.0.1", "@oclif/core": "^2.16.0", "cli-ux": "^6.0.9", - "debug": "^4.3.4", + "debug": "^4.4.0", "fs-extra": "^9.1.0", "heroku-client": "^3.1.0", - "http-call": "^5.3.0", "netrc-parser": "^3.1.6", "open": "^8.4.2", "uuid": "^8.3.0", diff --git a/src/api-client.ts b/src/api-client.ts index fef90bb..436f21c 100644 --- a/src/api-client.ts +++ b/src/api-client.ts @@ -1,6 +1,6 @@ import {Interfaces} from '@oclif/core' import {CLIError, warn} from '@oclif/core/lib/errors' -import {HTTP, HTTPError, HTTPRequestOptions} from 'http-call' +import {HTTP, HTTPError, HTTPRequestOptions} from '@heroku/http-call' import Netrc from 'netrc-parser' import * as url from 'url' diff --git a/src/deps.ts b/src/deps.ts index 0ad6f6e..b9552ff 100644 --- a/src/deps.ts +++ b/src/deps.ts @@ -1,6 +1,6 @@ // remote import oclif = require('@oclif/core') -import HTTP = require('http-call') +import HTTP = require('@heroku/http-call') import netrc = require('netrc-parser') import apiClient = require('./api-client') diff --git a/src/login.ts b/src/login.ts index 94aa6e2..2b8c0a0 100644 --- a/src/login.ts +++ b/src/login.ts @@ -1,7 +1,7 @@ import color from '@heroku-cli/color' import * as Heroku from '@heroku-cli/schema' import {Interfaces, ux} from '@oclif/core' -import HTTP from 'http-call' +import HTTP from '@heroku/http-call' import Netrc from 'netrc-parser' import open from 'open' import * as os from 'os' diff --git a/src/particleboard-client.ts b/src/particleboard-client.ts index a712523..8ae06cf 100644 --- a/src/particleboard-client.ts +++ b/src/particleboard-client.ts @@ -1,5 +1,5 @@ import {Interfaces} from '@oclif/core' -import {HTTP, HTTPRequestOptions} from 'http-call' +import {HTTP, HTTPRequestOptions} from '@heroku/http-call' import * as url from 'url' import deps from './deps' diff --git a/yarn.lock b/yarn.lock index 3d35eeb..d8e97af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -255,6 +255,17 @@ resolved "https://registry.npmjs.org/@heroku-cli/schema/-/schema-1.0.25.tgz" integrity sha512-7V6/WdTHrsvpqeqttm4zhzVJyt/Us/Cz9oS4yure4JdLtwlr2eF6PvlDLA5ZIvBybMtSDyxhHid0PeshKLtwxw== +"@heroku/http-call@^5.4.0": + version "5.4.0" + resolved "https://registry.yarnpkg.com/@heroku/http-call/-/http-call-5.4.0.tgz#1f3d804d17888c61d375d2dcb399f405781132e8" + integrity sha512-8ys8jFP9l1wFXNmhmUb/EKLY/3flGzd7lv3x5MCw+36ov+qR9OFgk7bNHn3s+FPUKRSf/2GmKJjJmgnaD1YMmA== + dependencies: + content-type "^1.0.5" + debug "^4.4.0" + is-retry-allowed "^2.2.0" + is-stream "^2.0.0" + tunnel-agent "^0.6.0" + "@humanwhocodes/config-array@^0.5.0": version "0.5.0" resolved "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz" @@ -1513,10 +1524,10 @@ confusing-browser-globals@1.0.10: resolved "https://registry.npmjs.org/confusing-browser-globals/-/confusing-browser-globals-1.0.10.tgz" integrity sha512-gNld/3lySHwuhaVluJUKLePYirM3QNCKzVxqAdhJII9/WXKVX5PURzMVJspS1jTslSqjeuG4KMVTSouit5YPHA== -content-type@^1.0.4: - version "1.0.4" - resolved "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz" - integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA== +content-type@^1.0.5: + version "1.0.5" + resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918" + integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA== convert-source-map@^2.0.0: version "2.0.0" @@ -1610,6 +1621,13 @@ debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.4, debug@^4.3 dependencies: ms "2.1.2" +debug@^4.4.0: + version "4.4.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.4.0.tgz#2b3f2aea2ffeb776477460267377dc8710faba8a" + integrity sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA== + dependencies: + ms "^2.1.3" + decamelize-keys@^1.1.0: version "1.1.1" resolved "https://registry.npmjs.org/decamelize-keys/-/decamelize-keys-1.1.1.tgz" @@ -2788,18 +2806,6 @@ http-cache-semantics@^4.0.0: resolved "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.1.tgz" integrity sha512-er295DKPVsV82j5kw1Gjt+ADA/XYHsajl82cGNQG2eyoPkvgUhX+nDIyelzhIWbbsXP39EHcI6l5tYs2FYqYXQ== -http-call@^5.3.0: - version "5.3.0" - resolved "https://registry.npmjs.org/http-call/-/http-call-5.3.0.tgz" - integrity sha512-ahwimsC23ICE4kPl9xTBjKB4inbRaeLyZeRunC/1Jy/Z6X8tv22MEAjK+KBOMSVLaqXPTTmd8638waVIKLGx2w== - dependencies: - content-type "^1.0.4" - debug "^4.1.1" - is-retry-allowed "^1.1.0" - is-stream "^2.0.0" - parse-json "^4.0.0" - tunnel-agent "^0.6.0" - human-signals@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz" @@ -3169,10 +3175,10 @@ is-retry-allowed@^1.0.0: resolved "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz" integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ= -is-retry-allowed@^1.1.0: - version "1.2.0" - resolved "https://registry.npmjs.org/is-retry-allowed/-/is-retry-allowed-1.2.0.tgz" - integrity sha512-RUbUeKwvm3XG2VYamhJL1xFktgjvPzL0Hq8C+6yrWIswDy3BIXGqCxhxkc30N9jqK311gVU137K8Ei55/zVJRg== +is-retry-allowed@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-2.2.0.tgz#88f34cbd236e043e71b6932d09b0c65fb7b4d71d" + integrity sha512-XVm7LOeLpTW4jV19QSH38vkswxoLud8sQ57YwJVTPWdiaI9I8keEhGFpBlslyVsgdQy4Opg8QOLb8YRgsyZiQg== is-scoped@^2.1.0: version "2.1.0" @@ -3313,11 +3319,6 @@ json-buffer@3.0.1: resolved "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz" integrity sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ== -json-parse-better-errors@^1.0.1: - version "1.0.2" - resolved "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz" - integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw== - json-parse-even-better-errors@^2.3.0: version "2.3.1" resolved "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz" @@ -4222,14 +4223,6 @@ parent-module@^1.0.0: dependencies: callsites "^3.0.0" -parse-json@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz" - integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA= - dependencies: - error-ex "^1.3.1" - json-parse-better-errors "^1.0.1" - parse-json@^5.0.0: version "5.2.0" resolved "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz" From aa3f11b333844ad92fa0a11f7573318cbcdfcec5 Mon Sep 17 00:00:00 2001 From: Katy Bowman Date: Mon, 6 Jan 2025 09:49:04 -0500 Subject: [PATCH 2/2] fix: update deps fetch to @heroku/http-call --- src/deps.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deps.ts b/src/deps.ts index b9552ff..4ffdbf1 100644 --- a/src/deps.ts +++ b/src/deps.ts @@ -19,7 +19,7 @@ export const deps = { return fetch('@oclif/core').ux }, get HTTP(): typeof HTTP { - return fetch('http-call') + return fetch('@heroku/http-call') }, get netrc(): typeof netrc.default { return fetch('netrc-parser').default