diff --git a/lib/datasource/maven/index.ts b/lib/datasource/maven/index.ts index 2578b2d4edddcb93f9c569811616c2c0f2bc9c08..93207c7617b5ac751961dc0c94ed6599071c7b0a 100644 --- a/lib/datasource/maven/index.ts +++ b/lib/datasource/maven/index.ts @@ -202,9 +202,10 @@ async function filterMissingArtifacts( ): Promise<Release[]> { const cacheNamespace = 'datasource-maven-metadata'; const cacheKey = `${repoUrl}${dependency.dependencyUrl}`; - let artifactsInfo: ArtifactsInfo | null = await packageCache.get< - ArtifactsInfo - >(cacheNamespace, cacheKey); + let artifactsInfo: ArtifactsInfo | null = await packageCache.get<ArtifactsInfo>( + cacheNamespace, + cacheKey + ); if (!isValidArtifactsInfo(artifactsInfo, versions)) { const queue = versions diff --git a/lib/manager/nuget/artifacts.spec.ts b/lib/manager/nuget/artifacts.spec.ts index efde7a1d800496c1c30d45e9975e45190940210e..b86b6309d0ecafbe4e45c2912a97a5ed2483dedb 100644 --- a/lib/manager/nuget/artifacts.spec.ts +++ b/lib/manager/nuget/artifacts.spec.ts @@ -22,9 +22,15 @@ jest.mock('./util'); const exec: jest.Mock<typeof _exec> = _exec as any; const env = mocked(_env); -const getConfiguredRegistries: jest.Mock<typeof _getConfiguredRegistries> = _getConfiguredRegistries as any; -const getDefaultRegistries: jest.Mock<typeof _getDefaultRegistries> = _getDefaultRegistries as any; -const getRandomString: jest.Mock<typeof _getRandomString> = _getRandomString as any; +const getConfiguredRegistries: jest.Mock< + typeof _getConfiguredRegistries +> = _getConfiguredRegistries as any; +const getDefaultRegistries: jest.Mock< + typeof _getDefaultRegistries +> = _getDefaultRegistries as any; +const getRandomString: jest.Mock< + typeof _getRandomString +> = _getRandomString as any; const hostRules = mocked(_hostRules); const config = { diff --git a/lib/util/http/github.ts b/lib/util/http/github.ts index 993b14cb62971534559381c59cc9c3ee47004ea8..c1850b5e8a3708fbc27cb6b803481b7c125ee9a2 100644 --- a/lib/util/http/github.ts +++ b/lib/util/http/github.ts @@ -194,18 +194,18 @@ export class GithubHttp extends Http<GithubHttpOptions, GithubHttpOptions> { new Array(lastPage), (x, i) => i + 1 ).slice(1); - const queue = pageNumbers.map((page) => (): Promise< - HttpResponse - > => { - const nextUrl = URL.parse(linkHeader.next.url, true); - delete nextUrl.search; - nextUrl.query.page = page.toString(); - return this.request( - URL.format(nextUrl), - { ...opts, paginate: false }, - okToRetry - ); - }); + const queue = pageNumbers.map( + (page) => (): Promise<HttpResponse> => { + const nextUrl = URL.parse(linkHeader.next.url, true); + delete nextUrl.search; + nextUrl.query.page = page.toString(); + return this.request( + URL.format(nextUrl), + { ...opts, paginate: false }, + okToRetry + ); + } + ); const pages = await pAll(queue, { concurrency: 5 }); result.body = result.body.concat( ...pages.filter(Boolean).map((page) => page.body) diff --git a/package.json b/package.json index 34c84aef86ca46d354d987fe18e45918030fffb2..93f341ebe05d4f6b93b23cfa7239a27583533a68 100644 --- a/package.json +++ b/package.json @@ -247,7 +247,7 @@ "mockdate": "3.0.2", "nock": "13.0.5", "npm-run-all": "4.1.5", - "prettier": "2.1.2", + "prettier": "2.2.1", "pretty-quick": "3.1.0", "rimraf": "3.0.2", "semantic-release": "17.3.0", diff --git a/yarn.lock b/yarn.lock index a7157ceb6fdfbdbc844999b763e9da6f5f53ac57..aeb2440ca286e89cfea354f402d09eb0be8968f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3605,7 +3605,7 @@ debug@^3.1.0: dependencies: ms "^2.1.1" -debuglog@*, debuglog@^1.0.1: +debuglog@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492" integrity sha1-qiT/uaw9+aI1GDfPstJ5NgzXhJI= @@ -5247,7 +5247,7 @@ import-local@^3.0.2: pkg-dir "^4.2.0" resolve-cwd "^3.0.0" -imurmurhash@*, imurmurhash@^0.1.4: +imurmurhash@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= @@ -6701,11 +6701,6 @@ lockfile@^1.0.4: dependencies: signal-exit "^3.0.2" -lodash._baseindexof@*: - version "3.1.0" - resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c" - integrity sha1-/lK1OhxnYeQmGNZU5KJXie1hgiw= - lodash._baseuniq@~4.6.0: version "4.6.0" resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8" @@ -6714,33 +6709,11 @@ lodash._baseuniq@~4.6.0: lodash._createset "~4.0.0" lodash._root "~3.0.0" -lodash._bindcallback@*: - version "3.0.1" - resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e" - integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4= - -lodash._cacheindexof@*: - version "3.0.2" - resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92" - integrity sha1-PcaayCSY0u5ePOVgkbr9Ktx73pI= - -lodash._createcache@*: - version "3.1.2" - resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093" - integrity sha1-VtagZAF2JeeevKa4AY4XRAvc8JM= - dependencies: - lodash._getnative "^3.0.0" - lodash._createset@~4.0.0: version "4.0.3" resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26" integrity sha1-D0ZZ+7CddRlPqeK4imZE02PJ/iY= -lodash._getnative@*, lodash._getnative@^3.0.0: - version "3.9.1" - resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5" - integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U= - lodash._reinterpolate@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d" @@ -6786,11 +6759,6 @@ lodash.isstring@^4.0.1: resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451" integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE= -lodash.restparam@*: - version "3.6.1" - resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805" - integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU= - lodash.set@^4.3.2: version "4.3.2" resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23" @@ -8427,10 +8395,10 @@ prepend-http@^1.0.1: resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc" integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw= -prettier@2.1.2: - version "2.1.2" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5" - integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg== +prettier@2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5" + integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q== pretty-bytes@^5.1.0: version "5.4.1"