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 * as cliParser from './cli';
-import * as envParser from './env';
-import { resolveConfigPresets } from './presets';
+import { addStream, levels, logger, setContext } from '../logger';
 import { get, getLanguageList, getManagerList } from '../manager';
-import { RenovateConfig, RenovateConfigStage } from './common';
-import { mergeChildConfig } from './utils';
 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 { mergeChildConfig } from './utils';
 
 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 * as configMassage from './massage';
-import * as configValidation from './validation';
 import { RenovateConfig, ValidationMessage } from './common';
+import * as configMassage from './massage';
+import * as configMigration from './migration';
+import * as configValidation from './validation';
 
 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 { 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 { logger } from '../../logger';
+import { Http, HttpOptions } from '../../util/http';
+import { ensureTrailingSlash } from '../../util/url';
+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');

lib/datasource/cdnjs/index.ts

@@ -1,7 +1,7 @@
 import { logger } from '../../logger';
 import { Http } from '../../util/http';
-import { DatasourceError, ReleaseResult, GetReleasesConfig } from '../common';
-import { cacheAble, CachePromise } from '../cache';
+import { CachePromise, cacheAble } from '../cache';
+import { DatasourceError, GetReleasesConfig, ReleaseResult } from '../common';
 
 export const id = 'cdnjs';
 

lib/datasource/crate/index.ts

@@ -3,8 +3,8 @@ import { Http } from '../../util/http';
 import {
   DatasourceError,
   GetReleasesConfig,
-  ReleaseResult,
   Release,
+  ReleaseResult,
 } from '../common';
 
 export const id = 'crate';

lib/datasource/dart/index.ts

@@ -1,6 +1,6 @@
-import { Http, HttpResponse } from '../../util/http';
 import { logger } from '../../logger';
-import { DatasourceError, ReleaseResult, GetReleasesConfig } from '../common';
+import { Http, HttpResponse } from '../../util/http';
+import { DatasourceError, GetReleasesConfig, ReleaseResult } from '../common';
 
 export const id = 'dart';
 

lib/datasource/docker/index.spec.ts

@@ -1,11 +1,11 @@
-import AWSMock from 'aws-sdk-mock';
 import AWS from 'aws-sdk';
-import _got from '../../util/got';
-import * as docker from '.';
+import AWSMock from 'aws-sdk-mock';
 import { getPkgReleases } from '..';
-import * as _hostRules from '../../util/host-rules';
 import { DATASOURCE_FAILURE } from '../../constants/error-messages';
 import { clearRepoCache } from '../../util/cache';
+import _got from '../../util/got';
+import * as _hostRules from '../../util/host-rules';
+import * as docker from '.';
 
 const got: any = _got;
 const hostRules: any = _hostRules;

lib/datasource/docker/index.ts

@@ -1,15 +1,15 @@
-import is from '@sindresorhus/is';
-import hasha from 'hasha';
+import { OutgoingHttpHeaders } from 'http';
 import URL from 'url';
+import is from '@sindresorhus/is';
+import AWS from 'aws-sdk';
+import hasha from 'hasha';
 import parseLinkHeader from 'parse-link-header';
 import wwwAuthenticate from 'www-authenticate';
-import { OutgoingHttpHeaders } from 'http';
-import AWS from 'aws-sdk';
 import { logger } from '../../logger';
-import { Http, HttpResponse } from '../../util/http';
-import * as hostRules from '../../util/host-rules';
-import { DatasourceError, GetReleasesConfig, ReleaseResult } from '../common';
 import { HostRule } from '../../types';
+import * as hostRules from '../../util/host-rules';
+import { Http, HttpResponse } from '../../util/http';
+import { DatasourceError, GetReleasesConfig, ReleaseResult } from '../common';
 
 // TODO: add got typings when available
 // TODO: replace www-authenticate with https://www.npmjs.com/package/auth-header ?

lib/datasource/galaxy/index.ts

@@ -3,8 +3,8 @@ import { Http } from '../../util/http';
 import {
   DatasourceError,
   GetReleasesConfig,
-  ReleaseResult,
   Release,
+  ReleaseResult,
 } from '../common';
 
 export const id = 'galaxy';

lib/datasource/git-refs/index.ts

@@ -1,7 +1,7 @@
 import simpleGit from 'simple-git/promise';
-import * as semver from '../../versioning/semver';
 import { logger } from '../../logger';
-import { ReleaseResult, GetReleasesConfig } from '../common';
+import * as semver from '../../versioning/semver';
+import { GetReleasesConfig, ReleaseResult } from '../common';
 
 export const id = 'git-refs';
 

lib/datasource/git-submodules/index.spec.ts

@@ -1,5 +1,5 @@
 import _simpleGit from 'simple-git/promise';
-import { getReleases, getDigest } from '.';
+import { getDigest, getReleases } from '.';
 
 jest.mock('simple-git/promise');
 const simpleGit: any = _simpleGit;

lib/datasource/git-submodules/index.ts

@@ -1,8 +1,8 @@
-import Git from 'simple-git/promise';
 import { URL } from 'url';
+import Git from 'simple-git/promise';
 
-import { ReleaseResult, GetReleasesConfig, DigestConfig } from '../common';
 import { logger } from '../../logger';
+import { DigestConfig, GetReleasesConfig, ReleaseResult } from '../common';
 
 export const id = 'git-submodules';
 

lib/datasource/git-tags/index.ts

@@ -1,5 +1,5 @@
-import { ReleaseResult, GetReleasesConfig } from '../common';
 import * as semver from '../../versioning/semver';
+import { GetReleasesConfig, ReleaseResult } from '../common';
 import * as gitRefs from '../git-refs';
 
 export const id = 'git-tags';

lib/datasource/github-releases/index.ts

@@ -1,6 +1,6 @@
-import { api } from '../../platform/github/gh-got-wrapper';
-import { ReleaseResult, GetReleasesConfig } from '../common';
 import { logger } from '../../logger';
+import { api } from '../../platform/github/gh-got-wrapper';
+import { GetReleasesConfig, ReleaseResult } from '../common';
 
 const { get: ghGot } = api;
 

lib/datasource/github-tags/index.spec.ts

@@ -1,7 +1,7 @@
 import { api } from '../../platform/github/gh-got-wrapper';
 
-import * as github from '.';
 import * as _hostRules from '../../util/host-rules';
+import * as github from '.';
 
 jest.mock('../../platform/github/gh-got-wrapper');
 jest.mock('../../util/got');

lib/datasource/github-tags/index.ts

@@ -1,6 +1,6 @@
-import { api } from '../../platform/github/gh-got-wrapper';
-import { ReleaseResult, GetReleasesConfig, DigestConfig } from '../common';
 import { logger } from '../../logger';
+import { api } from '../../platform/github/gh-got-wrapper';
+import { DigestConfig, GetReleasesConfig, ReleaseResult } from '../common';
 
 const { get: ghGot } = api;
 

lib/datasource/gitlab-tags/index.spec.ts

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

lib/datasource/gitlab-tags/index.ts

@@ -1,6 +1,6 @@
 import is from '@sindresorhus/is';
-import { api } from '../../platform/gitlab/gl-got-wrapper';
 import { logger } from '../../logger';
+import { api } from '../../platform/gitlab/gl-got-wrapper';
 import { GetReleasesConfig, ReleaseResult } from '../common';
 
 const { get: glGot } = api;

lib/datasource/go/index.spec.ts

@@ -1,8 +1,8 @@
+import { ReleaseResult } from '..';
+import { mocked, partial } from '../../../test/util';
 import _got from '../../util/got';
 import * as _github from '../github-tags';
 import * as go from '.';
-import { mocked, partial } from '../../../test/util';
-import { ReleaseResult } from '..';
 
 jest.mock('../../util/got');
 jest.mock('../github-tags');

lib/datasource/go/index.ts

@@ -1,8 +1,8 @@
 import { logger } from '../../logger';
 import { Http } from '../../util/http';
-import * as github from '../github-tags';
-import { DigestConfig, GetReleasesConfig, ReleaseResult } from '../common';
 import { regEx } from '../../util/regex';
+import { DigestConfig, GetReleasesConfig, ReleaseResult } from '../common';
+import * as github from '../github-tags';
 
 export const id = 'go';
 

lib/datasource/gradle-version/index.ts

@@ -1,12 +1,12 @@
 import is from '@sindresorhus/is';
-import { regEx } from '../../util/regex';
 import { logger } from '../../logger';
 import { Http } from '../../util/http';
+import { regEx } from '../../util/regex';
 import {
   DatasourceError,
   GetReleasesConfig,
-  ReleaseResult,
   Release,
+  ReleaseResult,
 } from '../common';
 
 export const id = 'gradle-version';

lib/datasource/helm/index.ts

@@ -1,8 +1,8 @@
 import yaml from 'js-yaml';
 
-import { DatasourceError, GetReleasesConfig, ReleaseResult } from '../common';
-import { Http } from '../../util/http';
 import { logger } from '../../logger';
+import { Http } from '../../util/http';
+import { DatasourceError, GetReleasesConfig, ReleaseResult } from '../common';
 
 export const id = 'helm';
 

lib/datasource/hex/index.spec.ts

@@ -1,8 +1,8 @@
 import fs from 'fs';
+import { DATASOURCE_FAILURE } from '../../constants/error-messages';
 import _got from '../../util/got';
 import * as _hostRules from '../../util/host-rules';
 import { getReleases } from '.';
-import { DATASOURCE_FAILURE } from '../../constants/error-messages';
 
 const got: any = _got;
 const hostRules: any = _hostRules;

lib/datasource/hex/index.ts

@@ -1,6 +1,6 @@
 import { logger } from '../../logger';
 import { Http } from '../../util/http';
-import { DatasourceError, ReleaseResult, GetReleasesConfig } from '../common';
+import { DatasourceError, GetReleasesConfig, ReleaseResult } from '../common';
 
 export const id = 'hex';
 

lib/datasource/index.spec.ts

@@ -1,10 +1,9 @@
-import * as datasource from '.';
-
+import { mocked } from '../../test/util';
+import { loadModules } from '../util/modules';
 import * as datasourceDocker from './docker';
 import * as datasourceGithubTags from './github-tags';
 import * as datasourceNpm from './npm';
-import { mocked } from '../../test/util';
-import { loadModules } from '../util/modules';
+import * as datasource from '.';
 
 jest.mock('./docker');
 jest.mock('./npm');

lib/datasource/index.ts

@@ -1,20 +1,19 @@
 import is from '@sindresorhus/is';
 import { logger } from '../logger';
-import { addMetaData } from './metadata';
+import { getRepoCached, setRepoCached } from '../util/cache';
+import { clone } from '../util/clone';
 import * as allVersioning from '../versioning';
-
+import datasources from './api.generated';
 import {
   Datasource,
   DatasourceError,
+  DigestConfig,
+  GetPkgReleasesConfig,
+  GetReleasesConfig,
   Release,
   ReleaseResult,
-  DigestConfig,
-  GetReleasesConfig,
-  GetPkgReleasesConfig,
 } from './common';
-import datasources from './api.generated';
-import { clone } from '../util/clone';
-import { getRepoCached, setRepoCached } from '../util/cache';
+import { addMetaData } from './metadata';
 
 export * from './common';
 

lib/datasource/maven/index.spec.ts

@@ -1,11 +1,11 @@
-import nock from 'nock';
 import fs from 'fs';
 import { resolve } from 'path';
-import * as maven from '.';
-import * as mavenVersioning from '../../versioning/maven';
+import nock from 'nock';
 import { getPkgReleases } from '..';
 import { DATASOURCE_FAILURE } from '../../constants/error-messages';
 import * as hostRules from '../../util/host-rules';
+import * as mavenVersioning from '../../versioning/maven';
+import * as maven from '.';
 
 const MYSQL_VERSIONS = ['6.0.5', '6.0.6', '8.0.7', '8.0.8', '8.0.9'];
 

lib/datasource/maven/index.ts

@@ -1,13 +1,13 @@
 import url from 'url';
 import fs from 'fs-extra';
-import { XmlDocument } from 'xmldoc';
 import pAll from 'p-all';
+import { XmlDocument } from 'xmldoc';
 import { logger } from '../../logger';
-import { compare } from '../../versioning/maven/compare';
 import mavenVersion from '../../versioning/maven';
-import { downloadHttpProtocol, isHttpResourceExists } from './util';
+import { compare } from '../../versioning/maven/compare';
 import { GetReleasesConfig, ReleaseResult } from '../common';
 import { MAVEN_REPO } from './common';
+import { downloadHttpProtocol, isHttpResourceExists } from './util';
 
 export { id } from './common';
 

lib/datasource/maven/util.ts

@@ -1,9 +1,9 @@
 import url from 'url';
-import { Http } from '../../util/http';
 import { logger } from '../../logger';
+import { Http } from '../../util/http';
 import { DatasourceError } from '../common';
 
-import { id, MAVEN_REPO } from './common';
+import { MAVEN_REPO, id } from './common';
 
 const http: Record<string, Http> = {};
 

lib/datasource/metadata.spec.ts

@@ -1,5 +1,5 @@
-import { addMetaData } from './metadata';
 import * as datasourceMaven from './maven';
+import { addMetaData } from './metadata';
 import * as datasourcePypi from './pypi';
 
 describe('datasource/metadata', () => {

lib/datasource/metadata.ts

@@ -1,7 +1,7 @@
 import is from '@sindresorhus/is';
 import parse from 'github-url-from-git';
-import { ReleaseResult } from './common';
 import * as hostRules from '../util/host-rules';
+import { ReleaseResult } from './common';
 
 // Use this object to define changelog URLs for packages
 // Only necessary when the changelog data cannot be found in the package's source repository

lib/datasource/npm/get.spec.ts

@@ -1,9 +1,9 @@
 import got from 'got';
 import { getName, partial } from '../../../test/util';
-import { getDependency, resetMemCache } from './get';
-import { setNpmrc } from './npmrc';
 import * as _got from '../../util/got';
 import { DatasourceError } from '../common';
+import { getDependency, resetMemCache } from './get';
+import { setNpmrc } from './npmrc';
 
 jest.mock('../../util/got');
 

lib/datasource/npm/get.ts

@@ -1,17 +1,17 @@
+import { OutgoingHttpHeaders } from 'http';
+import url from 'url';
+import is from '@sindresorhus/is';
 import delay from 'delay';
 import moment from 'moment';
-import url from 'url';
-import getRegistryUrl from 'registry-auth-token/registry-url';
 import registryAuthToken from 'registry-auth-token';
-import { OutgoingHttpHeaders } from 'http';
-import is from '@sindresorhus/is';
+import getRegistryUrl from 'registry-auth-token/registry-url';
 import { logger } from '../../logger';
 import { find } from '../../util/host-rules';
 import { Http, HttpOptions } from '../../util/http';
 import { maskToken } from '../../util/mask';
-import { getNpmrc } from './npmrc';
 import { DatasourceError, Release, ReleaseResult } from '../common';
 import { id } from './common';
+import { getNpmrc } from './npmrc';
 
 const http = new Http(id);
 

lib/datasource/npm/index.spec.ts

@@ -1,11 +1,11 @@
-import _registryAuthToken from 'registry-auth-token';
-import nock from 'nock';
 import moment from 'moment';
-import * as npm from '.';
-import * as hostRules from '../../util/host-rules';
-import { DATASOURCE_FAILURE } from '../../constants/error-messages';
+import nock from 'nock';
+import _registryAuthToken from 'registry-auth-token';
 import { getName } from '../../../test/util';
+import { DATASOURCE_FAILURE } from '../../constants/error-messages';
 import { clearRepoCache } from '../../util/cache';
+import * as hostRules from '../../util/host-rules';
+import * as npm from '.';
 
 jest.mock('registry-auth-token');
 jest.mock('delay');

lib/datasource/npm/releases.ts

@@ -1,6 +1,6 @@
+import { GetReleasesConfig, ReleaseResult } from '../common';
 import { getDependency } from './get';
 import { setNpmrc } from './npmrc';
-import { GetReleasesConfig, ReleaseResult } from '../common';
 
 export async function getReleases({
   lookupName,

lib/datasource/nuget/index.spec.ts

@@ -1,7 +1,7 @@
 import fs from 'fs';
 import _got from '../../util/got';
-import * as nuget from '.';
 import * as _hostRules from '../../util/host-rules';
+import * as nuget from '.';
 
 const hostRules: any = _hostRules;
 

lib/datasource/nuget/index.ts

@@ -1,8 +1,8 @@
 import urlApi from 'url';
 import { logger } from '../../logger';
+import { GetReleasesConfig, ReleaseResult } from '../common';
 import * as v2 from './v2';
 import * as v3 from './v3';
-import { GetReleasesConfig, ReleaseResult } from '../common';
 
 export { id } from './common';
 

lib/datasource/packagist/index.spec.ts

@@ -1,9 +1,9 @@
 import fs from 'fs';
+import { clearRepoCache } from '../../util/cache';
 import _got from '../../util/got';
-import * as packagist from '.';
 import * as _hostRules from '../../util/host-rules';
 import * as composerVersioning from '../../versioning/composer';
-import { clearRepoCache } from '../../util/cache';
+import * as packagist from '.';
 
 jest.mock('../../util/got');
 jest.mock('../../util/host-rules');

lib/datasource/packagist/index.ts

@@ -1,12 +1,12 @@
+import URL from 'url';
 import is from '@sindresorhus/is';
 
-import URL from 'url';
 import pAll from 'p-all';
 import { logger } from '../../logger';
-import { Http, HttpOptions } from '../../util/http';
-import * as hostRules from '../../util/host-rules';
-import { DatasourceError, GetReleasesConfig, ReleaseResult } from '../common';
 import { getRepoCached, setRepoCached } from '../../util/cache';
+import * as hostRules from '../../util/host-rules';
+import { Http, HttpOptions } from '../../util/http';
+import { DatasourceError, GetReleasesConfig, ReleaseResult } from '../common';
 
 export const id = 'packagist';
 

lib/datasource/pod/index.spec.ts

@@ -1,10 +1,10 @@
-import { api as _api } from '../../platform/github/gh-got-wrapper';
-import * as pod from '.';
-import * as rubyVersioning from '../../versioning/ruby';
 import { getPkgReleases } from '..';
 import { mocked } from '../../../test/util';
 import { GotResponse } from '../../platform';
+import { api as _api } from '../../platform/github/gh-got-wrapper';
 import { clearRepoCache } from '../../util/cache';
+import * as rubyVersioning from '../../versioning/ruby';
+import * as pod from '.';
 
 const api = mocked(_api);
 

lib/datasource/pod/index.ts

@@ -1,7 +1,7 @@
 import crypto from 'crypto';
+import { logger } from '../../logger';
 import { api } from '../../platform/github/gh-got-wrapper';
 import { GetReleasesConfig, ReleaseResult } from '../common';
-import { logger } from '../../logger';
 
 export const id = 'pod';
 

lib/datasource/pypi/index.ts

@@ -1,9 +1,9 @@
-import is from '@sindresorhus/is';
 import url from 'url';
+import is from '@sindresorhus/is';
 import { parse } from 'node-html-parser';
 import { logger } from '../../logger';
-import { matches } from '../../versioning/pep440';
 import { Http } from '../../util/http';
+import { matches } from '../../versioning/pep440';
 import { GetReleasesConfig, ReleaseResult } from '../common';
 
 export const id = 'pypi';

lib/datasource/rubygems/get-rubygems-org.ts

@@ -1,6 +1,6 @@
 import { hrtime } from 'process';
-import { Http } from '../../util/http';
 import { logger } from '../../logger';
+import { Http } from '../../util/http';
 import { DatasourceError, ReleaseResult } from '../common';
 import { id } from './common';
 

lib/datasource/rubygems/get.ts

@@ -2,9 +2,9 @@ import { OutgoingHttpHeaders } from 'http';
 import { logger } from '../../logger';
 import { Http } from '../../util/http';
 import { maskToken } from '../../util/mask';
-import { UNAUTHORIZED, FORBIDDEN, NOT_FOUND } from './errors';
 import { ReleaseResult } from '../common';
 import { id } from './common';
+import { FORBIDDEN, NOT_FOUND, UNAUTHORIZED } from './errors';
 
 const http = new Http(id);
 

lib/datasource/rubygems/index.spec.ts

@@ -1,10 +1,10 @@
-import _got from '../../util/got';
-import railsInfo from './__fixtures__/rails/info.json';
-import railsVersions from './__fixtures__/rails/versions.json';
-import * as rubyVersioning from '../../versioning/ruby';
-import * as rubygems from '.';
 import { getPkgReleases } from '..';
 import { clearRepoCache } from '../../util/cache';
+import _got from '../../util/got';
+import * as rubyVersioning from '../../versioning/ruby';
+import railsInfo from './__fixtures__/rails/info.json';
+import railsVersions from './__fixtures__/rails/versions.json';
+import * as rubygems from '.';
 
 const got: any = _got;
 

lib/datasource/rubygems/releases.ts

@@ -1,6 +1,6 @@
+import { GetReleasesConfig, ReleaseResult } from '../common';
 import { getDependency } from './get';
 import { getRubygemsOrgDependency } from './get-rubygems-org';
-import { GetReleasesConfig, ReleaseResult } from '../common';
 
 export async function getReleases({
   lookupName,

lib/datasource/sbt-package/index.spec.ts

@@ -1,11 +1,11 @@
-import path from 'path';
 import fs from 'fs';
+import path from 'path';
 import nock from 'nock';
 import { getPkgReleases } from '..';
+import * as mavenVersioning from '../../versioning/maven';
 import { MAVEN_REPO } from '../maven/common';
 import { parseIndexDir } from '../sbt-plugin/util';
 import * as sbtPlugin from '.';
-import * as mavenVersioning from '../../versioning/maven';
 
 const mavenIndexHtml = fs.readFileSync(
   path.resolve(__dirname, `./__fixtures__/maven-index.html`),

lib/datasource/sbt-package/index.ts

@@ -1,9 +1,9 @@
-import { compare } from '../../versioning/maven/compare';
-import { downloadHttpProtocol } from '../maven/util';
-import { parseIndexDir } from '../sbt-plugin/util';
 import { logger } from '../../logger';
+import { compare } from '../../versioning/maven/compare';
 import { GetReleasesConfig, ReleaseResult } from '../common';
 import { MAVEN_REPO } from '../maven/common';
+import { downloadHttpProtocol } from '../maven/util';
+import { parseIndexDir } from '../sbt-plugin/util';
 
 export const id = 'sbt-package';
 

lib/datasource/sbt-plugin/index.spec.ts

@@ -1,10 +1,10 @@
-import path from 'path';
 import fs from 'fs';
+import path from 'path';
 import nock from 'nock';
 import { getPkgReleases } from '..';
+import * as mavenVersioning from '../../versioning/maven';
 import { parseIndexDir } from './util';
 import * as sbtPlugin from '.';
-import * as mavenVersioning from '../../versioning/maven';
 
 const mavenIndexHtml = fs.readFileSync(
   path.resolve(__dirname, `./__fixtures__/maven-index.html`),

lib/datasource/sbt-plugin/index.ts

@@ -1,9 +1,9 @@
-import { compare } from '../../versioning/maven/compare';
-import { downloadHttpProtocol } from '../maven/util';
-import { parseIndexDir, SBT_PLUGINS_REPO } from './util';
 import { logger } from '../../logger';
+import { compare } from '../../versioning/maven/compare';
 import { GetReleasesConfig, ReleaseResult } from '../common';
+import { downloadHttpProtocol } from '../maven/util';
 import { resolvePackageReleases } from '../sbt-package';
+import { SBT_PLUGINS_REPO, parseIndexDir } from './util';
 
 export const id = 'sbt-plugin';
 

lib/logger/index.spec.ts

@@ -1,16 +1,16 @@
 import _fs from 'fs-extra';
-import {
-  logger,
-  setContext,
-  getContext,
-  setMeta,
-  addMeta,
-  removeMeta,
-  levels,
-  getErrors,
-  addStream,
-} from '.';
 import { add } from '../util/host-rules';
+import {
+  addMeta,
+  addStream,
+  getContext,
+  getErrors,
+  levels,
+  logger,
+  removeMeta,
+  setContext,
+  setMeta,
+} from '.';
 
 jest.unmock('.');
 

lib/logger/index.ts

@@ -1,11 +1,11 @@
+import is from '@sindresorhus/is';
 import * as bunyan from 'bunyan';
 import * as shortid from 'shortid';
 
-import is from '@sindresorhus/is';
-import { RenovateStream } from './pretty-stdout';
+import cmdSerializer from './cmd-serializer';
 import configSerializer from './config-serializer';
 import errSerializer from './err-serializer';
-import cmdSerializer from './cmd-serializer';
+import { RenovateStream } from './pretty-stdout';
 import { ErrorStream, withSanitizer } from './utils';
 
 let logContext: string = process.env.LOG_CONTEXT || shortid.generate();

lib/logger/pretty-stdout.ts

@@ -1,8 +1,8 @@
 // Code originally derived from https://github.com/hadfieldn/node-bunyan-prettystream but since heavily edited
 // Neither fork nor original repo appear to be maintained
 
-import * as util from 'util';
 import { Stream } from 'stream';
+import * as util from 'util';
 import chalk from 'chalk';
 import stringify from 'json-stringify-pretty-compact';
 import { BunyanRecord } from './utils';

lib/logger/utils.ts

@@ -1,6 +1,6 @@
-import fs from 'fs-extra';
-import bunyan from 'bunyan';
 import { Stream } from 'stream';
+import bunyan from 'bunyan';
+import fs from 'fs-extra';
 import { sanitize } from '../util/sanitize';
 
 export interface BunyanRecord extends Record<string, any> {

lib/manager/ansible-galaxy/extract.ts

@@ -1,8 +1,8 @@
-import { logger } from '../../logger';
-import { PackageFile, PackageDependency } from '../common';
-import * as datasourceGitTags from '../../datasource/git-tags';
 import * as datasourceGalaxy from '../../datasource/galaxy';
+import * as datasourceGitTags from '../../datasource/git-tags';
+import { logger } from '../../logger';
 import { SkipReason } from '../../types';
+import { PackageDependency, PackageFile } from '../common';
 
 function interpretLine(
   lineMatch: RegExpMatchArray,

lib/manager/ansible/extract.ts

@@ -1,7 +1,7 @@
 import { logger } from '../../logger';
-import { getDep } from '../dockerfile/extract';
-import { PackageFile, PackageDependency } from '../common';
 import * as dockerVersioning from '../../versioning/docker';
+import { PackageDependency, PackageFile } from '../common';
+import { getDep } from '../dockerfile/extract';
 
 export default function extractPackageFile(
   content: string

lib/manager/ansible/index.ts

@@ -1,5 +1,5 @@
-import extractPackageFile from './extract';
 import { LANGUAGE_DOCKER } from '../../constants/languages';
+import extractPackageFile from './extract';
 
 const language = LANGUAGE_DOCKER;
 

lib/manager/bazel/extract.ts

@@ -1,14 +1,14 @@
 /* eslint no-plusplus: 0  */
-import parse from 'github-url-from-git';
 import { parse as _parse } from 'url';
+import parse from 'github-url-from-git';
+import * as datasourceDocker from '../../datasource/docker';
+import * as datasourceGithubReleases from '../../datasource/github-releases';
+import * as datasourceGo from '../../datasource/go';
 import { logger } from '../../logger';
-import { PackageDependency, PackageFile } from '../common';
+import { SkipReason } from '../../types';
 import { regEx } from '../../util/regex';
 import * as dockerVersioning from '../../versioning/docker';
-import * as datasourceDocker from '../../datasource/docker';
-import * as datasourceGo from '../../datasource/go';
-import * as datasourceGithubReleases from '../../datasource/github-releases';
-import { SkipReason } from '../../types';
+import { PackageDependency, PackageFile } from '../common';
 
 interface UrlParsedResult {
   repo: string;

lib/manager/bazel/update.spec.ts

@@ -1,8 +1,8 @@
 import { readFileSync } from 'fs';
-import { fromStream as _fromStream } from 'hasha';
 import { resolve } from 'path';
-import { updateDependency } from './update';
+import { fromStream as _fromStream } from 'hasha';
 import { UpdateType } from '../../config';
+import { updateDependency } from './update';
 
 jest.mock('hasha');
 jest.mock('../../util/got');

lib/manager/bazel/update.ts

@@ -1,8 +1,8 @@
 import { fromStream } from 'hasha';
-import { Http } from '../../util/http';
 import { logger } from '../../logger';
-import { UpdateDependencyConfig } from '../common';
+import { Http } from '../../util/http';
 import { regEx } from '../../util/regex';
+import { UpdateDependencyConfig } from '../common';
 
 const http = new Http('bazel');
 

lib/manager/buildkite/extract.ts

@@ -1,8 +1,8 @@
-import { logger } from '../../logger';
-import { isVersion } from '../../versioning/semver';
-import { PackageFile, PackageDependency } from '../common';
 import * as datasourceGithubTags from '../../datasource/github-tags';
+import { logger } from '../../logger';
 import { SkipReason } from '../../types';
+import { isVersion } from '../../versioning/semver';
+import { PackageDependency, PackageFile } from '../common';
 
 export function extractPackageFile(content: string): PackageFile | null {
   const deps: PackageDependency[] = [];

lib/manager/bundler/artifacts.spec.ts

@@ -1,17 +1,17 @@
-import { join } from 'upath';
-import _fs from 'fs-extra';
 import { exec as _exec } from 'child_process';
+import _fs from 'fs-extra';
 import Git from 'simple-git/promise';
-import { updateArtifacts } from '.';
-import { platform as _platform } from '../../platform';
-import * as _datasource from '../../datasource/docker';
-import { mocked } from '../../../test/util';
+import { join } from 'upath';
 import { envMock, mockExecAll } from '../../../test/execUtil';
+import { mocked } from '../../../test/util';
+import * as _datasource from '../../datasource/docker';
+import { platform as _platform } from '../../platform';
+import { setUtilConfig } from '../../util';
+import { BinarySource } from '../../util/exec/common';
+import { resetPrefetchedImages } from '../../util/exec/docker';
 import * as _env from '../../util/exec/env';
 import * as _bundlerHostRules from './host-rules';
-import { BinarySource } from '../../util/exec/common';
-import { setUtilConfig } from '../../util';
-import { resetPrefetchedImages } from '../../util/exec/docker';
+import { updateArtifacts } from '.';
 
 const fs: jest.Mocked<typeof _fs> = _fs as any;
 const exec: jest.Mock<typeof _exec> = _exec as any;

lib/manager/bundler/artifacts.ts

@@ -1,22 +1,22 @@
+import { BUNDLER_INVALID_CREDENTIALS } from '../../constants/error-messages';
+import { logger } from '../../logger';
+import { platform } from '../../platform';
+import { HostRule } from '../../types';
+import { getRepoCached, setRepoCached } from '../../util/cache';
+import { ExecOptions, exec } from '../../util/exec';
 import {
+  deleteLocalFile,
   getSiblingFileName,
   readLocalFile,
   writeLocalFile,
-  deleteLocalFile,
 } from '../../util/fs';
-import { exec, ExecOptions } from '../../util/exec';
-import { logger } from '../../logger';
 import { isValid } from '../../versioning/ruby';
 import { UpdateArtifact, UpdateArtifactsResult } from '../common';
-import { platform } from '../../platform';
-import { BUNDLER_INVALID_CREDENTIALS } from '../../constants/error-messages';
-import { HostRule } from '../../types';
 import {
-  getAuthenticationHeaderValue,
   findAllAuthenticatable,
+  getAuthenticationHeaderValue,
   getDomain,
 } from './host-rules';
-import { getRepoCached, setRepoCached } from '../../util/cache';
 
 const hostConfigVariablePrefix = 'BUNDLE_';
 

lib/manager/bundler/extract.spec.ts

@@ -1,7 +1,7 @@
 import { readFileSync } from 'fs';
-import { extractPackageFile } from './extract';
-import { isValid } from '../../versioning/ruby';
 import * as _fs from '../../util/fs';
+import { isValid } from '../../versioning/ruby';
+import { extractPackageFile } from './extract';
 
 jest.mock('../../util/fs');
 

lib/manager/bundler/extract.ts

@@ -1,10 +1,10 @@
-import { logger } from '../../logger';
-import { PackageFile, PackageDependency } from '../common';
-import { regEx } from '../../util/regex';
-import { extractLockFileEntries } from './locked-version';
 import * as datasourceRubygems from '../../datasource/rubygems';
+import { logger } from '../../logger';
 import { SkipReason } from '../../types';
 import { readLocalFile } from '../../util/fs';
+import { regEx } from '../../util/regex';
+import { PackageDependency, PackageFile } from '../common';
+import { extractLockFileEntries } from './locked-version';
 
 export async function extractPackageFile(
   content: string,

lib/manager/bundler/host-rules.spec.ts

@@ -1,10 +1,10 @@
-import { add, clear } from '../../util/host-rules';
 import { HostRule } from '../../types';
+import { add, clear } from '../../util/host-rules';
 
 import {
   findAllAuthenticatable,
-  getDomain,
   getAuthenticationHeaderValue,
+  getDomain,
 } from './host-rules';
 
 describe('lib/manager/bundler/host-rules', () => {

lib/manager/bundler/index.ts

@@ -1,8 +1,8 @@
-import { extractPackageFile } from './extract';
-import { updateArtifacts } from './artifacts';
-import { getRangeStrategy } from './range';
 import { LANGUAGE_RUBY } from '../../constants/languages';
 import * as rubyVersioning from '../../versioning/ruby';
+import { updateArtifacts } from './artifacts';
+import { extractPackageFile } from './extract';
+import { getRangeStrategy } from './range';
 
 const language = LANGUAGE_RUBY;
 export const supportsLockFileMaintenance = true;

lib/manager/bundler/locked-version.ts

@@ -1,5 +1,5 @@
-import { isVersion } from '../../versioning/ruby';
 import { logger } from '../../logger';
+import { isVersion } from '../../versioning/ruby';
 
 const DEP_REGEX = new RegExp('(?<=\\().*(?=\\))');
 export function extractLockFileEntries(

lib/manager/cargo/artifacts.spec.ts

@@ -1,14 +1,14 @@
-import { join } from 'upath';
-import _fs from 'fs-extra';
 import { exec as _exec } from 'child_process';
-import * as cargo from './artifacts';
-import { platform as _platform } from '../../platform';
-import { mocked } from '../../../test/util';
+import _fs from 'fs-extra';
+import { join } from 'upath';
 import { envMock, mockExecAll } from '../../../test/execUtil';
-import * as _env from '../../util/exec/env';
+import { mocked } from '../../../test/util';
+import { platform as _platform } from '../../platform';
 import { setExecConfig } from '../../util/exec';
 import { BinarySource } from '../../util/exec/common';
 import { resetPrefetchedImages } from '../../util/exec/docker';
+import * as _env from '../../util/exec/env';
+import * as cargo from './artifacts';
 
 jest.mock('fs-extra');
 jest.mock('child_process');