diff --git a/package-lock.json b/package-lock.json index de0487d09d..8092347b9a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5340,9 +5340,9 @@ } }, "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "dev": true, "requires": { "es-to-primitive": "^1.2.1", @@ -5415,23 +5415,25 @@ "dev": true }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "dev": true, "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "dev": true, "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } } } @@ -11652,9 +11654,9 @@ } }, "eslint-module-utils": { - "version": "2.5.2", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz", - "integrity": "sha512-LGScZ/JSlqGKiT8OC+cYRxseMjyqt6QO54nl281CK93unD89ijSeRV6An8Ci/2nvWVKe8K/Tqdm75RQoIOCr+Q==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", + "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", "dev": true, "requires": { "debug": "^2.6.9", @@ -11731,9 +11733,9 @@ } }, "eslint-plugin-import": { - "version": "2.20.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.1.tgz", - "integrity": "sha512-qQHgFOTjguR+LnYRoToeZWT62XM55MBVXObHM6SKFd1VzDcX/vqT1kAz8ssqigh5eMj8qXcRoXXGZpPP6RfdCw==", + "version": "2.20.2", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.20.2.tgz", + "integrity": "sha512-FObidqpXrR8OnCh4iNsxy+WACztJLXAHBO5hK79T1Hc77PgQZkyDGA5Ag9xAvRpglvLNxhH/zSmZ70/pZ31dHg==", "dev": true, "requires": { "array-includes": "^3.0.3", @@ -11760,9 +11762,9 @@ } }, "es-abstract": { - "version": "1.17.4", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz", - "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==", + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", "dev": true, "requires": { "es-to-primitive": "^1.2.1", @@ -11862,23 +11864,25 @@ } }, "string.prototype.trimleft": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz", - "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", "dev": true, "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" } }, "string.prototype.trimright": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz", - "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", "dev": true, "requires": { "define-properties": "^1.1.3", - "function-bind": "^1.1.1" + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" } } } @@ -28394,6 +28398,124 @@ } } }, + "string.prototype.trimend": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.0.tgz", + "integrity": "sha512-EEJnGqa/xNfIg05SxiPSqRS7S9qwDhYts1TSLR1BQfYUfPe1stofgGKvwERK9+9yf+PpfBMlpBaCHucXGPQfUA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + }, + "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "es-abstract": { + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", + "dev": true + }, + "is-regex": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + }, + "string.prototype.trimleft": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" + } + }, + "string.prototype.trimright": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" + } + } + } + }, "string.prototype.trimleft": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.0.tgz", @@ -28448,6 +28570,124 @@ } } }, + "string.prototype.trimstart": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.0.tgz", + "integrity": "sha512-iCP8g01NFYiiBOnwG1Xc3WZLyoo+RuBymwIlWncShXDDJYWN6DbnM3odslBJdgCdRlq94B5s63NWAZlcn2CS4w==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5" + }, + "dependencies": { + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, + "es-abstract": { + "version": "1.17.5", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz", + "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.1.5", + "is-regex": "^1.0.5", + "object-inspect": "^1.7.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.0", + "string.prototype.trimleft": "^2.1.1", + "string.prototype.trimright": "^2.1.1" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "dev": true, + "requires": { + "function-bind": "^1.1.1" + } + }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, + "is-callable": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz", + "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==", + "dev": true + }, + "is-regex": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz", + "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==", + "dev": true, + "requires": { + "has": "^1.0.3" + } + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + }, + "string.prototype.trimleft": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.2.tgz", + "integrity": "sha512-gCA0tza1JBvqr3bfAIFJGqfdRTyPae82+KTnm3coDXkZN9wnuW3HjGgN386D7hfv5CHQYCI022/rJPVlqXyHSw==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimstart": "^1.0.0" + } + }, + "string.prototype.trimright": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.2.tgz", + "integrity": "sha512-ZNRQ7sY3KroTaYjRS6EbNiiHrOkjihL9aQE/8gfQ4DtAC/aEBRHFJa44OmoWxGGqXuJlfKkZW4WcXErGr+9ZFg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.5", + "string.prototype.trimend": "^1.0.0" + } + } + } + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", diff --git a/package.json b/package.json index 7373d37c78..140da95ac3 100644 --- a/package.json +++ b/package.json @@ -181,7 +181,7 @@ "eslint-config-standard-react": "^9.2.0", "eslint-plugin-chai-friendly": "^0.5.0", "eslint-plugin-cypress": "^2.10.3", - "eslint-plugin-import": "^2.20.1", + "eslint-plugin-import": "^2.20.2", "eslint-plugin-jsdoc": "^20.4.0", "eslint-plugin-mocha": "^6.3.0", "eslint-plugin-no-extension-in-require": "^0.2.0", diff --git a/services/amo/amo-downloads.service.js b/services/amo/amo-downloads.service.js index 4bba136ae9..ed73cab3a0 100644 --- a/services/amo/amo-downloads.service.js +++ b/services/amo/amo-downloads.service.js @@ -2,8 +2,8 @@ const { metric } = require('../text-formatters') const { downloadCount } = require('../color-formatters') -const { BaseAmoService, keywords } = require('./amo-base') const { redirector } = require('..') +const { BaseAmoService, keywords } = require('./amo-base') const documentation = `

diff --git a/services/appveyor/appveyor-job-build.service.js b/services/appveyor/appveyor-job-build.service.js index 9ea2b34bfe..b83f6ea132 100644 --- a/services/appveyor/appveyor-job-build.service.js +++ b/services/appveyor/appveyor-job-build.service.js @@ -1,8 +1,8 @@ 'use strict' const { renderBuildStatusBadge } = require('../build-status') -const AppVeyorBase = require('./appveyor-base') const { NotFound } = require('..') +const AppVeyorBase = require('./appveyor-base') module.exports = class AppVeyorJobBuild extends AppVeyorBase { static get route() { diff --git a/services/appveyor/appveyor-job-build.spec.js b/services/appveyor/appveyor-job-build.spec.js index dd37a692be..6422549aec 100644 --- a/services/appveyor/appveyor-job-build.spec.js +++ b/services/appveyor/appveyor-job-build.spec.js @@ -2,8 +2,8 @@ const { expect } = require('chai') const { test, given } = require('sazerac') -const AppveyorJobBuild = require('./appveyor-job-build.service') const { NotFound } = require('..') +const AppveyorJobBuild = require('./appveyor-job-build.service') describe('AppveyorJobBuild', function() { test(AppveyorJobBuild.prototype.transform, () => { diff --git a/services/azure-devops/azure-devops-build.service.js b/services/azure-devops/azure-devops-build.service.js index d8025a943c..018d1032f0 100644 --- a/services/azure-devops/azure-devops-build.service.js +++ b/services/azure-devops/azure-devops-build.service.js @@ -2,8 +2,8 @@ const Joi = require('@hapi/joi') const { renderBuildStatusBadge } = require('../build-status') -const { keywords, fetch } = require('./azure-devops-helpers') const { BaseSvgScrapingService, NotFound } = require('..') +const { keywords, fetch } = require('./azure-devops-helpers') const queryParamSchema = Joi.object({ stage: Joi.string(), diff --git a/services/azure-devops/azure-devops-release.service.js b/services/azure-devops/azure-devops-release.service.js index 4b188714d3..0bbc6ab41f 100644 --- a/services/azure-devops/azure-devops-release.service.js +++ b/services/azure-devops/azure-devops-release.service.js @@ -1,8 +1,8 @@ 'use strict' const { renderBuildStatusBadge } = require('../build-status') -const { keywords, fetch } = require('./azure-devops-helpers') const { BaseSvgScrapingService } = require('..') +const { keywords, fetch } = require('./azure-devops-helpers') const documentation = `

