Build(deps-dev): bump prettier from 2.2.1 to 2.3.0, run [ciibestpractices eclipsemarketplacedownloads gemdownloads githubdeployments githubtotaldiscussions githubforks githubhacktoberfest githubissuessearch githubpackagejson githubsponsors githubtag jenkinscoverage node npm nuget scoop teamcitybuild testspace] (#6482)

* Build(deps-dev): bump prettier from 2.2.1 to 2.3.0

Bumps [prettier](https://github.com/prettier/prettier) from 2.2.1 to 2.3.0.
- [Release notes](https://github.com/prettier/prettier/releases)
- [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md)
- [Commits](https://github.com/prettier/prettier/compare/2.2.1...2.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

* chore: prettier

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Caleb Cartwright <caleb.cartwright@outlook.com>
Co-authored-by: repo-ranger[bot] <39074581+repo-ranger[bot]@users.noreply.github.com>
This commit is contained in:
dependabot-preview[bot]
2021-05-15 08:49:20 +00:00
committed by GitHub
parent 79c9e1a1d2
commit 636ed87057
37 changed files with 141 additions and 214 deletions

View File

@@ -183,10 +183,8 @@ class AuthHelper {
} }
static _mergeQueryParams(requestParams, query) { static _mergeQueryParams(requestParams, query) {
const { const { options: { qs: existingQuery, ...restOptions } = {}, ...rest } =
options: { qs: existingQuery, ...restOptions } = {}, requestParams
...rest
} = requestParams
return { return {
options: { options: {
qs: { qs: {

View File

@@ -353,10 +353,8 @@ describe('BaseService', function () {
it('handles the request', async function () { it('handles the request', async function () {
expect(mockHandleRequest).to.have.been.calledOnce expect(mockHandleRequest).to.have.been.calledOnce
const { const { queryParams: serviceQueryParams, handler: requestHandler } =
queryParams: serviceQueryParams, mockHandleRequest.getCall(0).args[1]
handler: requestHandler,
} = mockHandleRequest.getCall(0).args[1]
expect(serviceQueryParams).to.deep.equal([ expect(serviceQueryParams).to.deep.equal([
'queryParamA', 'queryParamA',
'legacyQueryParamA', 'legacyQueryParamA',
@@ -390,13 +388,8 @@ describe('BaseService', function () {
describe('getDefinition', function () { describe('getDefinition', function () {
it('returns the expected result', function () { it('returns the expected result', function () {
const { const { category, name, isDeprecated, route, examples } =
category, DummyService.getDefinition()
name,
isDeprecated,
route,
examples,
} = DummyService.getDefinition()
expect({ expect({
category, category,
name, name,
@@ -510,10 +503,11 @@ describe('BaseService', function () {
buffer: 'x'.repeat(65536 + 1), buffer: 'x'.repeat(65536 + 1),
res: { statusCode: 200 }, res: { statusCode: 200 },
}) })
const serviceInstance = new DummyServiceWithServiceResponseSizeMetricEnabled( const serviceInstance =
{ sendAndCacheRequest, metricHelper }, new DummyServiceWithServiceResponseSizeMetricEnabled(
defaultConfig { sendAndCacheRequest, metricHelper },
) defaultConfig
)
await serviceInstance._request({ url }) await serviceInstance._request({ url })

View File

@@ -268,8 +268,7 @@ describe('coalesceBadge', function () {
coalesceBadge( coalesceBadge(
{ link: 'https://circleci.com/gh/badges/daily-tests' }, { link: 'https://circleci.com/gh/badges/daily-tests' },
{ {
link: link: 'https://circleci.com/workflow-run/184ef3de-4836-4805-a2e4-0ceba099f92d',
'https://circleci.com/workflow-run/184ef3de-4836-4805-a2e4-0ceba099f92d',
}, },
{} {}
).links ).links

View File

@@ -13,7 +13,7 @@ describe('mergeQueries function', function () {
print( print(
mergeQueries( mergeQueries(
gql` gql`
query($param: String!) { query ($param: String!) {
foo(param: $param) { foo(param: $param) {
bar bar
} }
@@ -29,7 +29,7 @@ describe('mergeQueries function', function () {
print( print(
mergeQueries( mergeQueries(
gql` gql`
query($param: String!) { query ($param: String!) {
foo(param: $param) { foo(param: $param) {
bar bar
} }

View File

@@ -83,10 +83,8 @@ function handleRequest(cacheHeaderConfig, handlerOptions) {
} }
const allowedKeys = flattenQueryParams(handlerOptions.queryParams) const allowedKeys = flattenQueryParams(handlerOptions.queryParams)
const { const { cacheLength: serviceDefaultCacheLengthSeconds, fetchLimitBytes } =
cacheLength: serviceDefaultCacheLengthSeconds, handlerOptions
fetchLimitBytes,
} = handlerOptions
return (queryParams, match, end, ask) => { return (queryParams, match, end, ask) => {
/* /*

View File

@@ -11,13 +11,12 @@ class MetricHelper {
serviceFamily, serviceFamily,
name, name,
}) })
this.serviceResponseSizeHistogram = metricInstance.createServiceResponseSizeHistogram( this.serviceResponseSizeHistogram =
{ metricInstance.createServiceResponseSizeHistogram({
category, category,
serviceFamily, serviceFamily,
name, name,
} })
)
} else { } else {
this.metricInstance = undefined this.metricInstance = undefined
this.serviceRequestCounter = undefined this.serviceRequestCounter = undefined

View File

@@ -19,37 +19,9 @@ module.exports = class PrometheusMetrics {
// 250 ms increments up to 2 seconds, then 500 ms increments up to 8 // 250 ms increments up to 2 seconds, then 500 ms increments up to 8
// seconds, then 1 second increments up to 15 seconds. // seconds, then 1 second increments up to 15 seconds.
buckets: [ buckets: [
250, 250, 500, 750, 1000, 1250, 1500, 1750, 2000, 2250, 2500, 2750, 3000,
500, 3250, 3500, 3750, 4000, 4500, 5000, 5500, 6000, 6500, 7000, 7500,
750, 8000, 9000, 10000, 11000, 12000, 13000, 14000, 15000,
1000,
1250,
1500,
1750,
2000,
2250,
2500,
2750,
3000,
3250,
3500,
3750,
4000,
4500,
5000,
5500,
6000,
6500,
7000,
7500,
8000,
9000,
10000,
11000,
12000,
13000,
14000,
15000,
], ],
registers: [this.register], registers: [this.register],
}), }),

View File

@@ -32,7 +32,8 @@ export default function Customizer({
}): JSX.Element { }): JSX.Element {
// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/35572 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/35572
// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/28884#issuecomment-471341041 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/28884#issuecomment-471341041
const indicatorRef = useRef<CopiedContentIndicatorHandle>() as React.MutableRefObject<CopiedContentIndicatorHandle> const indicatorRef =
useRef<CopiedContentIndicatorHandle>() as React.MutableRefObject<CopiedContentIndicatorHandle>
const [path, setPath] = useState('') const [path, setPath] = useState('')
const [queryString, setQueryString] = useState<string>() const [queryString, setQueryString] = useState<string>()
const [pathIsComplete, setPathIsComplete] = useState<boolean>() const [pathIsComplete, setPathIsComplete] = useState<boolean>()

View File

@@ -45,14 +45,13 @@ export default function Main({
}): JSX.Element { }): JSX.Element {
const [searchIsInProgress, setSearchIsInProgress] = useState(false) const [searchIsInProgress, setSearchIsInProgress] = useState(false)
const [queryIsTooShort, setQueryIsTooShort] = useState(false) const [queryIsTooShort, setQueryIsTooShort] = useState(false)
const [searchResults, setSearchResults] = useState<{ const [searchResults, setSearchResults] =
[k: string]: ServiceDefinition[] useState<{
}>() [k: string]: ServiceDefinition[]
}>()
const [selectedExample, setSelectedExample] = useState<RenderableExample>() const [selectedExample, setSelectedExample] = useState<RenderableExample>()
const [ const [selectedExampleIsSuggestion, setSelectedExampleIsSuggestion] =
selectedExampleIsSuggestion, useState(false)
setSelectedExampleIsSuggestion,
] = useState(false)
const searchTimeout = useRef(0) const searchTimeout = useRef(0)
const baseUrl = getBaseUrl() const baseUrl = getBaseUrl()

14
package-lock.json generated
View File

@@ -130,7 +130,7 @@
"nyc": "^15.1.0", "nyc": "^15.1.0",
"opn-cli": "^5.0.0", "opn-cli": "^5.0.0",
"portfinder": "^1.0.28", "portfinder": "^1.0.28",
"prettier": "2.2.1", "prettier": "2.3.0",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-error-overlay": "^6.0.9", "react-error-overlay": "^6.0.9",
@@ -24439,9 +24439,9 @@
} }
}, },
"node_modules/prettier": { "node_modules/prettier": {
"version": "2.2.1", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz",
"integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
"dev": true, "dev": true,
"bin": { "bin": {
"prettier": "bin-prettier.js" "prettier": "bin-prettier.js"
@@ -52029,9 +52029,9 @@
"dev": true "dev": true
}, },
"prettier": { "prettier": {
"version": "2.2.1", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz",
"integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==",
"dev": true "dev": true
}, },
"pretty-bytes": { "pretty-bytes": {

View File

@@ -218,7 +218,7 @@
"nyc": "^15.1.0", "nyc": "^15.1.0",
"opn-cli": "^5.0.0", "opn-cli": "^5.0.0",
"portfinder": "^1.0.28", "portfinder": "^1.0.28",
"prettier": "2.2.1", "prettier": "2.3.0",
"react": "^17.0.2", "react": "^17.0.2",
"react-dom": "^17.0.2", "react-dom": "^17.0.2",
"react-error-overlay": "^6.0.9", "react-error-overlay": "^6.0.9",

View File

@@ -113,16 +113,14 @@ module.exports = class CIIBestPracticesService extends BaseJsonService {
async handle({ metric, projectId }) { async handle({ metric, projectId }) {
// No official API documentation is available. // No official API documentation is available.
const { const { badge_level: level, tiered_percentage: percentage } =
badge_level: level, await this._requestJson({
tiered_percentage: percentage, schema,
} = await this._requestJson({ url: `https://bestpractices.coreinfrastructure.org/projects/${projectId}/badge.json`,
schema, errorMessages: {
url: `https://bestpractices.coreinfrastructure.org/projects/${projectId}/badge.json`, 404: 'project not found',
errorMessages: { },
404: 'project not found', })
},
})
if (metric === 'level') { if (metric === 'level') {
return this.constructor.renderLevelBadge({ level }) return this.constructor.renderLevelBadge({ level })

View File

@@ -23,7 +23,12 @@ const totalResponseSchema = Joi.object({
}).required() }).required()
function DownloadsForInterval(interval) { function DownloadsForInterval(interval) {
const { base, schema, messageSuffix = '', name } = { const {
base,
schema,
messageSuffix = '',
name,
} = {
month: { month: {
base: 'eclipse-marketplace/dm', base: 'eclipse-marketplace/dm',
messageSuffix: '/month', messageSuffix: '/month',

View File

@@ -126,16 +126,14 @@ module.exports = class GemDownloads extends BaseJsonService {
} }
async fetchDownloadCountForGem({ gem }) { async fetchDownloadCountForGem({ gem }) {
const { const { downloads: totalDownloads, version_downloads: versionDownloads } =
downloads: totalDownloads, await this._requestJson({
version_downloads: versionDownloads, url: `https://rubygems.org/api/v1/gems/${gem}.json`,
} = await this._requestJson({ schema: gemSchema,
url: `https://rubygems.org/api/v1/gems/${gem}.json`, errorMessages: {
schema: gemSchema, 404: 'gem not found',
errorMessages: { },
404: 'gem not found', })
},
})
return { totalDownloads, versionDownloads } return { totalDownloads, versionDownloads }
} }
@@ -154,10 +152,8 @@ module.exports = class GemDownloads extends BaseJsonService {
} }
downloads = await this.fetchDownloadCountForVersion({ gem, version }) downloads = await this.fetchDownloadCountForVersion({ gem, version })
} else { } else {
const { const { totalDownloads, versionDownloads } =
totalDownloads, await this.fetchDownloadCountForGem({ gem, variant })
versionDownloads,
} = await this.fetchDownloadCountForGem({ gem, variant })
downloads = variant === 'dtv' ? versionDownloads : totalDownloads downloads = variant === 'dtv' ? versionDownloads : totalDownloads
} }
return this.constructor.render({ variant, version, downloads }) return this.constructor.render({ variant, version, downloads })

View File

@@ -101,11 +101,8 @@ class GithubApiProvider {
let rateLimit, totalUsesRemaining, nextReset let rateLimit, totalUsesRemaining, nextReset
if (url.startsWith('/graphql')) { if (url.startsWith('/graphql')) {
try { try {
;({ ;({ rateLimit, totalUsesRemaining, nextReset } =
rateLimit, this.getV4RateLimitFromBody(res.body))
totalUsesRemaining,
nextReset,
} = this.getV4RateLimitFromBody(res.body))
} catch (e) { } catch (e) {
console.error( console.error(
`Could not extract rate limit info from response body ${res.body}` `Could not extract rate limit info from response body ${res.body}`
@@ -115,11 +112,8 @@ class GithubApiProvider {
} }
} else { } else {
try { try {
;({ ;({ rateLimit, totalUsesRemaining, nextReset } =
rateLimit, this.getV3RateLimitFromHeaders(res.headers))
totalUsesRemaining,
nextReset,
} = this.getV3RateLimitFromHeaders(res.headers))
} catch (e) { } catch (e) {
const logHeaders = { const logHeaders = {
'x-ratelimit-limit': res.headers['x-ratelimit-limit'], 'x-ratelimit-limit': res.headers['x-ratelimit-limit'],

View File

@@ -92,7 +92,7 @@ module.exports = class GithubDeployments extends GithubAuthV4Service {
async fetch({ user, repo, environment }) { async fetch({ user, repo, environment }) {
return this._requestGraphql({ return this._requestGraphql({
query: gql` query: gql`
query($user: String!, $repo: String!, $environment: String!) { query ($user: String!, $repo: String!, $environment: String!) {
repository(owner: $user, name: $repo) { repository(owner: $user, name: $repo) {
deployments(last: 1, environments: [$environment]) { deployments(last: 1, environments: [$environment]) {
nodes { nodes {

View File

@@ -45,7 +45,7 @@ module.exports = class GithubTotalDiscussions extends GithubAuthV4Service {
async fetch({ user, repo }) { async fetch({ user, repo }) {
return this._requestGraphql({ return this._requestGraphql({
query: gql` query: gql`
query($user: String!, $repo: String!) { query ($user: String!, $repo: String!) {
repository(name: $repo, owner: $user) { repository(name: $repo, owner: $user) {
discussions { discussions {
totalCount totalCount

View File

@@ -58,7 +58,7 @@ module.exports = class GithubForks extends GithubAuthV4Service {
async handle({ user, repo }) { async handle({ user, repo }) {
const json = await this._requestGraphql({ const json = await this._requestGraphql({
query: gql` query: gql`
query($user: String!, $repo: String!) { query ($user: String!, $repo: String!) {
repository(owner: $user, name: $repo) { repository(owner: $user, name: $repo) {
forkCount forkCount
} }

View File

@@ -177,7 +177,7 @@ module.exports = class GithubHacktoberfestCombinedStatus extends (
}, },
} = await this._requestGraphql({ } = await this._requestGraphql({
query: gql` query: gql`
query( query (
$user: String! $user: String!
$repo: String! $repo: String!
$suggestionLabel: String! $suggestionLabel: String!

View File

@@ -30,7 +30,7 @@ class BaseGithubIssuesSearch extends GithubAuthV4Service {
async fetch({ query }) { async fetch({ query }) {
const data = await this._requestGraphql({ const data = await this._requestGraphql({
query: gql` query: gql`
query($query: String!) { query ($query: String!) {
search(query: $query, type: ISSUE) { search(query: $query, type: ISSUE) {
issueCount issueCount
} }

View File

@@ -329,7 +329,7 @@ module.exports = class GithubIssues extends GithubAuthV4Service {
}, },
} = await this._requestGraphql({ } = await this._requestGraphql({
query: gql` query: gql`
query( query (
$user: String! $user: String!
$repo: String! $repo: String!
$states: [PullRequestState!] $states: [PullRequestState!]
@@ -359,7 +359,7 @@ module.exports = class GithubIssues extends GithubAuthV4Service {
}, },
} = await this._requestGraphql({ } = await this._requestGraphql({
query: gql` query: gql`
query( query (
$user: String! $user: String!
$repo: String! $repo: String!
$states: [IssueState!] $states: [IssueState!]

View File

@@ -151,17 +151,14 @@ class GithubPackageJsonDependencyVersion extends ConditionalGithubAuthV3Service
{ user, repo, kind, branch = 'HEAD', scope, packageName }, { user, repo, kind, branch = 'HEAD', scope, packageName },
{ filename = 'package.json' } { filename = 'package.json' }
) { ) {
const { const { dependencies, devDependencies, peerDependencies } =
dependencies, await fetchJsonFromRepo(this, {
devDependencies, schema: isPackageJsonWithDependencies,
peerDependencies, user,
} = await fetchJsonFromRepo(this, { repo,
schema: isPackageJsonWithDependencies, branch,
user, filename,
repo, })
branch,
filename,
})
const wantedDependency = scope ? `${scope}/${packageName}` : packageName const wantedDependency = scope ? `${scope}/${packageName}` : packageName
const { range } = getDependencyVersion({ const { range } = getDependencyVersion({

View File

@@ -49,7 +49,7 @@ module.exports = class GithubSponsors extends GithubAuthV4Service {
async fetch({ user }) { async fetch({ user }) {
return this._requestGraphql({ return this._requestGraphql({
query: gql` query: gql`
query($user: String!) { query ($user: String!) {
repositoryOwner(login: $user) { repositoryOwner(login: $user) {
... on User { ... on User {
sponsorshipsAsMaintainer { sponsorshipsAsMaintainer {

View File

@@ -79,7 +79,7 @@ class GithubTag extends GithubAuthV4Service {
const limit = sort === 'semver' ? 100 : 1 const limit = sort === 'semver' ? 100 : 1
return this._requestGraphql({ return this._requestGraphql({
query: gql` query: gql`
query($user: String!, $repo: String!, $limit: Int!) { query ($user: String!, $repo: String!, $limit: Int!) {
repository(owner: $user, name: $repo) { repository(owner: $user, name: $repo) {
refs( refs(
refPrefix: "refs/tags/" refPrefix: "refs/tags/"

View File

@@ -115,9 +115,8 @@ module.exports = class JenkinsCoverage extends JenkinsBase {
} }
async handle({ format }, { jobUrl, disableStrictSSL }) { async handle({ format }, { jobUrl, disableStrictSSL }) {
const { schema, transform, treeQueryParam, pluginSpecificPath } = formatMap[ const { schema, transform, treeQueryParam, pluginSpecificPath } =
format formatMap[format]
]
const json = await this.fetch({ const json = await this.fetch({
url: buildUrl({ jobUrl, plugin: pluginSpecificPath }), url: buildUrl({ jobUrl, plugin: pluginSpecificPath }),
schema, schema,

View File

@@ -2,14 +2,12 @@
const { createServiceFamily } = require('../nuget/nuget-v3-service-family') const { createServiceFamily } = require('../nuget/nuget-v3-service-family')
const { const { NugetVersionService: Version, NugetDownloadService: Downloads } =
NugetVersionService: Version, createServiceFamily({
NugetDownloadService: Downloads, defaultLabel: 'myget',
} = createServiceFamily({ serviceBaseUrl: 'myget',
defaultLabel: 'myget', apiDomain: 'myget.org',
serviceBaseUrl: 'myget', })
apiDomain: 'myget.org',
})
class MyGetVersionService extends Version { class MyGetVersionService extends Version {
static examples = [ static examples = [

View File

@@ -106,12 +106,8 @@ module.exports = class NodeVersionBase extends NPMBase {
} }
async handle(namedParams, queryParams) { async handle(namedParams, queryParams) {
const { const { scope, packageName, tag, registryUrl } =
scope, this.constructor.unpackParams(namedParams, queryParams)
packageName,
tag,
registryUrl,
} = this.constructor.unpackParams(namedParams, queryParams)
const { engines } = await this.fetchPackageData({ const { engines } = await this.fetchPackageData({
scope, scope,
packageName, packageName,

View File

@@ -40,8 +40,7 @@ async function getCurrentVersion() {
async function getLtsVersions() { async function getLtsVersions() {
const versions = await promisify(regularUpdate)({ const versions = await promisify(regularUpdate)({
url: url: 'https://raw.githubusercontent.com/nodejs/Release/master/schedule.json',
'https://raw.githubusercontent.com/nodejs/Release/master/schedule.json',
intervalMillis: 24 * 3600 * 1000, intervalMillis: 24 * 3600 * 1000,
json: true, json: true,
scraper: ltsVersionsScraper, scraper: ltsVersionsScraper,

View File

@@ -19,27 +19,29 @@ const templates = {
const getTemplate = template => JSON.parse(templates[template]) const getTemplate = template => JSON.parse(templates[template])
const mockPackageData = ({ packageName, engines, scope, tag }) => nock => { const mockPackageData =
let packageJson ({ packageName, engines, scope, tag }) =>
let urlPath nock => {
if (scope || tag) { let packageJson
if (scope) { let urlPath
urlPath = `/${scope}%2F${packageName}` if (scope || tag) {
if (scope) {
urlPath = `/${scope}%2F${packageName}`
} else {
urlPath = `/${packageName}`
}
packageJson = getTemplate('packageJsonVersionsTemplate')
packageJson['dist-tags'][tag || 'latest'] = '0.0.91'
packageJson.versions['0.0.91'].engines.node = engines
} else { } else {
urlPath = `/${packageName}` urlPath = `/${packageName}/latest`
packageJson = getTemplate('packageJsonTemplate')
packageJson.engines.node = engines
} }
packageJson = getTemplate('packageJsonVersionsTemplate') return nock('https://registry.npmjs.org/')
packageJson['dist-tags'][tag || 'latest'] = '0.0.91' .get(urlPath)
packageJson.versions['0.0.91'].engines.node = engines .reply(200, packageJson)
} else {
urlPath = `/${packageName}/latest`
packageJson = getTemplate('packageJsonTemplate')
packageJson.engines.node = engines
} }
return nock('https://registry.npmjs.org/')
.get(urlPath)
.reply(200, packageJson)
}
const mockCurrentSha = latestVersion => nock => { const mockCurrentSha = latestVersion => nock => {
const latestSha = `node-v${latestVersion}.12.0-aix-ppc64.tar.gz` const latestSha = `node-v${latestVersion}.12.0-aix-ppc64.tar.gz`

View File

@@ -122,15 +122,12 @@ module.exports = class NpmDependencyVersion extends NpmBase {
dependencyScope ? `${dependencyScope}/` : '' dependencyScope ? `${dependencyScope}/` : ''
}${dependency}` }${dependency}`
const { const { dependencies, devDependencies, peerDependencies } =
dependencies, await this.fetchPackageData({
devDependencies, scope,
peerDependencies, packageName,
} = await this.fetchPackageData({ registryUrl,
scope, })
packageName,
registryUrl,
})
const { range } = getDependencyVersion({ const { range } = getDependencyVersion({
kind, kind,

View File

@@ -71,12 +71,8 @@ module.exports = class NpmVersion extends NpmBase {
} }
async handle(namedParams, queryParams) { async handle(namedParams, queryParams) {
const { const { scope, packageName, tag, registryUrl } =
scope, this.constructor.unpackParams(namedParams, queryParams)
packageName,
tag,
registryUrl,
} = this.constructor.unpackParams(namedParams, queryParams)
const slug = const slug =
scope === undefined scope === undefined

View File

@@ -2,16 +2,14 @@
const { createServiceFamily } = require('./nuget-v3-service-family') const { createServiceFamily } = require('./nuget-v3-service-family')
const { const { NugetVersionService: Version, NugetDownloadService: Downloads } =
NugetVersionService: Version, createServiceFamily({
NugetDownloadService: Downloads, defaultLabel: 'nuget',
} = createServiceFamily({ serviceBaseUrl: 'nuget',
defaultLabel: 'nuget', apiBaseUrl: 'https://api.nuget.org/v3',
serviceBaseUrl: 'nuget', withTenant: false,
apiBaseUrl: 'https://api.nuget.org/v3', withFeed: false,
withTenant: false, })
withFeed: false,
})
class NugetVersionService extends Version { class NugetVersionService extends Version {
static examples = [ static examples = [

View File

@@ -8,7 +8,8 @@ const {
const { fetchJsonFromRepo } = require('../github/github-common-fetch') const { fetchJsonFromRepo } = require('../github/github-common-fetch')
const { renderVersionBadge } = require('../version') const { renderVersionBadge } = require('../version')
const gitHubRepoRegExp = /https:\/\/github.com\/(?<user>.*?)\/(?<repo>.*?)(\/|$)/ const gitHubRepoRegExp =
/https:\/\/github.com\/(?<user>.*?)\/(?<repo>.*?)(\/|$)/
const bucketsSchema = Joi.object() const bucketsSchema = Joi.object()
.pattern(/.+/, Joi.string().pattern(gitHubRepoRegExp).required()) .pattern(/.+/, Joi.string().pattern(gitHubRepoRegExp).required())
.required() .required()

View File

@@ -98,8 +98,7 @@ describe('Badge suggestions for', function () {
}, },
{ {
title: 'Twitter', title: 'Twitter',
link: link: 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fatom%2Fatom',
'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fatom%2Fatom',
example: { example: {
pattern: '/twitter/url', pattern: '/twitter/url',
namedParams: {}, namedParams: {},
@@ -169,8 +168,7 @@ describe('Badge suggestions for', function () {
}, },
{ {
title: 'Twitter', title: 'Twitter',
link: link: 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fbadges%2Fnot-a-real-project',
'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fbadges%2Fnot-a-real-project',
example: { example: {
pattern: '/twitter/url', pattern: '/twitter/url',
namedParams: {}, namedParams: {},
@@ -213,8 +211,7 @@ describe('Badge suggestions for', function () {
}, },
{ {
title: 'Twitter', title: 'Twitter',
link: link: 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgitlab.com%2Fgitlab-org%2Fgitlab',
'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgitlab.com%2Fgitlab-org%2Fgitlab',
example: { example: {
pattern: '/twitter/url', pattern: '/twitter/url',
namedParams: {}, namedParams: {},
@@ -255,8 +252,7 @@ describe('Badge suggestions for', function () {
}, },
{ {
title: 'Twitter', title: 'Twitter',
link: link: 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgitlab.com%2Fgitlab-org%2Fnot-gitlab',
'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgitlab.com%2Fgitlab-org%2Fnot-gitlab',
example: { example: {
pattern: '/twitter/url', pattern: '/twitter/url',
namedParams: {}, namedParams: {},

View File

@@ -157,8 +157,7 @@ describe('Badge suggestions', function () {
}, },
{ {
title: 'Twitter', title: 'Twitter',
link: link: 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fatom%2Fatom',
'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fatom%2Fatom',
example: { example: {
pattern: '/twitter/url', pattern: '/twitter/url',
namedParams: {}, namedParams: {},

View File

@@ -5,7 +5,8 @@ const { withRegex } = require('../test-validators')
const t = (module.exports = require('../tester').createServiceTester()) const t = (module.exports = require('../tester').createServiceTester())
const buildStatusValues = Joi.equal('passing', 'failure', 'error').required() const buildStatusValues = Joi.equal('passing', 'failure', 'error').required()
const buildStatusTextRegex = /^success|failure|error|tests( failed: \d+( \(\d+ new\))?)?(,)?( passed: \d+)?(,)?( ignored: \d+)?(,)?( muted: \d+)?/ const buildStatusTextRegex =
/^success|failure|error|tests( failed: \d+( \(\d+ new\))?)?(,)?( passed: \d+)?(,)?( ignored: \d+)?(,)?( muted: \d+)?/
t.create('unknown build') t.create('unknown build')
.get('/s/btabc.json?server=https://teamcity.jetbrains.com') .get('/s/btabc.json?server=https://teamcity.jetbrains.com')

View File

@@ -41,13 +41,8 @@ module.exports = class TestspaceTestCount extends TestspaceBase {
} }
transform({ json, metric }) { transform({ json, metric }) {
const { const { passed, failed, skipped, errored, total } =
passed, this.transformCaseCounts(json)
failed,
skipped,
errored,
total,
} = this.transformCaseCounts(json)
if (metric === 'total') { if (metric === 'total') {
return { value: total } return { value: total }
} else if (metric === 'passed') { } else if (metric === 'passed') {