From 11c4741271579c78abd7483fd068987f5fd5af0a Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Mon, 9 Jul 2018 11:14:06 +0200
Subject: [PATCH] refactor: fix import order
---
lib/config/validation.js | 2 +-
lib/datasource/nuget.js | 2 +-
lib/datasource/pypi.js | 2 +-
lib/manager/docker/package.js | 2 +-
lib/manager/npm/extract/locked-versions.js | 2 +-
lib/manager/travis/package.js | 2 +-
lib/platform/github/index.js | 5 +++--
lib/platform/gitlab/index.js | 2 +-
lib/workers/pr/index.js | 2 +-
lib/workers/pr/release-notes.js | 2 +-
lib/workers/repository/updates/generate.js | 2 +-
test/config/decrypt.spec.js | 2 +-
test/datasource/docker.spec.js | 2 +-
test/datasource/npm.spec.js | 2 +-
test/datasource/nuget.spec.js | 2 +-
test/datasource/packagist.spec.js | 2 +-
test/datasource/pypi.spec.js | 2 +-
test/logger/pretty-stdout.spec.js | 2 +-
test/manager/bazel/update.spec.js | 2 +-
test/manager/npm/update.spec.js | 2 +-
test/platform/github/gh-got-wrapper.spec.js | 2 +-
test/platform/gitlab/gl-got-wrapper.spec.js | 2 +-
test/workers/branch/lock-files/lerna.spec.js | 3 +--
test/workers/branch/lock-files/npm.spec.js | 3 +--
test/workers/branch/lock-files/pnpm.spec.js | 3 +--
test/workers/branch/lock-files/yarn.spec.js | 3 +--
test/workers/repository/init/apis.spec.js | 3 +--
27 files changed, 29 insertions(+), 33 deletions(-)
diff --git a/lib/config/validation.js b/lib/config/validation.js
index c01b2468d3..678d43e769 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 39aae0e989..837ddecc06 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 1da959da2d..8c1a3bab90 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 02fc783e5c..b452d14be2 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 e6da65290b..32921c1823 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 70218f9651..fbd758798d 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 3955ba03a6..53d8f1b917 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 21f1dd769e..d299f395e6 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 0d2aaabe0b..15c1af0e7f 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 06be88e010..ac279d3640 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 eb3d38ec36..7f6bccfb8b 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 0040dd207e..ffb009e22d 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 deb3bfb51f..ac96041d1e 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 cef89e65aa..a164b805cb 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 9c3571d2de..d9ebe9443f 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 991c8975b3..f7a595d5b4 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 bc2d62c51c..d61a953c0e 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 0a3f7e8b07..41f350b5b3 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 db1d66d77c..921acbb71d 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 dd1b990d40..1d5b86e046 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 44280b5a3c..4d883f005f 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 962a9b7e7b..c826603e4b 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 576e39d9fe..0d00f5f89f 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 4cc4121b30..3b405bf144 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 3791c0ad17..aca930976e 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 2a25f2a5db..ce44c45953 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 4857b03f42..4edfaa3899 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');
--
GitLab