Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: update versions of @heroku/http-call and debug #156

Merged
merged 2 commits into from
Jan 6, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion src/api-client.ts
Original file line number Diff line number Diff line change
@@ -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'

Expand All @@ -11,7 +11,7 @@
import {vars} from './vars'
import {ParticleboardClient, IDelinquencyInfo, IDelinquencyConfig} from './particleboard-client'

const debug = require('debug')

Check warning on line 14 in src/api-client.ts

View workflow job for this annotation

GitHub Actions / test (windows-latest, 16.x)

Do not use "require"

Check warning on line 14 in src/api-client.ts

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 16.x)

Do not use "require"

Check warning on line 14 in src/api-client.ts

View workflow job for this annotation

GitHub Actions / test (macos-latest, 16.x)

Do not use "require"

export namespace APIClient {
export interface Options extends HTTPRequestOptions {
Expand Down Expand Up @@ -70,7 +70,7 @@
if (options.debug) debug.enable('http')
if (options.debug && options.debugHeaders) debug.enable('http,http:headers')
this.options = options
const apiUrl = url.URL ? new url.URL(vars.apiUrl) : url.parse(vars.apiUrl)

Check warning on line 73 in src/api-client.ts

View workflow job for this annotation

GitHub Actions / test (windows-latest, 16.x)

'url.parse' was deprecated since v11.0.0. Use 'url.URL' constructor instead

Check warning on line 73 in src/api-client.ts

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 16.x)

'url.parse' was deprecated since v11.0.0. Use 'url.URL' constructor instead

Check warning on line 73 in src/api-client.ts

View workflow job for this annotation

GitHub Actions / test (macos-latest, 16.x)

'url.parse' was deprecated since v11.0.0. Use 'url.URL' constructor instead
const envHeaders = JSON.parse(process.env.HEROKU_HEADERS || '{}')
this.preauthPromises = {}
const self = this as any
Expand Down
4 changes: 2 additions & 2 deletions src/deps.ts
Original file line number Diff line number Diff line change
@@ -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')
Expand All @@ -19,7 +19,7 @@
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
Expand Down Expand Up @@ -53,7 +53,7 @@

function fetch(s: string) {
if (!cache[s]) {
cache[s] = require(s)

Check warning on line 56 in src/deps.ts

View workflow job for this annotation

GitHub Actions / test (windows-latest, 16.x)

Do not use "require"

Check warning on line 56 in src/deps.ts

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 16.x)

Do not use "require"

Check warning on line 56 in src/deps.ts

View workflow job for this annotation

GitHub Actions / test (macos-latest, 16.x)

Do not use "require"
}

return cache[s]
Expand Down
2 changes: 1 addition & 1 deletion src/login.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion src/particleboard-client.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
59 changes: 26 additions & 33 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -1513,10 +1524,10 @@ [email protected]:
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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -3313,11 +3319,6 @@ [email protected]:
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"
Expand Down Expand Up @@ -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"
Expand Down
Loading