diff --git a/services/bower/bower-version.service.js b/services/bower/bower-version.service.js index c1f903bf0f..77b304b481 100644 --- a/services/bower/bower-version.service.js +++ b/services/bower/bower-version.service.js @@ -2,8 +2,8 @@ const Joi = require('@hapi/joi') const { renderVersionBadge } = require('../version') -const BaseBowerService = require('./bower-base') const { InvalidResponse, redirector } = require('..') +const BaseBowerService = require('./bower-base') const queryParamSchema = Joi.object({ include_prereleases: Joi.equal(''), diff --git a/services/chrome-web-store/chrome-web-store-users.service.js b/services/chrome-web-store/chrome-web-store-users.service.js index 08bf6fb89d..8180d07294 100644 --- a/services/chrome-web-store/chrome-web-store-users.service.js +++ b/services/chrome-web-store/chrome-web-store-users.service.js @@ -2,8 +2,8 @@ const { metric } = require('../text-formatters') const { downloadCount } = require('../color-formatters') -const BaseChromeWebStoreService = require('./chrome-web-store-base') const { redirector, NotFound } = require('..') +const BaseChromeWebStoreService = require('./chrome-web-store-base') class ChromeWebStoreUsers extends BaseChromeWebStoreService { static get category() { diff --git a/services/clojars/clojars-version.service.js b/services/clojars/clojars-version.service.js index ab0404bb71..b89e5e0253 100644 --- a/services/clojars/clojars-version.service.js +++ b/services/clojars/clojars-version.service.js @@ -2,8 +2,8 @@ const Joi = require('@hapi/joi') const { version: versionColor } = require('../color-formatters') -const { BaseClojarsService } = require('./clojars-base') const { redirector } = require('..') +const { BaseClojarsService } = require('./clojars-base') const queryParamSchema = Joi.object({ include_prereleases: Joi.equal(''), diff --git a/services/codacy/codacy-grade.service.js b/services/codacy/codacy-grade.service.js index c1e378ce6e..337a835ae4 100644 --- a/services/codacy/codacy-grade.service.js +++ b/services/codacy/codacy-grade.service.js @@ -1,8 +1,8 @@ 'use strict' const Joi = require('@hapi/joi') -const { codacyGrade } = require('./codacy-helpers') const { BaseSvgScrapingService } = require('..') +const { codacyGrade } = require('./codacy-helpers') const schema = Joi.object({ message: codacyGrade }).required() diff --git a/services/codeclimate/codeclimate-analysis.service.js b/services/codeclimate/codeclimate-analysis.service.js index f1fdb3c5f0..3468099657 100644 --- a/services/codeclimate/codeclimate-analysis.service.js +++ b/services/codeclimate/codeclimate-analysis.service.js @@ -3,8 +3,8 @@ const Joi = require('@hapi/joi') const { colorScale, letterScore } = require('../color-formatters') const { nonNegativeInteger } = require('../validators') -const { keywords, isLetterGrade, fetchRepo } = require('./codeclimate-common') const { BaseJsonService, NotFound } = require('..') +const { keywords, isLetterGrade, fetchRepo } = require('./codeclimate-common') const schema = Joi.object({ data: Joi.object({ diff --git a/services/codeclimate/codeclimate-coverage.service.js b/services/codeclimate/codeclimate-coverage.service.js index ff55df1d01..a71ebd414e 100644 --- a/services/codeclimate/codeclimate-coverage.service.js +++ b/services/codeclimate/codeclimate-coverage.service.js @@ -2,8 +2,8 @@ const Joi = require('@hapi/joi') const { coveragePercentage, letterScore } = require('../color-formatters') -const { keywords, isLetterGrade, fetchRepo } = require('./codeclimate-common') const { BaseJsonService, NotFound } = require('..') +const { keywords, isLetterGrade, fetchRepo } = require('./codeclimate-common') const schema = Joi.object({ data: Joi.object({ diff --git a/services/codefactor/codefactor-grade.service.js b/services/codefactor/codefactor-grade.service.js index af766e1be0..707661fb1b 100644 --- a/services/codefactor/codefactor-grade.service.js +++ b/services/codefactor/codefactor-grade.service.js @@ -1,8 +1,8 @@ 'use strict' const Joi = require('@hapi/joi') -const { isValidGrade, gradeColor } = require('./codefactor-helpers') const { BaseSvgScrapingService } = require('..') +const { isValidGrade, gradeColor } = require('./codefactor-helpers') const schema = Joi.object({ message: isValidGrade, diff --git a/services/crates/crates-downloads.service.js b/services/crates/crates-downloads.service.js index 0a636b1e3f..4363716dac 100644 --- a/services/crates/crates-downloads.service.js +++ b/services/crates/crates-downloads.service.js @@ -2,8 +2,8 @@ const { downloadCount: downloadCountColor } = require('../color-formatters') const { metric } = require('../text-formatters') -const { BaseCratesService, keywords } = require('./crates-base') const { InvalidParameter, NotFound } = require('..') +const { BaseCratesService, keywords } = require('./crates-base') module.exports = class CratesDownloads extends BaseCratesService { static get category() { diff --git a/services/crates/crates-version.service.js b/services/crates/crates-version.service.js index e036dd7cf0..91babda795 100644 --- a/services/crates/crates-version.service.js +++ b/services/crates/crates-version.service.js @@ -1,8 +1,8 @@ 'use strict' const { renderVersionBadge } = require('../version') -const { BaseCratesService, keywords } = require('./crates-base') const { InvalidResponse } = require('..') +const { BaseCratesService, keywords } = require('./crates-base') module.exports = class CratesVersion extends BaseCratesService { static get category() { diff --git a/services/crates/crates-version.spec.js b/services/crates/crates-version.spec.js index de50a0f130..e1c13e3eca 100644 --- a/services/crates/crates-version.spec.js +++ b/services/crates/crates-version.spec.js @@ -2,8 +2,8 @@ const { test, given } = require('sazerac') const { expect } = require('chai') -const CratesVersion = require('./crates-version.service') const { InvalidResponse } = require('..') +const CratesVersion = require('./crates-version.service') describe('CratesVersion', function() { test(CratesVersion.prototype.transform, () => { diff --git a/services/docker/docker-automated.service.js b/services/docker/docker-automated.service.js index 250a6902b1..509a85a19a 100644 --- a/services/docker/docker-automated.service.js +++ b/services/docker/docker-automated.service.js @@ -1,12 +1,12 @@ 'use strict' const Joi = require('@hapi/joi') +const { BaseJsonService } = require('..') const { dockerBlue, buildDockerUrl, getDockerHubUser, } = require('./docker-helpers') -const { BaseJsonService } = require('..') const automatedBuildSchema = Joi.object({ is_automated: Joi.boolean().required(), diff --git a/services/docker/docker-build.service.js b/services/docker/docker-build.service.js index bdf220bb3e..341a7936c8 100644 --- a/services/docker/docker-build.service.js +++ b/services/docker/docker-build.service.js @@ -2,12 +2,12 @@ const Joi = require('@hapi/joi') const { anyInteger } = require('../validators') +const { BaseJsonService } = require('..') const { dockerBlue, buildDockerUrl, getDockerHubUser, } = require('./docker-helpers') -const { BaseJsonService } = require('..') const buildSchema = Joi.object({ results: Joi.array() diff --git a/services/docker/docker-cloud-automated.service.js b/services/docker/docker-cloud-automated.service.js index 4179d53880..87cb99b365 100644 --- a/services/docker/docker-cloud-automated.service.js +++ b/services/docker/docker-cloud-automated.service.js @@ -1,8 +1,8 @@ 'use strict' +const { BaseJsonService } = require('..') const { dockerBlue, buildDockerUrl } = require('./docker-helpers') const { fetchBuild } = require('./docker-cloud-common-fetch') -const { BaseJsonService } = require('..') module.exports = class DockerCloudAutomatedBuild extends BaseJsonService { static get category() { diff --git a/services/docker/docker-cloud-build.service.js b/services/docker/docker-cloud-build.service.js index 3229421d60..db194e8cdd 100644 --- a/services/docker/docker-cloud-build.service.js +++ b/services/docker/docker-cloud-build.service.js @@ -1,8 +1,8 @@ 'use strict' +const { BaseJsonService } = require('..') const { dockerBlue, buildDockerUrl } = require('./docker-helpers') const { fetchBuild } = require('./docker-cloud-common-fetch') -const { BaseJsonService } = require('..') module.exports = class DockerCloudBuild extends BaseJsonService { static get category() { diff --git a/services/docker/docker-pulls.service.js b/services/docker/docker-pulls.service.js index 862d2536f0..1e9c0e7110 100644 --- a/services/docker/docker-pulls.service.js +++ b/services/docker/docker-pulls.service.js @@ -3,12 +3,12 @@ const Joi = require('@hapi/joi') const { metric } = require('../text-formatters') const { nonNegativeInteger } = require('../validators') +const { BaseJsonService } = require('..') const { dockerBlue, buildDockerUrl, getDockerHubUser, } = require('./docker-helpers') -const { BaseJsonService } = require('..') const pullsSchema = Joi.object({ pull_count: nonNegativeInteger, diff --git a/services/docker/docker-size.service.js b/services/docker/docker-size.service.js index 0d4e06afd7..0439181f3a 100644 --- a/services/docker/docker-size.service.js +++ b/services/docker/docker-size.service.js @@ -4,13 +4,12 @@ const Joi = require('@hapi/joi') const prettyBytes = require('pretty-bytes') const { nonNegativeInteger } = require('../validators') const { latest } = require('../version') +const { BaseJsonService, NotFound } = require('..') const { buildDockerUrl, getDockerHubUser, getMultiPageData, } = require('./docker-helpers') -const { NotFound } = require('..') -const { BaseJsonService } = require('..') const buildSchema = Joi.object({ name: Joi.string().required(), diff --git a/services/docker/docker-stars.service.js b/services/docker/docker-stars.service.js index 6a812aeccc..417bc80b30 100644 --- a/services/docker/docker-stars.service.js +++ b/services/docker/docker-stars.service.js @@ -2,12 +2,12 @@ const { metric } = require('../text-formatters') const { nonNegativeInteger } = require('../validators') +const { BaseService } = require('..') const { dockerBlue, buildDockerUrl, getDockerHubUser, } = require('./docker-helpers') -const { BaseService } = require('..') module.exports = class DockerStars extends BaseService { static get category() { diff --git a/services/docker/docker-version.service.js b/services/docker/docker-version.service.js index fa96261ff6..3640d89c98 100644 --- a/services/docker/docker-version.service.js +++ b/services/docker/docker-version.service.js @@ -3,14 +3,13 @@ const Joi = require('@hapi/joi') const { nonNegativeInteger } = require('../validators') const { latest, renderVersionBadge } = require('../version') +const { BaseJsonService, NotFound, InvalidResponse } = require('..') const { buildDockerUrl, getDockerHubUser, getMultiPageData, getDigestSemVerMatches, } = require('./docker-helpers') -const { NotFound, InvalidResponse } = require('..') -const { BaseJsonService } = require('..') const buildSchema = Joi.object({ count: nonNegativeInteger.required(), diff --git a/services/docker/docker-version.spec.js b/services/docker/docker-version.spec.js index aacbb91aff..9be9cd9bc7 100644 --- a/services/docker/docker-version.spec.js +++ b/services/docker/docker-version.spec.js @@ -2,6 +2,7 @@ const { expect } = require('chai') const { test, given } = require('sazerac') +const { InvalidResponse } = require('..') const DockerVersion = require('./docker-version.service') const { versionDataNoTagDateSort, @@ -9,7 +10,6 @@ const { versionDataNoTagSemVerSort, versionDataWithTag, } = require('./docker-fixtures') -const { InvalidResponse } = require('..') describe('DockerVersion', function() { test(DockerVersion.prototype.transform, () => { diff --git a/services/dynamic/dynamic-json.service.js b/services/dynamic/dynamic-json.service.js index b9d129cf4a..2d9ced69e9 100644 --- a/services/dynamic/dynamic-json.service.js +++ b/services/dynamic/dynamic-json.service.js @@ -1,9 +1,9 @@ 'use strict' const { MetricNames } = require('../../core/base-service/metric-helper') +const { BaseJsonService } = require('..') const { createRoute } = require('./dynamic-helpers') const jsonPath = require('./json-path') -const { BaseJsonService } = require('..') module.exports = class DynamicJson extends jsonPath(BaseJsonService) { static get enabledMetrics() { diff --git a/services/dynamic/dynamic-xml.service.js b/services/dynamic/dynamic-xml.service.js index 773889be0e..2867f1566c 100644 --- a/services/dynamic/dynamic-xml.service.js +++ b/services/dynamic/dynamic-xml.service.js @@ -4,8 +4,8 @@ const { DOMParser } = require('xmldom') const xpath = require('xpath') const { MetricNames } = require('../../core/base-service/metric-helper') const { renderDynamicBadge, errorMessages } = require('../dynamic-common') -const { createRoute } = require('./dynamic-helpers') const { BaseService, InvalidResponse, InvalidParameter } = require('..') +const { createRoute } = require('./dynamic-helpers') // This service extends BaseService because it uses a different XML parser // than BaseXmlService which can be used with xpath. diff --git a/services/dynamic/dynamic-xml.spec.js b/services/dynamic/dynamic-xml.spec.js index dd0c92c3e0..ce5d209baf 100644 --- a/services/dynamic/dynamic-xml.spec.js +++ b/services/dynamic/dynamic-xml.spec.js @@ -4,8 +4,8 @@ const { expect } = require('chai') const sinon = require('sinon') const xpath = require('xpath') const { test, given } = require('sazerac') -const DynamicXml = require('./dynamic-xml.service') const { InvalidResponse } = require('..') +const DynamicXml = require('./dynamic-xml.service') const exampleXml = ` diff --git a/services/dynamic/dynamic-yaml.service.js b/services/dynamic/dynamic-yaml.service.js index 66dab8ece6..9e96ada0a2 100644 --- a/services/dynamic/dynamic-yaml.service.js +++ b/services/dynamic/dynamic-yaml.service.js @@ -1,9 +1,9 @@ 'use strict' const { MetricNames } = require('../../core/base-service/metric-helper') +const { BaseYamlService } = require('..') const { createRoute } = require('./dynamic-helpers') const jsonPath = require('./json-path') -const { BaseYamlService } = require('..') module.exports = class DynamicYaml extends jsonPath(BaseYamlService) { static get enabledMetrics() { diff --git a/services/github/github-auth-service.js b/services/github/github-auth-service.js index 76e05f1c71..e897509c11 100644 --- a/services/github/github-auth-service.js +++ b/services/github/github-auth-service.js @@ -2,9 +2,8 @@ const gql = require('graphql-tag') const { mergeQueries } = require('../../core/base-service/graphql') +const { BaseGraphqlService, BaseJsonService } = require('..') const { staticAuthConfigured } = require('./github-helpers') -const { BaseJsonService } = require('..') -const { BaseGraphqlService } = require('..') function createRequestFetcher(context, config) { const { sendAndCacheRequestWithCallbacks, githubApiProvider } = context diff --git a/services/github/github-commit-status.service.js b/services/github/github-commit-status.service.js index 4677840121..4061a451c4 100644 --- a/services/github/github-commit-status.service.js +++ b/services/github/github-commit-status.service.js @@ -1,9 +1,9 @@ 'use strict' const Joi = require('@hapi/joi') +const { NotFound, InvalidParameter } = require('..') const { GithubAuthV3Service } = require('./github-auth-service') const { documentation, errorMessagesFor } = require('./github-helpers') -const { NotFound, InvalidParameter } = require('..') const schema = Joi.object({ // https://stackoverflow.com/a/23969867/893113 diff --git a/services/github/github-common-fetch.js b/services/github/github-common-fetch.js index 42a394918b..7486a8bcff 100644 --- a/services/github/github-common-fetch.js +++ b/services/github/github-common-fetch.js @@ -1,8 +1,8 @@ 'use strict' const Joi = require('@hapi/joi') -const { errorMessagesFor } = require('./github-helpers') const { InvalidResponse } = require('..') +const { errorMessagesFor } = require('./github-helpers') const issueSchema = Joi.object({ head: Joi.object({ diff --git a/services/github/github-common-release.js b/services/github/github-common-release.js index 1e67d5eecd..63a91265d0 100644 --- a/services/github/github-common-release.js +++ b/services/github/github-common-release.js @@ -2,8 +2,8 @@ const Joi = require('@hapi/joi') const { latest } = require('../version') -const { errorMessagesFor } = require('./github-helpers') const { NotFound } = require('..') +const { errorMessagesFor } = require('./github-helpers') const releaseInfoSchema = Joi.object({ tag_name: Joi.string().required(), diff --git a/services/github/github-deployments.service.js b/services/github/github-deployments.service.js index 40c1ac5fd2..3ebc193e90 100644 --- a/services/github/github-deployments.service.js +++ b/services/github/github-deployments.service.js @@ -2,9 +2,9 @@ const gql = require('graphql-tag') const Joi = require('@hapi/joi') +const { NotFound } = require('..') const { GithubAuthV4Service } = require('./github-auth-service') const { documentation, transformErrors } = require('./github-helpers') -const { NotFound } = require('..') const greenStates = ['SUCCESS'] const redStates = ['ERROR', 'FAILURE'] diff --git a/services/github/github-downloads.service.js b/services/github/github-downloads.service.js index 8c1ea820be..5bd470ec85 100644 --- a/services/github/github-downloads.service.js +++ b/services/github/github-downloads.service.js @@ -4,9 +4,9 @@ const Joi = require('@hapi/joi') const { metric } = require('../text-formatters') const { nonNegativeInteger } = require('../validators') const { downloadCount: downloadCountColor } = require('../color-formatters') +const { NotFound } = require('..') const { GithubAuthV3Service } = require('./github-auth-service') const { documentation, errorMessagesFor } = require('./github-helpers') -const { NotFound } = require('..') const releaseSchema = Joi.object({ assets: Joi.array() diff --git a/services/github/github-go-mod.service.js b/services/github/github-go-mod.service.js index d8f7f010d0..f958299cb6 100644 --- a/services/github/github-go-mod.service.js +++ b/services/github/github-go-mod.service.js @@ -2,10 +2,10 @@ const Joi = require('@hapi/joi') const { renderVersionBadge } = require('../version') +const { InvalidResponse } = require('..') const { ConditionalGithubAuthV3Service } = require('./github-auth-service') const { fetchRepoContent } = require('./github-common-fetch') const { documentation } = require('./github-helpers') -const { InvalidResponse } = require('..') const queryParamSchema = Joi.object({ filename: Joi.string(), diff --git a/services/github/github-issue-detail.service.js b/services/github/github-issue-detail.service.js index 46041d79c7..145028a46c 100644 --- a/services/github/github-issue-detail.service.js +++ b/services/github/github-issue-detail.service.js @@ -4,6 +4,7 @@ const Joi = require('@hapi/joi') const { nonNegativeInteger } = require('../validators') const { formatDate, metric } = require('../text-formatters') const { age } = require('../color-formatters') +const { InvalidResponse } = require('..') const { GithubAuthV3Service } = require('./github-auth-service') const { documentation, @@ -11,7 +12,6 @@ const { stateColor, commentsColor, } = require('./github-helpers') -const { InvalidResponse } = require('..') const commonSchemaFields = { number: nonNegativeInteger, diff --git a/services/github/github-issue-detail.spec.js b/services/github/github-issue-detail.spec.js index 84b9a8386b..54ab92f12d 100644 --- a/services/github/github-issue-detail.spec.js +++ b/services/github/github-issue-detail.spec.js @@ -4,9 +4,9 @@ const { expect } = require('chai') const { test, given } = require('sazerac') const { age } = require('../color-formatters') const { formatDate, metric } = require('../text-formatters') +const { InvalidResponse } = require('..') const GithubIssueDetail = require('./github-issue-detail.service') const { stateColor, commentsColor } = require('./github-helpers') -const { InvalidResponse } = require('..') describe('GithubIssueDetail', function() { test(GithubIssueDetail.render, () => { diff --git a/services/github/github-pipenv.service.js b/services/github/github-pipenv.service.js index eeeae1753d..ab291e6aa1 100644 --- a/services/github/github-pipenv.service.js +++ b/services/github/github-pipenv.service.js @@ -3,10 +3,10 @@ const { renderVersionBadge } = require('../version') const { isLockfile, getDependencyVersion } = require('../pipenv-helpers') const { addv } = require('../text-formatters') +const { NotFound } = require('..') const { ConditionalGithubAuthV3Service } = require('./github-auth-service') const { fetchJsonFromRepo } = require('./github-common-fetch') const { documentation: githubDocumentation } = require('./github-helpers') -const { NotFound } = require('..') const keywords = ['pipfile'] diff --git a/services/github/github-release.service.js b/services/github/github-release.service.js index 9edae3cc57..74886c9813 100644 --- a/services/github/github-release.service.js +++ b/services/github/github-release.service.js @@ -2,13 +2,13 @@ const { addv } = require('../text-formatters') const { version: versionColor } = require('../color-formatters') +const { redirector } = require('..') const { GithubAuthV3Service } = require('./github-auth-service') const { fetchLatestRelease, queryParamSchema, } = require('./github-common-release') const { documentation } = require('./github-helpers') -const { redirector } = require('..') class GithubRelease extends GithubAuthV3Service { static get category() { diff --git a/services/github/github-size.service.js b/services/github/github-size.service.js index 23a964c39a..76a6b59705 100644 --- a/services/github/github-size.service.js +++ b/services/github/github-size.service.js @@ -3,9 +3,9 @@ const Joi = require('@hapi/joi') const prettyBytes = require('pretty-bytes') const { nonNegativeInteger } = require('../validators') +const { NotFound } = require('..') const { GithubAuthV3Service } = require('./github-auth-service') const { documentation, errorMessagesFor } = require('./github-helpers') -const { NotFound } = require('..') const schema = Joi.alternatives( Joi.object({ diff --git a/services/github/github-tag.service.js b/services/github/github-tag.service.js index 51083f7edd..ebad4f1f78 100644 --- a/services/github/github-tag.service.js +++ b/services/github/github-tag.service.js @@ -5,10 +5,10 @@ const Joi = require('@hapi/joi') const { addv } = require('../text-formatters') const { version: versionColor } = require('../color-formatters') const { latest } = require('../version') +const { NotFound, redirector } = require('..') const { GithubAuthV4Service } = require('./github-auth-service') const { queryParamSchema } = require('./github-common-release') const { documentation, transformErrors } = require('./github-helpers') -const { NotFound, redirector } = require('..') const schema = Joi.object({ data: Joi.object({ diff --git a/services/github/github-workflow-status.service.js b/services/github/github-workflow-status.service.js index 24ba4800fe..589b155e45 100644 --- a/services/github/github-workflow-status.service.js +++ b/services/github/github-workflow-status.service.js @@ -2,8 +2,8 @@ const Joi = require('@hapi/joi') const { isBuildStatus, renderBuildStatusBadge } = require('../build-status') -const { documentation } = require('./github-helpers') const { BaseSvgScrapingService } = require('..') +const { documentation } = require('./github-helpers') const schema = Joi.object({ message: Joi.alternatives() diff --git a/services/jenkins/jenkins-build-redirect.service.js b/services/jenkins/jenkins-build-redirect.service.js index 42a0236e02..b26738b726 100644 --- a/services/jenkins/jenkins-build-redirect.service.js +++ b/services/jenkins/jenkins-build-redirect.service.js @@ -1,7 +1,7 @@ 'use strict' -const { buildRedirectUrl } = require('./jenkins-common') const { redirector } = require('..') +const { buildRedirectUrl } = require('./jenkins-common') const commonProps = { category: 'build', diff --git a/services/jenkins/jenkins-coverage-redirector.service.js b/services/jenkins/jenkins-coverage-redirector.service.js index f61208e5ce..7658977c15 100644 --- a/services/jenkins/jenkins-coverage-redirector.service.js +++ b/services/jenkins/jenkins-coverage-redirector.service.js @@ -1,7 +1,7 @@ 'use strict' -const { buildRedirectUrl } = require('./jenkins-common') const { redirector } = require('..') +const { buildRedirectUrl } = require('./jenkins-common') const commonProps = { category: 'coverage', diff --git a/services/jenkins/jenkins-tests-redirector.service.js b/services/jenkins/jenkins-tests-redirector.service.js index 57848ddca5..138ded80bc 100644 --- a/services/jenkins/jenkins-tests-redirector.service.js +++ b/services/jenkins/jenkins-tests-redirector.service.js @@ -1,7 +1,7 @@ 'use strict' -const { buildRedirectUrl } = require('./jenkins-common') const { redirector } = require('..') +const { buildRedirectUrl } = require('./jenkins-common') const commonProps = { category: 'build', diff --git a/services/jenkins/jenkins-tests.service.js b/services/jenkins/jenkins-tests.service.js index 47d5fc4f1f..243990eb3a 100644 --- a/services/jenkins/jenkins-tests.service.js +++ b/services/jenkins/jenkins-tests.service.js @@ -7,13 +7,13 @@ const { renderTestResultBadge, } = require('../test-results') const { optionalNonNegativeInteger } = require('../validators') +const { InvalidResponse } = require('..') const JenkinsBase = require('./jenkins-base') const { buildTreeParamQueryString, buildUrl, queryParamSchema, } = require('./jenkins-common') -const { InvalidResponse } = require('..') // In the API response, the `actions` array can be empty, and when it is not empty it will contain a // mix of objects. Some will be empty objects, and several will not have the test count properties. diff --git a/services/jira/jira-issue.service.js b/services/jira/jira-issue.service.js index b1eeea4a51..f71bc69ce4 100644 --- a/services/jira/jira-issue.service.js +++ b/services/jira/jira-issue.service.js @@ -2,8 +2,8 @@ const Joi = require('@hapi/joi') const { optionalUrl } = require('../validators') -const { authConfig } = require('./jira-common') const { BaseJsonService } = require('..') +const { authConfig } = require('./jira-common') const queryParamSchema = Joi.object({ baseUrl: optionalUrl.required(), diff --git a/services/jira/jira-sprint.service.js b/services/jira/jira-sprint.service.js index e7863b24b1..389b1b59ba 100644 --- a/services/jira/jira-sprint.service.js +++ b/services/jira/jira-sprint.service.js @@ -2,8 +2,8 @@ const Joi = require('@hapi/joi') const { optionalUrl } = require('../validators') -const { authConfig } = require('./jira-common') const { BaseJsonService } = require('..') +const { authConfig } = require('./jira-common') const queryParamSchema = Joi.object({ baseUrl: optionalUrl.required(), diff --git a/services/liberapay/liberapay-gives.service.js b/services/liberapay/liberapay-gives.service.js index 95455cdbc6..6e41232aac 100644 --- a/services/liberapay/liberapay-gives.service.js +++ b/services/liberapay/liberapay-gives.service.js @@ -1,7 +1,7 @@ 'use strict' -const { renderCurrencyBadge, LiberapayBase } = require('./liberapay-base') const { InvalidResponse } = require('..') +const { renderCurrencyBadge, LiberapayBase } = require('./liberapay-base') module.exports = class LiberapayGives extends LiberapayBase { static get route() { diff --git a/services/liberapay/liberapay-goal.service.js b/services/liberapay/liberapay-goal.service.js index 986b5f5cb7..47256a36c5 100644 --- a/services/liberapay/liberapay-goal.service.js +++ b/services/liberapay/liberapay-goal.service.js @@ -1,8 +1,8 @@ 'use strict' const { colorScale } = require('../color-formatters') -const { LiberapayBase } = require('./liberapay-base') const { InvalidResponse } = require('..') +const { LiberapayBase } = require('./liberapay-base') module.exports = class LiberapayGoal extends LiberapayBase { static get route() { diff --git a/services/liberapay/liberapay-goal.spec.js b/services/liberapay/liberapay-goal.spec.js index 579726068f..f0eee98de3 100644 --- a/services/liberapay/liberapay-goal.spec.js +++ b/services/liberapay/liberapay-goal.spec.js @@ -2,8 +2,8 @@ const { expect } = require('chai') const { test, given } = require('sazerac') -const LiberapayGoal = require('./liberapay-goal.service') const { InvalidResponse } = require('..') +const LiberapayGoal = require('./liberapay-goal.service') describe('LiberapayGoal', function() { test(LiberapayGoal.prototype.transform, () => { diff --git a/services/liberapay/liberapay-receives.service.js b/services/liberapay/liberapay-receives.service.js index 5eeabe7278..3987a03c47 100644 --- a/services/liberapay/liberapay-receives.service.js +++ b/services/liberapay/liberapay-receives.service.js @@ -1,7 +1,7 @@ 'use strict' -const { renderCurrencyBadge, LiberapayBase } = require('./liberapay-base') const { InvalidResponse } = require('..') +const { renderCurrencyBadge, LiberapayBase } = require('./liberapay-base') module.exports = class LiberapayReceives extends LiberapayBase { static get route() { diff --git a/services/librariesio/librariesio-dependencies.service.js b/services/librariesio/librariesio-dependencies.service.js index 4eb4f928af..009de28404 100644 --- a/services/librariesio/librariesio-dependencies.service.js +++ b/services/librariesio/librariesio-dependencies.service.js @@ -1,11 +1,11 @@ 'use strict' const Joi = require('@hapi/joi') +const { BaseJsonService } = require('..') const { transform, renderDependenciesBadge, } = require('./librariesio-dependencies-helpers') -const { BaseJsonService } = require('..') const schema = Joi.object({ dependencies: Joi.array() diff --git a/services/librariesio/librariesio-dependent-repos.service.js b/services/librariesio/librariesio-dependent-repos.service.js index fe363eff2a..00bacd9479 100644 --- a/services/librariesio/librariesio-dependent-repos.service.js +++ b/services/librariesio/librariesio-dependent-repos.service.js @@ -1,8 +1,8 @@ 'use strict' const { metric } = require('../text-formatters') -const { fetchProject } = require('./librariesio-common') const { BaseJsonService } = require('..') +const { fetchProject } = require('./librariesio-common') // https://libraries.io/api#project-dependent-repositories module.exports = class LibrariesIoDependentRepos extends BaseJsonService { diff --git a/services/librariesio/librariesio-dependents.service.js b/services/librariesio/librariesio-dependents.service.js index 978397f852..4bb7346c21 100644 --- a/services/librariesio/librariesio-dependents.service.js +++ b/services/librariesio/librariesio-dependents.service.js @@ -1,8 +1,8 @@ 'use strict' const { metric } = require('../text-formatters') -const { fetchProject } = require('./librariesio-common') const { BaseJsonService } = require('..') +const { fetchProject } = require('./librariesio-common') // https://libraries.io/api#project-dependents module.exports = class LibrariesIoDependents extends BaseJsonService { diff --git a/services/librariesio/librariesio-sourcerank.service.js b/services/librariesio/librariesio-sourcerank.service.js index 869ddd00c6..5d0f5bc8d6 100644 --- a/services/librariesio/librariesio-sourcerank.service.js +++ b/services/librariesio/librariesio-sourcerank.service.js @@ -1,8 +1,8 @@ 'use strict' const { colorScale } = require('../color-formatters') -const { fetchProject } = require('./librariesio-common') const { BaseJsonService } = require('..') +const { fetchProject } = require('./librariesio-common') const sourceRankColor = colorScale([10, 15, 20, 25, 30]) diff --git a/services/luarocks/luarocks.service.js b/services/luarocks/luarocks.service.js index f0bccff27e..28a3231c26 100644 --- a/services/luarocks/luarocks.service.js +++ b/services/luarocks/luarocks.service.js @@ -2,8 +2,8 @@ const Joi = require('@hapi/joi') const { addv } = require('../text-formatters') -const { latestVersion } = require('./luarocks-version-helpers') const { BaseJsonService, NotFound } = require('..') +const { latestVersion } = require('./luarocks-version-helpers') const schema = Joi.object({ repository: Joi.object() diff --git a/services/microbadger/microbadger-size.service.js b/services/microbadger/microbadger-size.service.js index cded37a503..bfc6bd2e72 100644 --- a/services/microbadger/microbadger-size.service.js +++ b/services/microbadger/microbadger-size.service.js @@ -1,8 +1,8 @@ 'use strict' const prettyBytes = require('pretty-bytes') -const BaseMicrobadgerService = require('./microbadger-base') const { NotFound } = require('..') +const BaseMicrobadgerService = require('./microbadger-base') const documentation = `

diff --git a/services/nexus/nexus.service.js b/services/nexus/nexus.service.js index b95362d73f..54b09e9410 100644 --- a/services/nexus/nexus.service.js +++ b/services/nexus/nexus.service.js @@ -7,8 +7,8 @@ const { optionalUrl } = require('../validators') const { optionalDottedVersionNClausesWithOptionalSuffix, } = require('../validators') -const { isSnapshotVersion } = require('./nexus-version') const { BaseJsonService, InvalidResponse, NotFound } = require('..') +const { isSnapshotVersion } = require('./nexus-version') const nexus2SearchApiSchema = Joi.object({ data: Joi.array() diff --git a/services/nexus/nexus.spec.js b/services/nexus/nexus.spec.js index 64556b16b2..b9717ec124 100644 --- a/services/nexus/nexus.spec.js +++ b/services/nexus/nexus.spec.js @@ -3,8 +3,8 @@ const { expect } = require('chai') const nock = require('nock') const { cleanUpNockAfterEach, defaultContext } = require('../test-helpers') -const Nexus = require('./nexus.service') const { InvalidResponse, NotFound } = require('..') +const Nexus = require('./nexus.service') describe('Nexus', function() { context('transform2()', function() { diff --git a/services/npm/npm-version.service.js b/services/npm/npm-version.service.js index 8e18c8947d..ae0a5ece1a 100644 --- a/services/npm/npm-version.service.js +++ b/services/npm/npm-version.service.js @@ -2,8 +2,8 @@ const Joi = require('@hapi/joi') const { renderVersionBadge } = require('../version') -const NpmBase = require('./npm-base') const { NotFound } = require('..') +const NpmBase = require('./npm-base') const keywords = ['node'] diff --git a/services/nuget/nuget-v2-service-family.js b/services/nuget/nuget-v2-service-family.js index 601c12095f..d93db0fb3c 100644 --- a/services/nuget/nuget-v2-service-family.js +++ b/services/nuget/nuget-v2-service-family.js @@ -2,12 +2,12 @@ const Joi = require('@hapi/joi') const { nonNegativeInteger } = require('../validators') +const { BaseJsonService, BaseXmlService, NotFound, redirector } = require('..') const { renderVersionBadge, renderDownloadBadge, odataToObject, } = require('./nuget-helpers') -const { BaseJsonService, BaseXmlService, NotFound, redirector } = require('..') function createFilter({ packageName, includePrereleases }) { const releaseTypeFilter = includePrereleases diff --git a/services/nuget/nuget-v3-service-family.js b/services/nuget/nuget-v3-service-family.js index 6f8381c041..20ceb04d96 100644 --- a/services/nuget/nuget-v3-service-family.js +++ b/services/nuget/nuget-v3-service-family.js @@ -5,8 +5,8 @@ const Joi = require('@hapi/joi') const semver = require('semver') const { regularUpdate } = require('../../core/legacy/regular-update') const RouteBuilder = require('../route-builder') -const { renderVersionBadge, renderDownloadBadge } = require('./nuget-helpers') const { BaseJsonService, NotFound } = require('..') +const { renderVersionBadge, renderDownloadBadge } = require('./nuget-helpers') /* * Build the Shields service URL object for the given service configuration. Return diff --git a/services/packagist/packagist-license.service.js b/services/packagist/packagist-license.service.js index ba3e3445ef..fcc1350f97 100644 --- a/services/packagist/packagist-license.service.js +++ b/services/packagist/packagist-license.service.js @@ -3,12 +3,12 @@ const Joi = require('@hapi/joi') const { renderLicenseBadge } = require('../licenses') const { optionalUrl } = require('../validators') +const { NotFound } = require('..') const { keywords, BasePackagistService, customServerDocumentationFragment, } = require('./packagist-base') -const { NotFound } = require('..') const packageSchema = Joi.object() .pattern( diff --git a/services/packagist/packagist-license.spec.js b/services/packagist/packagist-license.spec.js index 7f9f6acf7e..315b6cf9e9 100644 --- a/services/packagist/packagist-license.spec.js +++ b/services/packagist/packagist-license.spec.js @@ -1,8 +1,8 @@ 'use strict' const { expect } = require('chai') -const PackagistLicense = require('./packagist-license.service') const { NotFound } = require('..') +const PackagistLicense = require('./packagist-license.service') describe('PackagistLicense', function() { it('should throw NotFound when default branch is missing', function() { diff --git a/services/packagist/packagist-php-version.service.js b/services/packagist/packagist-php-version.service.js index 4caa0c32c0..b775b6d51d 100644 --- a/services/packagist/packagist-php-version.service.js +++ b/services/packagist/packagist-php-version.service.js @@ -2,12 +2,12 @@ const Joi = require('@hapi/joi') const { optionalUrl } = require('../validators') +const { NotFound } = require('..') const { allVersionsSchema, BasePackagistService, customServerDocumentationFragment, } = require('./packagist-base') -const { NotFound } = require('..') const queryParamSchema = Joi.object({ server: optionalUrl, diff --git a/services/packagist/packagist-version.service.js b/services/packagist/packagist-version.service.js index e4c171c0bc..8d4c88e6ab 100644 --- a/services/packagist/packagist-version.service.js +++ b/services/packagist/packagist-version.service.js @@ -4,13 +4,13 @@ const Joi = require('@hapi/joi') const { renderVersionBadge } = require('../version') const { compare, isStable, latest } = require('../php-version') const { optionalUrl } = require('../validators') +const { NotFound, redirector } = require('..') const { allVersionsSchema, keywords, BasePackagistService, customServerDocumentationFragment, } = require('./packagist-base') -const { NotFound, redirector } = require('..') const packageSchema = Joi.object() .pattern( diff --git a/services/puppetforge/puppetforge-module-endorsement.service.js b/services/puppetforge/puppetforge-module-endorsement.service.js index 227e3db8d6..f326d4076f 100644 --- a/services/puppetforge/puppetforge-module-endorsement.service.js +++ b/services/puppetforge/puppetforge-module-endorsement.service.js @@ -1,7 +1,7 @@ 'use strict' -const { BasePuppetForgeModulesService } = require('./puppetforge-base') const { NotFound } = require('..') +const { BasePuppetForgeModulesService } = require('./puppetforge-base') module.exports = class PuppetforgeModuleEndorsement extends BasePuppetForgeModulesService { static get category() { diff --git a/services/puppetforge/puppetforge-module-feedback.service.js b/services/puppetforge/puppetforge-module-feedback.service.js index f42ec9c037..02c9ce383f 100644 --- a/services/puppetforge/puppetforge-module-feedback.service.js +++ b/services/puppetforge/puppetforge-module-feedback.service.js @@ -3,8 +3,8 @@ const { coveragePercentage: coveragePercentageColor, } = require('../color-formatters') -const { BasePuppetForgeModulesService } = require('./puppetforge-base') const { NotFound } = require('..') +const { BasePuppetForgeModulesService } = require('./puppetforge-base') module.exports = class PuppetforgeModuleFeedback extends BasePuppetForgeModulesService { static get category() { diff --git a/services/puppetforge/puppetforge-module-pdk-version.service.js b/services/puppetforge/puppetforge-module-pdk-version.service.js index 6b7aeb4ec2..087b06df0f 100644 --- a/services/puppetforge/puppetforge-module-pdk-version.service.js +++ b/services/puppetforge/puppetforge-module-pdk-version.service.js @@ -1,8 +1,8 @@ 'use strict' const { renderVersionBadge } = require('../version') -const { BasePuppetForgeModulesService } = require('./puppetforge-base') const { NotFound } = require('..') +const { BasePuppetForgeModulesService } = require('./puppetforge-base') module.exports = class PuppetforgeModulePdkVersion extends BasePuppetForgeModulesService { static get category() { diff --git a/services/scrutinizer/scrutinizer-coverage.service.js b/services/scrutinizer/scrutinizer-coverage.service.js index 243549b12f..4ded0fc03f 100644 --- a/services/scrutinizer/scrutinizer-coverage.service.js +++ b/services/scrutinizer/scrutinizer-coverage.service.js @@ -2,8 +2,8 @@ const Joi = require('@hapi/joi') const { colorScale } = require('../color-formatters') -const ScrutinizerBase = require('./scrutinizer-base') const { NotFound } = require('..') +const ScrutinizerBase = require('./scrutinizer-base') const schema = Joi.object({ default_branch: Joi.string().required(), diff --git a/services/scrutinizer/scrutinizer-coverage.spec.js b/services/scrutinizer/scrutinizer-coverage.spec.js index d16d90aef7..1ff20e22b7 100644 --- a/services/scrutinizer/scrutinizer-coverage.spec.js +++ b/services/scrutinizer/scrutinizer-coverage.spec.js @@ -2,8 +2,8 @@ const { expect } = require('chai') const { test, given } = require('sazerac') -const [ScrutinizerCoverage] = require('./scrutinizer-coverage.service') const { InvalidResponse, NotFound } = require('..') +const [ScrutinizerCoverage] = require('./scrutinizer-coverage.service') describe('ScrutinizerCoverage', function() { test(ScrutinizerCoverage.render, () => { diff --git a/services/snyk/snyk-vulnerability-npm.service.js b/services/snyk/snyk-vulnerability-npm.service.js index ae91d92d16..4e8d19dd32 100644 --- a/services/snyk/snyk-vulnerability-npm.service.js +++ b/services/snyk/snyk-vulnerability-npm.service.js @@ -1,7 +1,7 @@ 'use strict' -const SynkVulnerabilityBase = require('./snyk-vulnerability-base') const { NotFound } = require('..') +const SynkVulnerabilityBase = require('./snyk-vulnerability-base') module.exports = class SnykVulnerabilityNpm extends SynkVulnerabilityBase { static get route() { diff --git a/services/sonar/sonar-base.js b/services/sonar/sonar-base.js index 9e9bceb476..2f6dd27237 100644 --- a/services/sonar/sonar-base.js +++ b/services/sonar/sonar-base.js @@ -1,8 +1,8 @@ 'use strict' const Joi = require('@hapi/joi') -const { isLegacyVersion } = require('./sonar-helpers') const { BaseJsonService, NotFound } = require('..') +const { isLegacyVersion } = require('./sonar-helpers') // It is possible to see HTTP 404 response codes and HTTP 200 responses // with empty arrays of metric values, with both the legacy (pre v5.3) and modern APIs. diff --git a/services/stackexchange/stackexchange-monthlyquestions.service.js b/services/stackexchange/stackexchange-monthlyquestions.service.js index c3358fac48..c0d92c1de5 100644 --- a/services/stackexchange/stackexchange-monthlyquestions.service.js +++ b/services/stackexchange/stackexchange-monthlyquestions.service.js @@ -3,8 +3,8 @@ const moment = require('moment') const Joi = require('@hapi/joi') const { nonNegativeInteger } = require('../validators') -const renderQuestionsBadge = require('./stackexchange-helpers') const { BaseJsonService } = require('..') +const renderQuestionsBadge = require('./stackexchange-helpers') const tagSchema = Joi.object({ total: nonNegativeInteger, diff --git a/services/stackexchange/stackexchange-taginfo.service.js b/services/stackexchange/stackexchange-taginfo.service.js index e3dad4c21f..9736e85bff 100644 --- a/services/stackexchange/stackexchange-taginfo.service.js +++ b/services/stackexchange/stackexchange-taginfo.service.js @@ -1,8 +1,8 @@ 'use strict' const Joi = require('@hapi/joi') -const renderQuestionsBadge = require('./stackexchange-helpers') const { BaseJsonService } = require('..') +const renderQuestionsBadge = require('./stackexchange-helpers') const tagSchema = Joi.object({ items: Joi.array() diff --git a/services/steam/steam-workshop.service.js b/services/steam/steam-workshop.service.js index 4f45387c9c..d53598d276 100644 --- a/services/steam/steam-workshop.service.js +++ b/services/steam/steam-workshop.service.js @@ -4,8 +4,8 @@ const Joi = require('@hapi/joi') const prettyBytes = require('pretty-bytes') const { metric, formatDate } = require('../text-formatters') const { age: ageColor, downloadCount } = require('../color-formatters') -const BaseSteamAPI = require('./steam-base') const { NotFound } = require('..') +const BaseSteamAPI = require('./steam-base') const documentation = `

diff --git a/services/symfony/symfony-insight-base.spec.js b/services/symfony/symfony-insight-base.spec.js index 35baa343ee..d7d4af6b4f 100644 --- a/services/symfony/symfony-insight-base.spec.js +++ b/services/symfony/symfony-insight-base.spec.js @@ -1,8 +1,8 @@ 'use strict' const { expect } = require('chai') -const { SymfonyInsightBase } = require('./symfony-insight-base') const { NotFound } = require('..') +const { SymfonyInsightBase } = require('./symfony-insight-base') describe('SymfonyInsightBase', function() { context('transform()', function() { diff --git a/services/teamcity/teamcity-coverage.service.js b/services/teamcity/teamcity-coverage.service.js index 5a0ca8eb40..3d088b4a01 100644 --- a/services/teamcity/teamcity-coverage.service.js +++ b/services/teamcity/teamcity-coverage.service.js @@ -3,8 +3,8 @@ const Joi = require('@hapi/joi') const { coveragePercentage } = require('../color-formatters') const { optionalUrl } = require('../validators') -const TeamCityBase = require('./teamcity-base') const { InvalidResponse } = require('..') +const TeamCityBase = require('./teamcity-base') const buildStatisticsSchema = Joi.object({ property: Joi.array() diff --git a/services/visual-studio-app-center/visual-studio-app-center-builds.service.js b/services/visual-studio-app-center/visual-studio-app-center-builds.service.js index 7592ef676f..0fd6a290b2 100644 --- a/services/visual-studio-app-center/visual-studio-app-center-builds.service.js +++ b/services/visual-studio-app-center/visual-studio-app-center-builds.service.js @@ -2,12 +2,12 @@ const Joi = require('@hapi/joi') const { isBuildStatus, renderBuildStatusBadge } = require('../build-status') +const { NotFound } = require('..') const { BaseVisualStudioAppCenterService, keywords, documentation, } = require('./visual-studio-app-center-base') -const { NotFound } = require('..') const schema = Joi.array().items({ result: isBuildStatus.required(), diff --git a/services/w3c/w3c-validation.service.js b/services/w3c/w3c-validation.service.js index 474f982956..8a467336fd 100644 --- a/services/w3c/w3c-validation.service.js +++ b/services/w3c/w3c-validation.service.js @@ -1,6 +1,7 @@ 'use strict' const Joi = require('@hapi/joi') const { optionalUrl } = require('../validators') +const { BaseJsonService, NotFound } = require('..') const { documentation, presetRegex, @@ -8,7 +9,6 @@ const { getMessage, getSchema, } = require('./w3c-validation-helper') -const { BaseJsonService, NotFound } = require('..') const schema = Joi.object({ url: Joi.string().optional(), diff --git a/services/wordpress/wordpress-downloads.service.js b/services/wordpress/wordpress-downloads.service.js index f931cf41b0..e1edfa0886 100644 --- a/services/wordpress/wordpress-downloads.service.js +++ b/services/wordpress/wordpress-downloads.service.js @@ -3,8 +3,8 @@ const Joi = require('@hapi/joi') const { metric } = require('../text-formatters') const { downloadCount } = require('../color-formatters') -const BaseWordpress = require('./wordpress-base') const { NotFound } = require('..') +const BaseWordpress = require('./wordpress-base') const dateSchema = Joi.object() .pattern(Joi.date().iso(), Joi.number().integer())