chore: import linting (#6105)

.eslintrc.js

@@ -41,6 +41,24 @@ module.exports = {
     'prefer-template': 0,
     'no-underscore-dangle': 0,
 
+    'sort-imports': [
+      'error',
+      {
+        ignoreCase: false,
+        ignoreDeclarationSort: true, // conflicts with our other import ordering rules
+        ignoreMemberSort: false,
+        memberSyntaxSortOrder: ['none', 'all', 'multiple', 'single'],
+      },
+    ],
+    'import/order': [
+      'error',
+      {
+        alphabetize: {
+          order: 'asc',
+        },
+      },
+    ],
+
     // Makes no sense to allow type inferrence for expression parameters, but require typing the response
     '@typescript-eslint/explicit-function-return-type': [
       'error',

lib/config/cli.spec.ts

@@ -1,7 +1,7 @@
+import * as datasourceDocker from '../datasource/docker';
 import * as cli from './cli';
 import getArgv from './config/__fixtures__/argv';
 import { RenovateOptions } from './definitions';
-import * as datasourceDocker from '../datasource/docker';
 
 describe('config/cli', () => {
   let argv: string[];

lib/config/cli.ts

@@ -1,6 +1,6 @@
 import { Command } from 'commander';
-import { getOptions, RenovateOptions } from './definitions';
 import { version } from '../../package.json';
+import { RenovateOptions, getOptions } from './definitions';
 
 export function getCliName(option: Partial<RenovateOptions>): string {
   if (option.cli === false) {

lib/config/common.ts

@@ -1,5 +1,5 @@
-import { Range } from 'semver';
 import { LogLevel } from 'bunyan';
+import { Range } from 'semver';
 import { HostRule } from '../types';
 
 export type RenovateConfigStage =

lib/config/decrypt.ts

@@ -1,5 +1,5 @@
-import is from '@sindresorhus/is';
 import crypto from 'crypto';
+import is from '@sindresorhus/is';
 import { logger } from '../logger';
 import { maskToken } from '../util/mask';
 import { RenovateConfig } from './common';

lib/config/defaults.ts

@@ -1,5 +1,5 @@
-import { getOptions, RenovateOptions } from './definitions';
 import { RenovateConfig } from './common';
+import { RenovateOptions, getOptions } from './definitions';
 
 const defaultValues = {
   boolean: true,

lib/config/definitions.spec.ts

@@ -1,5 +1,5 @@
-import { getOptions } from './definitions';
 import { getName } from '../../test/util';
+import { getOptions } from './definitions';
 
 jest.mock('../manager', () => ({
   getManagers: jest.fn(() => new Map().set('testManager', {})),

lib/config/definitions.ts

@@ -1,12 +1,12 @@
-import { RenovateConfigStage } from './common';
+import { PLATFORM_TYPE_GITHUB } from '../constants/platforms';
+import { getManagers } from '../manager';
+import { getPlatformList } from '../platform';
+import { getVersioningList } from '../versioning';
 import * as dockerVersioning from '../versioning/docker';
 import * as pep440Versioning from '../versioning/pep440';
 import * as semverVersioning from '../versioning/semver';
-import { getVersioningList } from '../versioning';
-import { PLATFORM_TYPE_GITHUB } from '../constants/platforms';
-import { getPlatformList } from '../platform';
 
-import { getManagers } from '../manager';
+import { RenovateConfigStage } from './common';
 
 export interface RenovateOptionBase {
   admin?: boolean;

lib/config/env.spec.ts

@@ -1,9 +1,9 @@
-import * as env from './env';
-import { RenovateOptions } from './definitions';
 import {
   PLATFORM_TYPE_BITBUCKET,
   PLATFORM_TYPE_GITLAB,
 } from '../constants/platforms';
+import { RenovateOptions } from './definitions';
+import * as env from './env';
 
 describe('config/env', () => {
   describe('.getConfig(env)', () => {

lib/config/env.ts

@@ -1,10 +1,10 @@
 import is from '@sindresorhus/is';
 
-import { getOptions, RenovateOptions } from './definitions';
-import { RenovateConfig } from './common';
-import { logger } from '../logger';
-import * as datasourceDocker from '../datasource/docker';
 import { PLATFORM_TYPE_GITHUB } from '../constants/platforms';
+import * as datasourceDocker from '../datasource/docker';
+import { logger } from '../logger';
+import { RenovateConfig } from './common';
+import { RenovateOptions, getOptions } from './definitions';
 
 export function getEnvName(option: Partial<RenovateOptions>): string {
   if (option.env === false) {

lib/config/file.spec.ts

@@ -1,7 +1,7 @@
-import path from 'path';
 import fs from 'fs';
-import * as file from './file';
+import path from 'path';
 import customConfig from './config/__fixtures__/file';
+import * as file from './file';
 
 describe('config/file', () => {
   describe('.getConfig()', () => {

lib/config/file.ts

@@ -1,7 +1,7 @@
 import path from 'path';
 import { logger } from '../logger';
-import { migrateConfig } from './migration';
 import { RenovateConfig } from './common';
+import { migrateConfig } from './migration';
 
 export function getConfig(env: NodeJS.ProcessEnv): RenovateConfig {
   let configFile = env.RENOVATE_CONFIG_FILE || 'config';

lib/config/index.ts

@@ -1,14 +1,14 @@
-import { logger, levels, addStream, setContext } from '../logger';
-import * as definitions from './definitions';
-import * as defaultsParser from './defaults';
-import * as fileParser from './file';
+import { addStream, levels, logger, setContext } from '../logger';
+import { get, getLanguageList, getManagerList } from '../manager';
+import { ensureTrailingSlash } from '../util/url';
 import * as cliParser from './cli';
+import { RenovateConfig, RenovateConfigStage } from './common';
+import * as defaultsParser from './defaults';
+import * as definitions from './definitions';
 import * as envParser from './env';
+import * as fileParser from './file';
 import { resolveConfigPresets } from './presets';
-import { get, getLanguageList, getManagerList } from '../manager';
-import { RenovateConfig, RenovateConfigStage } from './common';
 import { mergeChildConfig } from './utils';
-import { ensureTrailingSlash } from '../util/url';
 
 export * from './common';
 export { mergeChildConfig };

lib/config/massage.ts

@@ -1,6 +1,6 @@
 import is from '@sindresorhus/is';
 import { clone } from '../util/clone';
-import { RenovateConfig, UpdateType, PackageRule } from './common';
+import { PackageRule, RenovateConfig, UpdateType } from './common';
 import { getOptions } from './definitions';
 
 const options = getOptions();

lib/config/migrate-validate.spec.ts

@@ -1,5 +1,5 @@
+import { RenovateConfig, getConfig } from '../../test/util';
 import { migrateAndValidate } from './migrate-validate';
-import { getConfig, RenovateConfig } from '../../test/util';
 
 let config: RenovateConfig;
 beforeEach(() => {

lib/config/migrate-validate.ts

@@ -1,9 +1,9 @@
 import is from '@sindresorhus/is';
 import { logger } from '../logger';
-import * as configMigration from './migration';
+import { RenovateConfig, ValidationMessage } from './common';
 import * as configMassage from './massage';
+import * as configMigration from './migration';
 import * as configValidation from './validation';
-import { RenovateConfig, ValidationMessage } from './common';
 
 export async function migrateAndValidate(
   config: RenovateConfig,

lib/config/migration.spec.ts

@@ -1,7 +1,7 @@
-import * as configMigration from './migration';
-import { getConfig } from './defaults';
-import { RenovateConfig as _RenovateConfig, RenovateSharedConfig } from '.';
 import { PLATFORM_TYPE_GITHUB } from '../constants/platforms';
+import { getConfig } from './defaults';
+import * as configMigration from './migration';
+import { RenovateSharedConfig, RenovateConfig as _RenovateConfig } from '.';
 
 const defaultConfig = getConfig();
 

lib/config/migration.ts

@@ -1,10 +1,10 @@
 import is from '@sindresorhus/is';
 import later from 'later';
 import { logger } from '../logger';
-import { clone } from '../util/clone';
-import { getOptions, RenovateOptions } from './definitions';
-import { RenovateConfig, PackageRule } from './common';
 import { HostRule } from '../types';
+import { clone } from '../util/clone';
+import { PackageRule, RenovateConfig } from './common';
+import { RenovateOptions, getOptions } from './definitions';
 
 const options = getOptions();
 

lib/config/presets/github.spec.ts

@@ -1,11 +1,11 @@
-import { PartialDeep } from 'type-fest';
-import * as github from './github';
-import _got from '../../util/got';
-import * as _hostRules from '../../util/host-rules';
-import { PLATFORM_FAILURE } from '../../constants/error-messages';
 import { mocked } from '../../../test/util';
+import { PLATFORM_FAILURE } from '../../constants/error-messages';
 import { GotResponse } from '../../platform';
 import { clearRepoCache } from '../../util/cache';
+import _got from '../../util/got';
+import * as _hostRules from '../../util/host-rules';
+import * as github from './github';
+import { PartialDeep } from 'type-fest';
 
 jest.mock('../../platform/github/gh-got-wrapper');
 jest.mock('../../util/got');

lib/config/presets/github.ts

@@ -1,9 +1,9 @@
+import { PLATFORM_FAILURE } from '../../constants/error-messages';
+import { PLATFORM_TYPE_GITHUB } from '../../constants/platforms';
 import { logger } from '../../logger';
-import { Preset } from './common';
 import { Http, HttpOptions } from '../../util/http';
-import { PLATFORM_FAILURE } from '../../constants/error-messages';
 import { ensureTrailingSlash } from '../../util/url';
-import { PLATFORM_TYPE_GITHUB } from '../../constants/platforms';
+import { Preset } from './common';
 
 const http = new Http(PLATFORM_TYPE_GITHUB);
 

lib/config/presets/gitlab.spec.ts

@@ -1,7 +1,7 @@
-import { PartialDeep } from 'type-fest';
-import * as gitlab from './gitlab';
-import { api } from '../../platform/gitlab/gl-got-wrapper';
 import { GotResponse } from '../../platform';
+import { api } from '../../platform/gitlab/gl-got-wrapper';
+import * as gitlab from './gitlab';
+import { PartialDeep } from 'type-fest';
 
 jest.mock('../../platform/gitlab/gl-got-wrapper');
 jest.mock('../../util/got');

lib/config/presets/gitlab.ts

@@ -1,7 +1,7 @@
-import { api } from '../../platform/gitlab/gl-got-wrapper';
 import { logger } from '../../logger';
-import { Preset } from './common';
+import { api } from '../../platform/gitlab/gl-got-wrapper';
 import { ensureTrailingSlash } from '../../util/url';
+import { Preset } from './common';
 
 const { get: glGot } = api;
 

lib/config/presets/index.spec.ts

@@ -1,7 +1,7 @@
+import { RenovateConfig } from '..';
+import presetIkatyang from './__fixtures__/renovate-config-ikatyang.json';
 import * as _npm from './npm';
 import * as presets from '.';
-import presetIkatyang from './__fixtures__/renovate-config-ikatyang.json';
-import { RenovateConfig } from '..';
 
 jest.mock('./npm');
 jest.mock('./github');

lib/config/presets/index.ts

@@ -1,21 +1,21 @@
 import is from '@sindresorhus/is';
-import { logger } from '../../logger';
-import * as massage from '../massage';
-import * as migration from '../migration';
-import * as github from './github';
-import * as npm from './npm';
-import * as gitlab from './gitlab';
-import * as local from './local';
-import * as internal from './internal';
-import { RenovateConfig } from '../common';
-import { mergeChildConfig } from '../utils';
-import { regEx } from '../../util/regex';
 import {
   CONFIG_VALIDATION,
   DATASOURCE_FAILURE,
   PLATFORM_FAILURE,
 } from '../../constants/error-messages';
+import { logger } from '../../logger';
+import { regEx } from '../../util/regex';
+import { RenovateConfig } from '../common';
+import * as massage from '../massage';
+import * as migration from '../migration';
+import { mergeChildConfig } from '../utils';
 import { PresetApi } from './common';
+import * as github from './github';
+import * as gitlab from './gitlab';
+import * as internal from './internal';
+import * as local from './local';
+import * as npm from './npm';
 
 const presetSources: Record<string, PresetApi> = {
   github,

lib/config/presets/internal/group.ts

@@ -1,5 +1,5 @@
-import * as monorepos from './monorepo';
 import { Preset } from '../common';
+import * as monorepos from './monorepo';
 
 const staticGroups = {
   all: {

lib/config/presets/internal/index.spec.ts

@@ -1,6 +1,6 @@
-import * as internal from '.';
-import { validateConfig } from '../../validation';
 import { massageConfig } from '../../massage';
+import { validateConfig } from '../../validation';
+import * as internal from '.';
 
 jest.mock('../../../datasource/npm');
 

lib/config/presets/local.spec.ts

@@ -1,5 +1,5 @@
-import * as gitlab from './gitlab';
 import * as github from './github';
+import * as gitlab from './gitlab';
 import * as local from './local';
 
 jest.mock('./gitlab');

lib/config/presets/local.ts

@@ -1,11 +1,11 @@
-import { Preset } from './common';
-import * as gitlab from './gitlab';
-import * as github from './github';
-import { RenovateConfig } from '../common';
 import {
   PLATFORM_TYPE_GITHUB,
   PLATFORM_TYPE_GITLAB,
 } from '../../constants/platforms';
+import { RenovateConfig } from '../common';
+import { Preset } from './common';
+import * as github from './github';
+import * as gitlab from './gitlab';
 
 export async function getPreset(
   pkgName: string,

lib/config/presets/npm.ts

@@ -1,5 +1,5 @@
-import { logger } from '../../logger';
 import { getDependency } from '../../datasource/npm/get';
+import { logger } from '../../logger';
 import { Preset } from './common';
 
 export async function getPreset(

lib/config/utils.ts

@@ -1,6 +1,6 @@
-import { RenovateConfig } from './common';
 import { logger } from '../logger';
 import { clone } from '../util/clone';
+import { RenovateConfig } from './common';
 import * as definitions from './definitions';
 
 export function mergeChildConfig<T, TChild>(

lib/config/validation-helpers/managers.spec.ts

@@ -1,5 +1,5 @@
-import { check } from './managers';
 import { getName } from '../../../test/util';
+import { check } from './managers';
 
 describe(getName(__filename), () => {
   it('should have no errors', () => {

lib/config/validation-helpers/managers.ts

@@ -1,5 +1,5 @@
 import { getManagerList } from '../../manager';
-import { ValidationMessage, PackageRule } from '../common';
+import { PackageRule, ValidationMessage } from '../common';
 
 export interface CheckManagerArgs {
   resolvedRule: PackageRule;

lib/config/validation.ts

@@ -1,11 +1,11 @@
 import is from '@sindresorhus/is';
-import { getOptions, RenovateOptions } from './definitions';
-import { resolveConfigPresets } from './presets';
-import { hasValidSchedule, hasValidTimezone } from '../workers/branch/schedule';
-import * as managerValidator from './validation-helpers/managers';
-import { RenovateConfig, ValidationMessage } from './common';
 import { regEx } from '../util/regex';
 import * as template from '../util/template';
+import { hasValidSchedule, hasValidTimezone } from '../workers/branch/schedule';
+import { RenovateConfig, ValidationMessage } from './common';
+import { RenovateOptions, getOptions } from './definitions';
+import { resolveConfigPresets } from './presets';
+import * as managerValidator from './validation-helpers/managers';
 
 const options = getOptions();
 

lib/datasource/cdnjs/index.spec.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
+import { DATASOURCE_FAILURE } from '../../constants/error-messages';
 import _got from '../../util/got';
 import { getReleases } from '.';
-import { DATASOURCE_FAILURE } from '../../constants/error-messages';
 
 const got: jest.Mock<any> = _got as any;
 jest.mock('../../util/got');