diff --git a/core/base-service/auth-helper.js b/core/base-service/auth-helper.js index 48b1601ef1caad7f3b24b7d2f18055991cc9c9af..f4ce18102614c11997a2be22f511c5fe53f284d4 100644 --- a/core/base-service/auth-helper.js +++ b/core/base-service/auth-helper.js @@ -183,10 +183,8 @@ class AuthHelper { } static _mergeQueryParams(requestParams, query) { - const { - options: { qs: existingQuery, ...restOptions } = {}, - ...rest - } = requestParams + const { options: { qs: existingQuery, ...restOptions } = {}, ...rest } = + requestParams return { options: { qs: { diff --git a/core/base-service/base.spec.js b/core/base-service/base.spec.js index c5adce69af10e806aae8b8f2cf56fe4f4df57f37..9fa7e7e1a29068af2a4314654a7ae97f03e934cb 100644 --- a/core/base-service/base.spec.js +++ b/core/base-service/base.spec.js @@ -353,10 +353,8 @@ describe('BaseService', function () { it('handles the request', async function () { expect(mockHandleRequest).to.have.been.calledOnce - const { - queryParams: serviceQueryParams, - handler: requestHandler, - } = mockHandleRequest.getCall(0).args[1] + const { queryParams: serviceQueryParams, handler: requestHandler } = + mockHandleRequest.getCall(0).args[1] expect(serviceQueryParams).to.deep.equal([ 'queryParamA', 'legacyQueryParamA', @@ -390,13 +388,8 @@ describe('BaseService', function () { describe('getDefinition', function () { it('returns the expected result', function () { - const { - category, - name, - isDeprecated, - route, - examples, - } = DummyService.getDefinition() + const { category, name, isDeprecated, route, examples } = + DummyService.getDefinition() expect({ category, name, @@ -510,10 +503,11 @@ describe('BaseService', function () { buffer: 'x'.repeat(65536 + 1), res: { statusCode: 200 }, }) - const serviceInstance = new DummyServiceWithServiceResponseSizeMetricEnabled( - { sendAndCacheRequest, metricHelper }, - defaultConfig - ) + const serviceInstance = + new DummyServiceWithServiceResponseSizeMetricEnabled( + { sendAndCacheRequest, metricHelper }, + defaultConfig + ) await serviceInstance._request({ url }) diff --git a/core/base-service/coalesce-badge.spec.js b/core/base-service/coalesce-badge.spec.js index f3d03eb1a756b1186597d9be2a5c05cf98903fd5..195926d74adb4a330b6ffb74ab6b021be1864a94 100644 --- a/core/base-service/coalesce-badge.spec.js +++ b/core/base-service/coalesce-badge.spec.js @@ -268,8 +268,7 @@ describe('coalesceBadge', function () { coalesceBadge( { link: 'https://circleci.com/gh/badges/daily-tests' }, { - link: - 'https://circleci.com/workflow-run/184ef3de-4836-4805-a2e4-0ceba099f92d', + link: 'https://circleci.com/workflow-run/184ef3de-4836-4805-a2e4-0ceba099f92d', }, {} ).links diff --git a/core/base-service/graphql.spec.js b/core/base-service/graphql.spec.js index 52c811d7bcfff1cdb8a143e9eac308f2899a4fe7..202dd052c6982dfe32b467eb5c6e10f78b3f636a 100644 --- a/core/base-service/graphql.spec.js +++ b/core/base-service/graphql.spec.js @@ -13,7 +13,7 @@ describe('mergeQueries function', function () { print( mergeQueries( gql` - query($param: String!) { + query ($param: String!) { foo(param: $param) { bar } @@ -29,7 +29,7 @@ describe('mergeQueries function', function () { print( mergeQueries( gql` - query($param: String!) { + query ($param: String!) { foo(param: $param) { bar } diff --git a/core/base-service/legacy-request-handler.js b/core/base-service/legacy-request-handler.js index e12170226d9adb9d06b3a6c4b85a420ce52265c6..f048ec55bdcc7a830793c016a87b85830131e3bf 100644 --- a/core/base-service/legacy-request-handler.js +++ b/core/base-service/legacy-request-handler.js @@ -83,10 +83,8 @@ function handleRequest(cacheHeaderConfig, handlerOptions) { } const allowedKeys = flattenQueryParams(handlerOptions.queryParams) - const { - cacheLength: serviceDefaultCacheLengthSeconds, - fetchLimitBytes, - } = handlerOptions + const { cacheLength: serviceDefaultCacheLengthSeconds, fetchLimitBytes } = + handlerOptions return (queryParams, match, end, ask) => { /* diff --git a/core/base-service/metric-helper.js b/core/base-service/metric-helper.js index aab44226318fb0498b7cc63d8c576ad6c77bc97f..33f472b02d45e2acd7c35fe8875a8da1c886cc17 100644 --- a/core/base-service/metric-helper.js +++ b/core/base-service/metric-helper.js @@ -11,13 +11,12 @@ class MetricHelper { serviceFamily, name, }) - this.serviceResponseSizeHistogram = metricInstance.createServiceResponseSizeHistogram( - { + this.serviceResponseSizeHistogram = + metricInstance.createServiceResponseSizeHistogram({ category, serviceFamily, name, - } - ) + }) } else { this.metricInstance = undefined this.serviceRequestCounter = undefined diff --git a/core/server/prometheus-metrics.js b/core/server/prometheus-metrics.js index 1e2a5192c7a38c46c696efc7f811e8abae024013..ae693a95c78308f8055ad5a9c6a31f6590153cf8 100644 --- a/core/server/prometheus-metrics.js +++ b/core/server/prometheus-metrics.js @@ -19,37 +19,9 @@ module.exports = class PrometheusMetrics { // 250 ms increments up to 2 seconds, then 500 ms increments up to 8 // seconds, then 1 second increments up to 15 seconds. buckets: [ - 250, - 500, - 750, - 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, + 250, 500, 750, 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], }), diff --git a/frontend/components/customizer/customizer.tsx b/frontend/components/customizer/customizer.tsx index 883760053d8dba1476a97b63a5316048989a4081..93a926cc9eb2a21836f003014bb1fedbd173ec36 100644 --- a/frontend/components/customizer/customizer.tsx +++ b/frontend/components/customizer/customizer.tsx @@ -32,7 +32,8 @@ export default function Customizer({ }): JSX.Element { // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/35572 // 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 [queryString, setQueryString] = useState<string>() const [pathIsComplete, setPathIsComplete] = useState<boolean>() diff --git a/frontend/components/main.tsx b/frontend/components/main.tsx index 0239100986e743692fead052d69185cd22d61efe..6a8475886fd812fc62ee6d42ceb00350997291b8 100644 --- a/frontend/components/main.tsx +++ b/frontend/components/main.tsx @@ -45,14 +45,13 @@ export default function Main({ }): JSX.Element { const [searchIsInProgress, setSearchIsInProgress] = useState(false) const [queryIsTooShort, setQueryIsTooShort] = useState(false) - const [searchResults, setSearchResults] = useState<{ - [k: string]: ServiceDefinition[] - }>() + const [searchResults, setSearchResults] = + useState<{ + [k: string]: ServiceDefinition[] + }>() const [selectedExample, setSelectedExample] = useState<RenderableExample>() - const [ - selectedExampleIsSuggestion, - setSelectedExampleIsSuggestion, - ] = useState(false) + const [selectedExampleIsSuggestion, setSelectedExampleIsSuggestion] = + useState(false) const searchTimeout = useRef(0) const baseUrl = getBaseUrl() diff --git a/package-lock.json b/package-lock.json index 262319c14d74cf85cd718956fd9a5df2c60c8c68..f4b24999ba7cf90d4a652d5b105589ec19fdab6c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -130,7 +130,7 @@ "nyc": "^15.1.0", "opn-cli": "^5.0.0", "portfinder": "^1.0.28", - "prettier": "2.2.1", + "prettier": "2.3.0", "react": "^17.0.2", "react-dom": "^17.0.2", "react-error-overlay": "^6.0.9", @@ -24439,9 +24439,9 @@ } }, "node_modules/prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz", + "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==", "dev": true, "bin": { "prettier": "bin-prettier.js" @@ -52029,9 +52029,9 @@ "dev": true }, "prettier": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.2.1.tgz", - "integrity": "sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.0.tgz", + "integrity": "sha512-kXtO4s0Lz/DW/IJ9QdWhAf7/NmPWQXkFr/r/WkR3vyI+0v8amTDxiaQSLzs8NBlytfLWX/7uQUMIW677yLKl4w==", "dev": true }, "pretty-bytes": { diff --git a/package.json b/package.json index 6cddca84263eb40de5c88508d1085cf978c70b9e..ebb9efd7a4dc5890869db65327b7e0a6742b4f78 100644 --- a/package.json +++ b/package.json @@ -218,7 +218,7 @@ "nyc": "^15.1.0", "opn-cli": "^5.0.0", "portfinder": "^1.0.28", - "prettier": "2.2.1", + "prettier": "2.3.0", "react": "^17.0.2", "react-dom": "^17.0.2", "react-error-overlay": "^6.0.9", diff --git a/services/cii-best-practices/cii-best-practices.service.js b/services/cii-best-practices/cii-best-practices.service.js index af45b4090c187fca8bda28019919ea2048ca0c8f..7a38690077940e132bf7f91770203060883b5606 100644 --- a/services/cii-best-practices/cii-best-practices.service.js +++ b/services/cii-best-practices/cii-best-practices.service.js @@ -113,16 +113,14 @@ module.exports = class CIIBestPracticesService extends BaseJsonService { async handle({ metric, projectId }) { // No official API documentation is available. - const { - badge_level: level, - tiered_percentage: percentage, - } = await this._requestJson({ - schema, - url: `https://bestpractices.coreinfrastructure.org/projects/${projectId}/badge.json`, - errorMessages: { - 404: 'project not found', - }, - }) + const { badge_level: level, tiered_percentage: percentage } = + await this._requestJson({ + schema, + url: `https://bestpractices.coreinfrastructure.org/projects/${projectId}/badge.json`, + errorMessages: { + 404: 'project not found', + }, + }) if (metric === 'level') { return this.constructor.renderLevelBadge({ level }) diff --git a/services/eclipse-marketplace/eclipse-marketplace-downloads.service.js b/services/eclipse-marketplace/eclipse-marketplace-downloads.service.js index 8ac996c5bae7c1058649eb442d8114e830fca92c..ae4fb3fa39242d3825f3c32095e0f098860dffb6 100644 --- a/services/eclipse-marketplace/eclipse-marketplace-downloads.service.js +++ b/services/eclipse-marketplace/eclipse-marketplace-downloads.service.js @@ -23,7 +23,12 @@ const totalResponseSchema = Joi.object({ }).required() function DownloadsForInterval(interval) { - const { base, schema, messageSuffix = '', name } = { + const { + base, + schema, + messageSuffix = '', + name, + } = { month: { base: 'eclipse-marketplace/dm', messageSuffix: '/month', diff --git a/services/gem/gem-downloads.service.js b/services/gem/gem-downloads.service.js index fd3f10638694aa45773a5ddf2778d0a19ddb2f3c..f2e697cde370b95fe0dedb471eb7b18f55612b3a 100644 --- a/services/gem/gem-downloads.service.js +++ b/services/gem/gem-downloads.service.js @@ -126,16 +126,14 @@ module.exports = class GemDownloads extends BaseJsonService { } async fetchDownloadCountForGem({ gem }) { - const { - downloads: totalDownloads, - version_downloads: versionDownloads, - } = await this._requestJson({ - url: `https://rubygems.org/api/v1/gems/${gem}.json`, - schema: gemSchema, - errorMessages: { - 404: 'gem not found', - }, - }) + const { downloads: totalDownloads, version_downloads: versionDownloads } = + await this._requestJson({ + url: `https://rubygems.org/api/v1/gems/${gem}.json`, + schema: gemSchema, + errorMessages: { + 404: 'gem not found', + }, + }) return { totalDownloads, versionDownloads } } @@ -154,10 +152,8 @@ module.exports = class GemDownloads extends BaseJsonService { } downloads = await this.fetchDownloadCountForVersion({ gem, version }) } else { - const { - totalDownloads, - versionDownloads, - } = await this.fetchDownloadCountForGem({ gem, variant }) + const { totalDownloads, versionDownloads } = + await this.fetchDownloadCountForGem({ gem, variant }) downloads = variant === 'dtv' ? versionDownloads : totalDownloads } return this.constructor.render({ variant, version, downloads }) diff --git a/services/github/github-api-provider.js b/services/github/github-api-provider.js index cae672ae31e4bff9d621b9cbc26f9024ea12e4bb..74d3607a5a8a82b9180eec0a1710cb738ba7f079 100644 --- a/services/github/github-api-provider.js +++ b/services/github/github-api-provider.js @@ -101,11 +101,8 @@ class GithubApiProvider { let rateLimit, totalUsesRemaining, nextReset if (url.startsWith('/graphql')) { try { - ;({ - rateLimit, - totalUsesRemaining, - nextReset, - } = this.getV4RateLimitFromBody(res.body)) + ;({ rateLimit, totalUsesRemaining, nextReset } = + this.getV4RateLimitFromBody(res.body)) } catch (e) { console.error( `Could not extract rate limit info from response body ${res.body}` @@ -115,11 +112,8 @@ class GithubApiProvider { } } else { try { - ;({ - rateLimit, - totalUsesRemaining, - nextReset, - } = this.getV3RateLimitFromHeaders(res.headers)) + ;({ rateLimit, totalUsesRemaining, nextReset } = + this.getV3RateLimitFromHeaders(res.headers)) } catch (e) { const logHeaders = { 'x-ratelimit-limit': res.headers['x-ratelimit-limit'], diff --git a/services/github/github-deployments.service.js b/services/github/github-deployments.service.js index 21ba0bdbfe75f68877f2d3179260cff8d55e54af..04dfc21cbcb51057c711712764c183030c886149 100644 --- a/services/github/github-deployments.service.js +++ b/services/github/github-deployments.service.js @@ -92,7 +92,7 @@ module.exports = class GithubDeployments extends GithubAuthV4Service { async fetch({ user, repo, environment }) { return this._requestGraphql({ query: gql` - query($user: String!, $repo: String!, $environment: String!) { + query ($user: String!, $repo: String!, $environment: String!) { repository(owner: $user, name: $repo) { deployments(last: 1, environments: [$environment]) { nodes { diff --git a/services/github/github-discussions-total.service.js b/services/github/github-discussions-total.service.js index 760f11a1367e78544072c6c5c9f33edd6aa56711..88bc5c335643808dc848c271585c1d72c48035c8 100644 --- a/services/github/github-discussions-total.service.js +++ b/services/github/github-discussions-total.service.js @@ -45,7 +45,7 @@ module.exports = class GithubTotalDiscussions extends GithubAuthV4Service { async fetch({ user, repo }) { return this._requestGraphql({ query: gql` - query($user: String!, $repo: String!) { + query ($user: String!, $repo: String!) { repository(name: $repo, owner: $user) { discussions { totalCount diff --git a/services/github/github-forks.service.js b/services/github/github-forks.service.js index 644f33dbe613b7eba996e032119eabb7020c110f..67bac545b8003421de829651c6ec2d2010f2260b 100644 --- a/services/github/github-forks.service.js +++ b/services/github/github-forks.service.js @@ -58,7 +58,7 @@ module.exports = class GithubForks extends GithubAuthV4Service { async handle({ user, repo }) { const json = await this._requestGraphql({ query: gql` - query($user: String!, $repo: String!) { + query ($user: String!, $repo: String!) { repository(owner: $user, name: $repo) { forkCount } diff --git a/services/github/github-hacktoberfest.service.js b/services/github/github-hacktoberfest.service.js index 9143c6100af12bbf4e0d09fa26c148930d01ffd5..85339bd39a8dfa60be03aa38235776a5e583852e 100644 --- a/services/github/github-hacktoberfest.service.js +++ b/services/github/github-hacktoberfest.service.js @@ -177,7 +177,7 @@ module.exports = class GithubHacktoberfestCombinedStatus extends ( }, } = await this._requestGraphql({ query: gql` - query( + query ( $user: String! $repo: String! $suggestionLabel: String! diff --git a/services/github/github-issues-search.service.js b/services/github/github-issues-search.service.js index 7f5cff9665e2b2064e94d03623925954cdf39560..979345af9ef6ea23b31a02348227aee98e3a5604 100644 --- a/services/github/github-issues-search.service.js +++ b/services/github/github-issues-search.service.js @@ -30,7 +30,7 @@ class BaseGithubIssuesSearch extends GithubAuthV4Service { async fetch({ query }) { const data = await this._requestGraphql({ query: gql` - query($query: String!) { + query ($query: String!) { search(query: $query, type: ISSUE) { issueCount } diff --git a/services/github/github-issues.service.js b/services/github/github-issues.service.js index cd2a09b3811702f25757118ff5126f201f44345c..9f7b37ed2be447e23797d80124fc7a8f51463beb 100644 --- a/services/github/github-issues.service.js +++ b/services/github/github-issues.service.js @@ -329,7 +329,7 @@ module.exports = class GithubIssues extends GithubAuthV4Service { }, } = await this._requestGraphql({ query: gql` - query( + query ( $user: String! $repo: String! $states: [PullRequestState!] @@ -359,7 +359,7 @@ module.exports = class GithubIssues extends GithubAuthV4Service { }, } = await this._requestGraphql({ query: gql` - query( + query ( $user: String! $repo: String! $states: [IssueState!] diff --git a/services/github/github-package-json.service.js b/services/github/github-package-json.service.js index 20cc13617e918c071271e5e3b9a71f98f65469f9..9b8dc0004bac2170ecff4db70c8d74e8878cc261 100644 --- a/services/github/github-package-json.service.js +++ b/services/github/github-package-json.service.js @@ -151,17 +151,14 @@ class GithubPackageJsonDependencyVersion extends ConditionalGithubAuthV3Service { user, repo, kind, branch = 'HEAD', scope, packageName }, { filename = 'package.json' } ) { - const { - dependencies, - devDependencies, - peerDependencies, - } = await fetchJsonFromRepo(this, { - schema: isPackageJsonWithDependencies, - user, - repo, - branch, - filename, - }) + const { dependencies, devDependencies, peerDependencies } = + await fetchJsonFromRepo(this, { + schema: isPackageJsonWithDependencies, + user, + repo, + branch, + filename, + }) const wantedDependency = scope ? `${scope}/${packageName}` : packageName const { range } = getDependencyVersion({ diff --git a/services/github/github-sponsors.service.js b/services/github/github-sponsors.service.js index 443e2cf4aac702ce0002cff58a21ca855e2ee390..1724244cb55adc313d6ee2f598b2d3ce47112779 100644 --- a/services/github/github-sponsors.service.js +++ b/services/github/github-sponsors.service.js @@ -49,7 +49,7 @@ module.exports = class GithubSponsors extends GithubAuthV4Service { async fetch({ user }) { return this._requestGraphql({ query: gql` - query($user: String!) { + query ($user: String!) { repositoryOwner(login: $user) { ... on User { sponsorshipsAsMaintainer { diff --git a/services/github/github-tag.service.js b/services/github/github-tag.service.js index 7e66bb293aa72138292df0ed2063cf8175564884..c0475651a43cc010551133b0e581e6b44cf653c6 100644 --- a/services/github/github-tag.service.js +++ b/services/github/github-tag.service.js @@ -79,7 +79,7 @@ class GithubTag extends GithubAuthV4Service { const limit = sort === 'semver' ? 100 : 1 return this._requestGraphql({ query: gql` - query($user: String!, $repo: String!, $limit: Int!) { + query ($user: String!, $repo: String!, $limit: Int!) { repository(owner: $user, name: $repo) { refs( refPrefix: "refs/tags/" diff --git a/services/jenkins/jenkins-coverage.service.js b/services/jenkins/jenkins-coverage.service.js index f5e5bc177d2577033f629280b21b7f6700ee5eec..aefa814a855f79c74109f483954d862c5662b602 100644 --- a/services/jenkins/jenkins-coverage.service.js +++ b/services/jenkins/jenkins-coverage.service.js @@ -115,9 +115,8 @@ module.exports = class JenkinsCoverage extends JenkinsBase { } async handle({ format }, { jobUrl, disableStrictSSL }) { - const { schema, transform, treeQueryParam, pluginSpecificPath } = formatMap[ - format - ] + const { schema, transform, treeQueryParam, pluginSpecificPath } = + formatMap[format] const json = await this.fetch({ url: buildUrl({ jobUrl, plugin: pluginSpecificPath }), schema, diff --git a/services/myget/myget.service.js b/services/myget/myget.service.js index f54f8bffc54e8b2c74e1dcffa522f90b53911185..1a4c5fc85c827e2e17e88abc6ee1d00ba3eed712 100644 --- a/services/myget/myget.service.js +++ b/services/myget/myget.service.js @@ -2,14 +2,12 @@ const { createServiceFamily } = require('../nuget/nuget-v3-service-family') -const { - NugetVersionService: Version, - NugetDownloadService: Downloads, -} = createServiceFamily({ - defaultLabel: 'myget', - serviceBaseUrl: 'myget', - apiDomain: 'myget.org', -}) +const { NugetVersionService: Version, NugetDownloadService: Downloads } = + createServiceFamily({ + defaultLabel: 'myget', + serviceBaseUrl: 'myget', + apiDomain: 'myget.org', + }) class MyGetVersionService extends Version { static examples = [ diff --git a/services/node/node-base.js b/services/node/node-base.js index 2b100b561616f7cd9a1c31446c2e5f27d80c0152..007ad6e4b93af85b39b2cd3a435ed605aa1893c6 100644 --- a/services/node/node-base.js +++ b/services/node/node-base.js @@ -106,12 +106,8 @@ module.exports = class NodeVersionBase extends NPMBase { } async handle(namedParams, queryParams) { - const { - scope, - packageName, - tag, - registryUrl, - } = this.constructor.unpackParams(namedParams, queryParams) + const { scope, packageName, tag, registryUrl } = + this.constructor.unpackParams(namedParams, queryParams) const { engines } = await this.fetchPackageData({ scope, packageName, diff --git a/services/node/node-version-color.js b/services/node/node-version-color.js index f9f96fef05c80fa8e0f788d70628a21d4a2e0300..f13d45e54f4a47d3185d808accadce22293ccae6 100644 --- a/services/node/node-version-color.js +++ b/services/node/node-version-color.js @@ -40,8 +40,7 @@ async function getCurrentVersion() { async function getLtsVersions() { const versions = await promisify(regularUpdate)({ - url: - 'https://raw.githubusercontent.com/nodejs/Release/master/schedule.json', + url: 'https://raw.githubusercontent.com/nodejs/Release/master/schedule.json', intervalMillis: 24 * 3600 * 1000, json: true, scraper: ltsVersionsScraper, diff --git a/services/node/testUtils/test-utils.js b/services/node/testUtils/test-utils.js index c08bdca8efc97f78517e97d577b486656b1f3aca..96b265ee7dac39226d61040515fa6c7f0360fe6c 100644 --- a/services/node/testUtils/test-utils.js +++ b/services/node/testUtils/test-utils.js @@ -19,27 +19,29 @@ const templates = { const getTemplate = template => JSON.parse(templates[template]) -const mockPackageData = ({ packageName, engines, scope, tag }) => nock => { - let packageJson - let urlPath - if (scope || tag) { - if (scope) { - urlPath = `/${scope}%2F${packageName}` +const mockPackageData = + ({ packageName, engines, scope, tag }) => + nock => { + let packageJson + let urlPath + 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 { - urlPath = `/${packageName}` + urlPath = `/${packageName}/latest` + packageJson = getTemplate('packageJsonTemplate') + packageJson.engines.node = engines } - packageJson = getTemplate('packageJsonVersionsTemplate') - packageJson['dist-tags'][tag || 'latest'] = '0.0.91' - packageJson.versions['0.0.91'].engines.node = engines - } else { - urlPath = `/${packageName}/latest` - packageJson = getTemplate('packageJsonTemplate') - packageJson.engines.node = engines + return nock('https://registry.npmjs.org/') + .get(urlPath) + .reply(200, packageJson) } - return nock('https://registry.npmjs.org/') - .get(urlPath) - .reply(200, packageJson) -} const mockCurrentSha = latestVersion => nock => { const latestSha = `node-v${latestVersion}.12.0-aix-ppc64.tar.gz` diff --git a/services/npm/npm-dependency-version.service.js b/services/npm/npm-dependency-version.service.js index 0c4f1d023870e1a8612021f312ebfe0a9d489c25..83b1e352c6f0bf5bc549e7e41c5c8054c615190e 100644 --- a/services/npm/npm-dependency-version.service.js +++ b/services/npm/npm-dependency-version.service.js @@ -122,15 +122,12 @@ module.exports = class NpmDependencyVersion extends NpmBase { dependencyScope ? `${dependencyScope}/` : '' }${dependency}` - const { - dependencies, - devDependencies, - peerDependencies, - } = await this.fetchPackageData({ - scope, - packageName, - registryUrl, - }) + const { dependencies, devDependencies, peerDependencies } = + await this.fetchPackageData({ + scope, + packageName, + registryUrl, + }) const { range } = getDependencyVersion({ kind, diff --git a/services/npm/npm-version.service.js b/services/npm/npm-version.service.js index d81ca658e3bc83ca51974756eb8f0527029ee190..ab517815f3df8e0e005fd54677426d7cc807acdc 100644 --- a/services/npm/npm-version.service.js +++ b/services/npm/npm-version.service.js @@ -71,12 +71,8 @@ module.exports = class NpmVersion extends NpmBase { } async handle(namedParams, queryParams) { - const { - scope, - packageName, - tag, - registryUrl, - } = this.constructor.unpackParams(namedParams, queryParams) + const { scope, packageName, tag, registryUrl } = + this.constructor.unpackParams(namedParams, queryParams) const slug = scope === undefined diff --git a/services/nuget/nuget.service.js b/services/nuget/nuget.service.js index 96df17b9c96a5f58a49357c5442a585beff355ec..86c33498f0abc94ed9df10acde771a296af1f9d6 100644 --- a/services/nuget/nuget.service.js +++ b/services/nuget/nuget.service.js @@ -2,16 +2,14 @@ const { createServiceFamily } = require('./nuget-v3-service-family') -const { - NugetVersionService: Version, - NugetDownloadService: Downloads, -} = createServiceFamily({ - defaultLabel: 'nuget', - serviceBaseUrl: 'nuget', - apiBaseUrl: 'https://api.nuget.org/v3', - withTenant: false, - withFeed: false, -}) +const { NugetVersionService: Version, NugetDownloadService: Downloads } = + createServiceFamily({ + defaultLabel: 'nuget', + serviceBaseUrl: 'nuget', + apiBaseUrl: 'https://api.nuget.org/v3', + withTenant: false, + withFeed: false, + }) class NugetVersionService extends Version { static examples = [ diff --git a/services/scoop/scoop-version.service.js b/services/scoop/scoop-version.service.js index 2543da5020134d9d38be606dba63e1e7cfdffad8..a45310785146e2b5156251da4af13addd3eb2922 100644 --- a/services/scoop/scoop-version.service.js +++ b/services/scoop/scoop-version.service.js @@ -8,7 +8,8 @@ const { const { fetchJsonFromRepo } = require('../github/github-common-fetch') const { renderVersionBadge } = require('../version') -const gitHubRepoRegExp = /https:\/\/github.com\/(?<user>.*?)\/(?<repo>.*?)(\/|$)/ +const gitHubRepoRegExp = + /https:\/\/github.com\/(?<user>.*?)\/(?<repo>.*?)(\/|$)/ const bucketsSchema = Joi.object() .pattern(/.+/, Joi.string().pattern(gitHubRepoRegExp).required()) .required() diff --git a/services/suggest.integration.js b/services/suggest.integration.js index 23e6948a33cda3d58ea680740aa5c6c8f171afbf..c000ebbb9c090a6a14cf0a751e15e148fca309cd 100644 --- a/services/suggest.integration.js +++ b/services/suggest.integration.js @@ -98,8 +98,7 @@ describe('Badge suggestions for', function () { }, { title: 'Twitter', - link: - 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fatom%2Fatom', + link: 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fatom%2Fatom', example: { pattern: '/twitter/url', namedParams: {}, @@ -169,8 +168,7 @@ describe('Badge suggestions for', function () { }, { title: 'Twitter', - link: - 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fbadges%2Fnot-a-real-project', + link: 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fbadges%2Fnot-a-real-project', example: { pattern: '/twitter/url', namedParams: {}, @@ -213,8 +211,7 @@ describe('Badge suggestions for', function () { }, { title: 'Twitter', - link: - 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgitlab.com%2Fgitlab-org%2Fgitlab', + link: 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgitlab.com%2Fgitlab-org%2Fgitlab', example: { pattern: '/twitter/url', namedParams: {}, @@ -255,8 +252,7 @@ describe('Badge suggestions for', function () { }, { title: 'Twitter', - link: - 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgitlab.com%2Fgitlab-org%2Fnot-gitlab', + link: 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgitlab.com%2Fgitlab-org%2Fnot-gitlab', example: { pattern: '/twitter/url', namedParams: {}, diff --git a/services/suggest.spec.js b/services/suggest.spec.js index 6fcbe5dd113c1a43a4673b5cb4b2025b250ab672..0288dc801a46e6438c96ae32ddb5c1230502a8d5 100644 --- a/services/suggest.spec.js +++ b/services/suggest.spec.js @@ -157,8 +157,7 @@ describe('Badge suggestions', function () { }, { title: 'Twitter', - link: - 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fatom%2Fatom', + link: 'https://twitter.com/intent/tweet?text=Wow:&url=https%3A%2F%2Fgithub.com%2Fatom%2Fatom', example: { pattern: '/twitter/url', namedParams: {}, diff --git a/services/teamcity/teamcity-build.tester.js b/services/teamcity/teamcity-build.tester.js index eecebed33225cc359732e9feffb38d164a080456..da29069c4548280362a3b42dfb591eb0d4f4d4e8 100644 --- a/services/teamcity/teamcity-build.tester.js +++ b/services/teamcity/teamcity-build.tester.js @@ -5,7 +5,8 @@ const { withRegex } = require('../test-validators') const t = (module.exports = require('../tester').createServiceTester()) 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') .get('/s/btabc.json?server=https://teamcity.jetbrains.com') diff --git a/services/testspace/testspace-test-count.service.js b/services/testspace/testspace-test-count.service.js index 98cb553957dc9000ad3819b17589b2848ae24292..38a73558dcc3ad1f1876bb4e248bde7839ebb0fe 100644 --- a/services/testspace/testspace-test-count.service.js +++ b/services/testspace/testspace-test-count.service.js @@ -41,13 +41,8 @@ module.exports = class TestspaceTestCount extends TestspaceBase { } transform({ json, metric }) { - const { - passed, - failed, - skipped, - errored, - total, - } = this.transformCaseCounts(json) + const { passed, failed, skipped, errored, total } = + this.transformCaseCounts(json) if (metric === 'total') { return { value: total } } else if (metric === 'passed') {