From 0c6935f8d07dc6c299de4aee720b2558eae7ba52 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Sat, 9 May 2020 07:55:00 +0200 Subject: [PATCH] refactor(presets): use subdirectories --- .../__snapshots__/index.spec.ts.snap} | 0 .../{github.spec.ts => github/index.spec.ts} | 20 +++++++++---------- .../presets/{github.ts => github/index.ts} | 12 +++++------ .../{gitlab.spec.ts => gitlab/index.spec.ts} | 10 +++++----- .../presets/{gitlab.ts => gitlab/index.ts} | 8 ++++---- .../__snapshots__/index.spec.ts.snap} | 0 .../{local.spec.ts => local/index.spec.ts} | 10 +++++----- .../presets/{local.ts => local/index.ts} | 10 +++++----- .../__snapshots__/index.spec.ts.snap} | 0 .../{npm.spec.ts => npm/index.spec.ts} | 2 +- lib/config/presets/{npm.ts => npm/index.ts} | 6 +++--- 11 files changed, 39 insertions(+), 39 deletions(-) rename lib/config/presets/{__snapshots__/github.spec.ts.snap => github/__snapshots__/index.spec.ts.snap} (100%) rename lib/config/presets/{github.spec.ts => github/index.spec.ts} (89%) rename lib/config/presets/{github.ts => github/index.ts} (86%) rename lib/config/presets/{gitlab.spec.ts => gitlab/index.spec.ts} (88%) rename lib/config/presets/{gitlab.ts => gitlab/index.ts} (90%) rename lib/config/presets/{__snapshots__/local.spec.ts.snap => local/__snapshots__/index.spec.ts.snap} (100%) rename lib/config/presets/{local.spec.ts => local/index.spec.ts} (93%) rename lib/config/presets/{local.ts => local/index.ts} (77%) rename lib/config/presets/{__snapshots__/npm.spec.ts.snap => npm/__snapshots__/index.spec.ts.snap} (100%) rename lib/config/presets/{npm.spec.ts => npm/index.spec.ts} (99%) rename lib/config/presets/{npm.ts => npm/index.ts} (81%) diff --git a/lib/config/presets/__snapshots__/github.spec.ts.snap b/lib/config/presets/github/__snapshots__/index.spec.ts.snap similarity index 100% rename from lib/config/presets/__snapshots__/github.spec.ts.snap rename to lib/config/presets/github/__snapshots__/index.spec.ts.snap diff --git a/lib/config/presets/github.spec.ts b/lib/config/presets/github/index.spec.ts similarity index 89% rename from lib/config/presets/github.spec.ts rename to lib/config/presets/github/index.spec.ts index bdd4600105..a5e35c77c4 100644 --- a/lib/config/presets/github.spec.ts +++ b/lib/config/presets/github/index.spec.ts @@ -1,15 +1,15 @@ -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 { 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 '.'; import { PartialDeep } from 'type-fest'; -jest.mock('../../platform/github/gh-got-wrapper'); -jest.mock('../../util/got'); -jest.mock('../../util/host-rules'); +jest.mock('../../../platform/github/gh-got-wrapper'); +jest.mock('../../../util/got'); +jest.mock('../../../util/host-rules'); const got: jest.Mock<PartialDeep<GotResponse>> = _got as never; const hostRules = mocked(_hostRules); diff --git a/lib/config/presets/github.ts b/lib/config/presets/github/index.ts similarity index 86% rename from lib/config/presets/github.ts rename to lib/config/presets/github/index.ts index f1c2bfe3e1..56c7f8a691 100644 --- a/lib/config/presets/github.ts +++ b/lib/config/presets/github/index.ts @@ -1,9 +1,9 @@ -import { PLATFORM_FAILURE } from '../../constants/error-messages'; -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'; +import { PLATFORM_FAILURE } from '../../../constants/error-messages'; +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); diff --git a/lib/config/presets/gitlab.spec.ts b/lib/config/presets/gitlab/index.spec.ts similarity index 88% rename from lib/config/presets/gitlab.spec.ts rename to lib/config/presets/gitlab/index.spec.ts index 9138006985..591b430415 100644 --- a/lib/config/presets/gitlab.spec.ts +++ b/lib/config/presets/gitlab/index.spec.ts @@ -1,10 +1,10 @@ -import { GotResponse } from '../../platform'; -import { api } from '../../platform/gitlab/gl-got-wrapper'; -import * as gitlab from './gitlab'; +import { GotResponse } from '../../../platform'; +import { api } from '../../../platform/gitlab/gl-got-wrapper'; +import * as gitlab from '.'; import { PartialDeep } from 'type-fest'; -jest.mock('../../platform/gitlab/gl-got-wrapper'); -jest.mock('../../util/got'); +jest.mock('../../../platform/gitlab/gl-got-wrapper'); +jest.mock('../../../util/got'); const glGot: jest.Mock<Promise<PartialDeep<GotResponse>>> = api.get as never; diff --git a/lib/config/presets/gitlab.ts b/lib/config/presets/gitlab/index.ts similarity index 90% rename from lib/config/presets/gitlab.ts rename to lib/config/presets/gitlab/index.ts index eb2dff07af..ad23589472 100644 --- a/lib/config/presets/gitlab.ts +++ b/lib/config/presets/gitlab/index.ts @@ -1,7 +1,7 @@ -import { logger } from '../../logger'; -import { api } from '../../platform/gitlab/gl-got-wrapper'; -import { ensureTrailingSlash } from '../../util/url'; -import { Preset } from './common'; +import { logger } from '../../../logger'; +import { api } from '../../../platform/gitlab/gl-got-wrapper'; +import { ensureTrailingSlash } from '../../../util/url'; +import { Preset } from '../common'; const { get: glGot } = api; diff --git a/lib/config/presets/__snapshots__/local.spec.ts.snap b/lib/config/presets/local/__snapshots__/index.spec.ts.snap similarity index 100% rename from lib/config/presets/__snapshots__/local.spec.ts.snap rename to lib/config/presets/local/__snapshots__/index.spec.ts.snap diff --git a/lib/config/presets/local.spec.ts b/lib/config/presets/local/index.spec.ts similarity index 93% rename from lib/config/presets/local.spec.ts rename to lib/config/presets/local/index.spec.ts index 298dc4a9f7..b0e88d7a4a 100644 --- a/lib/config/presets/local.spec.ts +++ b/lib/config/presets/local/index.spec.ts @@ -1,9 +1,9 @@ -import * as github from './github'; -import * as gitlab from './gitlab'; -import * as local from './local'; +import * as github from '../github'; +import * as gitlab from '../gitlab'; +import * as local from '.'; -jest.mock('./gitlab'); -jest.mock('./github'); +jest.mock('../gitlab'); +jest.mock('../github'); const gitlabGetPreset: jest.Mock<Promise< any diff --git a/lib/config/presets/local.ts b/lib/config/presets/local/index.ts similarity index 77% rename from lib/config/presets/local.ts rename to lib/config/presets/local/index.ts index cf629ca961..7fd74b8afd 100644 --- a/lib/config/presets/local.ts +++ b/lib/config/presets/local/index.ts @@ -1,11 +1,11 @@ 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'; +} 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, diff --git a/lib/config/presets/__snapshots__/npm.spec.ts.snap b/lib/config/presets/npm/__snapshots__/index.spec.ts.snap similarity index 100% rename from lib/config/presets/__snapshots__/npm.spec.ts.snap rename to lib/config/presets/npm/__snapshots__/index.spec.ts.snap diff --git a/lib/config/presets/npm.spec.ts b/lib/config/presets/npm/index.spec.ts similarity index 99% rename from lib/config/presets/npm.spec.ts rename to lib/config/presets/npm/index.spec.ts index 7ba07ce6b8..74c68dab70 100644 --- a/lib/config/presets/npm.spec.ts +++ b/lib/config/presets/npm/index.spec.ts @@ -1,5 +1,5 @@ import nock from 'nock'; -import * as npm from './npm'; +import * as npm from '.'; jest.mock('registry-auth-token'); jest.mock('delay'); diff --git a/lib/config/presets/npm.ts b/lib/config/presets/npm/index.ts similarity index 81% rename from lib/config/presets/npm.ts rename to lib/config/presets/npm/index.ts index eca57a43a4..5ec31ff6b5 100644 --- a/lib/config/presets/npm.ts +++ b/lib/config/presets/npm/index.ts @@ -1,6 +1,6 @@ -import { getDependency } from '../../datasource/npm/get'; -import { logger } from '../../logger'; -import { Preset } from './common'; +import { getDependency } from '../../../datasource/npm/get'; +import { logger } from '../../../logger'; +import { Preset } from '../common'; export async function getPreset( pkgName: string, -- GitLab