diff --git a/lib/config/validation.js b/lib/config/validation.js index c01b2468d3629eb57ac274f12010479ed6097226..678d43e7697176437430be2297511b9a1e4bf377 100644 --- a/lib/config/validation.js +++ b/lib/config/validation.js @@ -1,11 +1,11 @@ const is = require('@sindresorhus/is'); +const safe = require('safe-regex'); const options = require('./definitions').getOptions(); const { resolveConfigPresets } = require('./presets'); const { hasValidSchedule, hasValidTimezone, } = require('../workers/branch/schedule'); -const safe = require('safe-regex'); let optionTypes; diff --git a/lib/datasource/nuget.js b/lib/datasource/nuget.js index 39aae0e98993c2752b70e70d64093257a4feba7a..837ddecc069d4581e2fbf816bc31aee89c359e27 100644 --- a/lib/datasource/nuget.js +++ b/lib/datasource/nuget.js @@ -1,7 +1,7 @@ +const parse = require('github-url-from-git'); const got = require('got'); const xmlParser = require('fast-xml-parser'); const { isVersion, sortVersions } = require('../versioning/semver'); -const parse = require('github-url-from-git'); module.exports = { getDependency, diff --git a/lib/datasource/pypi.js b/lib/datasource/pypi.js index 1da959da2d6997a264fd45f5b047a36cd6a578cc..8c1a3bab9093c4b720f7db7df1f000624792a036 100644 --- a/lib/datasource/pypi.js +++ b/lib/datasource/pypi.js @@ -1,7 +1,7 @@ const got = require('got'); -const { isVersion, sortVersions } = require('../versioning')('pep440'); const url = require('url'); const is = require('@sindresorhus/is'); +const { isVersion, sortVersions } = require('../versioning')('pep440'); module.exports = { getDependency, diff --git a/lib/manager/docker/package.js b/lib/manager/docker/package.js index 02fc783e5c533aa7d7e26f0bfb54bda93122ef70..b452d14be238cc18cb4df5c000a19e91e99ab172 100644 --- a/lib/manager/docker/package.js +++ b/lib/manager/docker/package.js @@ -1,6 +1,6 @@ +const compareVersions = require('compare-versions'); const versioning = require('../../versioning'); const dockerApi = require('../../datasource/docker'); -const compareVersions = require('compare-versions'); module.exports = { isStable, diff --git a/lib/manager/npm/extract/locked-versions.js b/lib/manager/npm/extract/locked-versions.js index e6da65290b7203e9cc5553ac4a41724556ac45ec..32921c182398efe7a2144b07140bd75e81057c63 100644 --- a/lib/manager/npm/extract/locked-versions.js +++ b/lib/manager/npm/extract/locked-versions.js @@ -1,6 +1,6 @@ +const { valid } = require('semver'); const { getNpmLock } = require('./npm'); const { getYarnLock } = require('./yarn'); -const { valid } = require('semver'); module.exports = { getLockedVersions, diff --git a/lib/manager/travis/package.js b/lib/manager/travis/package.js index 70218f96513d39f3aa0c794c38400624536e4bb6..fbd758798db1108e71ba444c75e58028ea7a09f5 100644 --- a/lib/manager/travis/package.js +++ b/lib/manager/travis/package.js @@ -1,7 +1,7 @@ +const is = require('@sindresorhus/is'); const { isEqual } = require('lodash'); const { getDependency } = require('../../datasource'); const versioning = require('../../versioning'); -const is = require('@sindresorhus/is'); const { isVersion, maxSatisfyingVersion } = versioning('semver'); diff --git a/lib/platform/github/index.js b/lib/platform/github/index.js index 3955ba03a6cad4b543aae8dedfac491be6309e82..53d8f1b9178237bb985f89d8f7db4a2ddd107085 100644 --- a/lib/platform/github/index.js +++ b/lib/platform/github/index.js @@ -1,10 +1,10 @@ const is = require('@sindresorhus/is'); -const get = require('./gh-got-wrapper'); const addrs = require('email-addresses'); const moment = require('moment'); const openpgp = require('openpgp'); const delay = require('delay'); const path = require('path'); +const get = require('./gh-got-wrapper'); const endpoints = require('../../util/endpoints'); let config = {}; @@ -1134,7 +1134,8 @@ async function getFile(filePath, branchName) { // If file not found, then return null JSON logger.info({ filePath, branchName }, 'getFile 404'); return null; - } else if ( + } + if ( error.statusCode === 403 && error.message && error.message.startsWith('This API returns blobs up to 1 MB in size') diff --git a/lib/platform/gitlab/index.js b/lib/platform/gitlab/index.js index 21f1dd769effefd81a85f7e293af56bf93b88517..d299f395e6b28ccdab92178d87788aeef469b250 100644 --- a/lib/platform/gitlab/index.js +++ b/lib/platform/gitlab/index.js @@ -1,6 +1,6 @@ const is = require('@sindresorhus/is'); -const get = require('./gl-got-wrapper'); const addrs = require('email-addresses'); +const get = require('./gl-got-wrapper'); const endpoints = require('../../util/endpoints'); let config = {}; diff --git a/lib/workers/pr/index.js b/lib/workers/pr/index.js index 0d2aaabe0ba64d63b615617b33f761dadd6edcb5..15c1af0e7ff4825d8dae03cd79dbf198297825c1 100644 --- a/lib/workers/pr/index.js +++ b/lib/workers/pr/index.js @@ -1,6 +1,6 @@ const handlebars = require('handlebars'); -const changelogHelper = require('./changelog'); const showdown = require('showdown'); +const changelogHelper = require('./changelog'); const converter = new showdown.Converter(); converter.setFlavor('github'); diff --git a/lib/workers/pr/release-notes.js b/lib/workers/pr/release-notes.js index 06be88e0109077488ac27151dbf1090579e8ce3e..ac279d364003247a49ea931c8c0872ecfd71a4a7 100644 --- a/lib/workers/pr/release-notes.js +++ b/lib/workers/pr/release-notes.js @@ -1,6 +1,6 @@ -const ghGot = require('../../platform/github/gh-got-wrapper'); const changelogFilenameRegex = require('changelog-filename-regex'); const MarkdownIt = require('markdown-it'); +const ghGot = require('../../platform/github/gh-got-wrapper'); const markdown = new MarkdownIt('zero'); markdown.enable(['heading', 'lheading']); diff --git a/lib/workers/repository/updates/generate.js b/lib/workers/repository/updates/generate.js index eb3d38ec36ac77f355984bec41f017cc27c0e148..7f6bccfb8b03b5eb8934f5d78c15c57a562c5fd2 100644 --- a/lib/workers/repository/updates/generate.js +++ b/lib/workers/repository/updates/generate.js @@ -1,7 +1,7 @@ const handlebars = require('handlebars'); +const { DateTime } = require('luxon'); const semver = require('semver'); const { mergeChildConfig } = require('../../../config'); -const { DateTime } = require('luxon'); function generateBranchConfig(branchUpgrades) { logger.debug(`generateBranchConfig(${branchUpgrades.length})`); diff --git a/test/config/decrypt.spec.js b/test/config/decrypt.spec.js index 0040dd207e4201dc49292d19ef105de6692c6228..ffb009e22ddcc24b49c28b6952d9f830b9707d10 100644 --- a/test/config/decrypt.spec.js +++ b/test/config/decrypt.spec.js @@ -1,5 +1,5 @@ -const { decryptConfig } = require('../../lib/config/decrypt.js'); const fs = require('fs'); +const { decryptConfig } = require('../../lib/config/decrypt.js'); const privateKey = fs.readFileSync('test/_fixtures/keys/private.pem'); diff --git a/test/datasource/docker.spec.js b/test/datasource/docker.spec.js index deb3bfb51fee7908c7e08e2506b71924ae372131..ac96041d1e0ae5eee25933d94e69206689d9c46a 100644 --- a/test/datasource/docker.spec.js +++ b/test/datasource/docker.spec.js @@ -1,5 +1,5 @@ -const docker = require('../../lib/datasource/docker'); const got = require('got'); +const docker = require('../../lib/datasource/docker'); jest.mock('got'); diff --git a/test/datasource/npm.spec.js b/test/datasource/npm.spec.js index cef89e65aa2dfd281c34f10702801e255652fa70..a164b805cb96dbe717cd95cf1db3e74bc79b8994 100644 --- a/test/datasource/npm.spec.js +++ b/test/datasource/npm.spec.js @@ -1,7 +1,7 @@ -const npm = require('../../lib/datasource/npm'); const registryAuthToken = require('registry-auth-token'); const nock = require('nock'); const moment = require('moment'); +const npm = require('../../lib/datasource/npm'); jest.mock('registry-auth-token'); jest.mock('delay'); diff --git a/test/datasource/nuget.spec.js b/test/datasource/nuget.spec.js index 9c3571d2de49c206afccceb2788b4c011b65fdd9..d9ebe9443f0a7145116f749f0780f6e354f40ba9 100644 --- a/test/datasource/nuget.spec.js +++ b/test/datasource/nuget.spec.js @@ -1,6 +1,6 @@ const fs = require('fs'); -const datasource = require('../../lib/datasource'); const got = require('got'); +const datasource = require('../../lib/datasource'); jest.mock('got'); diff --git a/test/datasource/packagist.spec.js b/test/datasource/packagist.spec.js index 991c8975b37e0827da951b7b46545dc583973a22..f7a595d5b462513c88252f22e371e1a3da324d74 100644 --- a/test/datasource/packagist.spec.js +++ b/test/datasource/packagist.spec.js @@ -1,6 +1,6 @@ const fs = require('fs'); -const datasource = require('../../lib/datasource'); const got = require('got'); +const datasource = require('../../lib/datasource'); jest.mock('got'); diff --git a/test/datasource/pypi.spec.js b/test/datasource/pypi.spec.js index bc2d62c51c873ca8a24a3796551d1e4cd4fa764b..d61a953c0e557ceda3cf247061407f4dc541a8d5 100644 --- a/test/datasource/pypi.spec.js +++ b/test/datasource/pypi.spec.js @@ -1,6 +1,6 @@ const fs = require('fs'); -const datasource = require('../../lib/datasource'); const got = require('got'); +const datasource = require('../../lib/datasource'); jest.mock('got'); diff --git a/test/logger/pretty-stdout.spec.js b/test/logger/pretty-stdout.spec.js index 0a3f7e8b0774c7772ec4889d69d431fdbef62e1b..41f350b5b33a8b5661f1b1829dbac1b763074742 100644 --- a/test/logger/pretty-stdout.spec.js +++ b/test/logger/pretty-stdout.spec.js @@ -1,5 +1,5 @@ -const prettyStdout = require('../../lib/logger/pretty-stdout'); const chalk = require('chalk'); +const prettyStdout = require('../../lib/logger/pretty-stdout'); describe('logger/pretty-stdout', () => { describe('getMeta(rec)', () => { diff --git a/test/manager/bazel/update.spec.js b/test/manager/bazel/update.spec.js index db1d66d77ca66916ccd3036b6a31b0f830985231..921acbb71d4848b25d920a80430f65f9e74d7b51 100644 --- a/test/manager/bazel/update.spec.js +++ b/test/manager/bazel/update.spec.js @@ -1,7 +1,7 @@ const fs = require('fs'); const path = require('path'); -const bazelfile = require('../../../lib/manager/bazel/update'); const got = require('got'); +const bazelfile = require('../../../lib/manager/bazel/update'); jest.mock('got'); diff --git a/test/manager/npm/update.spec.js b/test/manager/npm/update.spec.js index dd1b990d407e94e97a8795de3929dea3ffcc0583..1d5b86e0462a82e250b74486da385ee6ecacd0dd 100644 --- a/test/manager/npm/update.spec.js +++ b/test/manager/npm/update.spec.js @@ -1,7 +1,7 @@ const fs = require('fs'); const path = require('path'); -const npmUpdater = require('../../../lib/manager/npm/update'); const semver = require('semver'); +const npmUpdater = require('../../../lib/manager/npm/update'); function readFixture(fixture) { return fs.readFileSync( diff --git a/test/platform/github/gh-got-wrapper.spec.js b/test/platform/github/gh-got-wrapper.spec.js index 44280b5a3cbece636634757376d117371ce27a77..4d883f005f0a5efa6f2410b1858d175e8d68f80b 100644 --- a/test/platform/github/gh-got-wrapper.spec.js +++ b/test/platform/github/gh-got-wrapper.spec.js @@ -1,6 +1,6 @@ -const get = require('../../../lib/platform/github/gh-got-wrapper'); const ghGot = require('gh-got'); const delay = require('delay'); +const get = require('../../../lib/platform/github/gh-got-wrapper'); jest.mock('gh-got'); jest.mock('delay'); diff --git a/test/platform/gitlab/gl-got-wrapper.spec.js b/test/platform/gitlab/gl-got-wrapper.spec.js index 962a9b7e7bfafca7b8d0ff9113d74b14d0489929..c826603e4b4787331e3a4aea87540b91ef9c8480 100644 --- a/test/platform/gitlab/gl-got-wrapper.spec.js +++ b/test/platform/gitlab/gl-got-wrapper.spec.js @@ -1,5 +1,5 @@ -const get = require('../../../lib/platform/gitlab/gl-got-wrapper'); const glGot = require('gl-got'); +const get = require('../../../lib/platform/gitlab/gl-got-wrapper'); describe('platform/gl-got-wrapper', () => { const body = ['a', 'b']; diff --git a/test/workers/branch/lock-files/lerna.spec.js b/test/workers/branch/lock-files/lerna.spec.js index 576e39d9feb87f01aabb84f50e4b96dc18ced80b..0d00f5f89f36bd360fd1306a222851adcfb873cc 100644 --- a/test/workers/branch/lock-files/lerna.spec.js +++ b/test/workers/branch/lock-files/lerna.spec.js @@ -1,9 +1,8 @@ +const { exec } = require('child-process-promise'); const lernaHelper = require('../../../../lib/manager/npm/post-update/lerna'); jest.mock('child-process-promise'); -const { exec } = require('child-process-promise'); - describe('generateLockFiles()', () => { it('returns if no lernaClient', async () => { const res = await lernaHelper.generateLockFiles(undefined, 'some-dir', {}); diff --git a/test/workers/branch/lock-files/npm.spec.js b/test/workers/branch/lock-files/npm.spec.js index 4cc4121b309ce54de08f4ccf43481159f7d60c1a..3b405bf14433c328976decd249ecde571afcd38d 100644 --- a/test/workers/branch/lock-files/npm.spec.js +++ b/test/workers/branch/lock-files/npm.spec.js @@ -1,5 +1,3 @@ -const npmHelper = require('../../../../lib/manager/npm/post-update/npm'); - const { getInstalledPath } = require('get-installed-path'); jest.mock('fs-extra'); @@ -10,6 +8,7 @@ getInstalledPath.mockImplementation(() => null); const fs = require('fs-extra'); const { exec } = require('child-process-promise'); +const npmHelper = require('../../../../lib/manager/npm/post-update/npm'); describe('generateLockFile', () => { it('generates lock files', async () => { diff --git a/test/workers/branch/lock-files/pnpm.spec.js b/test/workers/branch/lock-files/pnpm.spec.js index 3791c0ad17ba786613f2a34046676d87ed2dcaac..aca930976edb4a2617098ce7284d7c43b199e1c2 100644 --- a/test/workers/branch/lock-files/pnpm.spec.js +++ b/test/workers/branch/lock-files/pnpm.spec.js @@ -1,5 +1,3 @@ -const pnpmHelper = require('../../../../lib/manager/npm/post-update/pnpm'); - const { getInstalledPath } = require('get-installed-path'); jest.mock('fs-extra'); @@ -10,6 +8,7 @@ getInstalledPath.mockImplementation(() => null); const fs = require('fs-extra'); const { exec } = require('child-process-promise'); +const pnpmHelper = require('../../../../lib/manager/npm/post-update/pnpm'); describe('generateLockFile', () => { it('generates lock files', async () => { diff --git a/test/workers/branch/lock-files/yarn.spec.js b/test/workers/branch/lock-files/yarn.spec.js index 2a25f2a5dba35f17e78efe10f9fe65a7c437b1ef..ce44c4595339ae465d22074330e6d2055724e765 100644 --- a/test/workers/branch/lock-files/yarn.spec.js +++ b/test/workers/branch/lock-files/yarn.spec.js @@ -1,5 +1,3 @@ -const yarnHelper = require('../../../../lib/manager/npm/post-update/yarn'); - const { getInstalledPath } = require('get-installed-path'); jest.mock('fs-extra'); @@ -10,6 +8,7 @@ getInstalledPath.mockImplementation(() => null); const fs = require('fs-extra'); const { exec } = require('child-process-promise'); +const yarnHelper = require('../../../../lib/manager/npm/post-update/yarn'); describe('generateLockFile', () => { it('generates lock files', async () => { diff --git a/test/workers/repository/init/apis.spec.js b/test/workers/repository/init/apis.spec.js index 4857b03f429ba93515be8feeff3f813fd2b12c24..4edfaa38993f37420298cdac39da758720316468 100644 --- a/test/workers/repository/init/apis.spec.js +++ b/test/workers/repository/init/apis.spec.js @@ -1,6 +1,5 @@ -const { initApis } = require('../../../../lib/workers/repository/init/apis'); - const glGot = require('gl-got'); +const { initApis } = require('../../../../lib/workers/repository/init/apis'); jest.mock('../../../../lib/platform/github');