From 6446ea982ef2c26515d461a935f905dd30de5a33 Mon Sep 17 00:00:00 2001 From: Rhys Arkins <rhys@arkins.net> Date: Mon, 13 Apr 2020 14:05:14 +0200 Subject: [PATCH] refactor: move LookupUpdate --- lib/manager/common.ts | 23 ++++++++++++++++++ lib/workers/common.ts | 7 ++++-- .../repository/process/lookup/common.ts | 24 ------------------- .../repository/process/lookup/index.ts | 3 +-- .../repository/process/lookup/rollback.ts | 2 +- 5 files changed, 30 insertions(+), 29 deletions(-) delete mode 100644 lib/workers/repository/process/lookup/common.ts diff --git a/lib/manager/common.ts b/lib/manager/common.ts index 9f87a6a62b..48dac40e30 100644 --- a/lib/manager/common.ts +++ b/lib/manager/common.ts @@ -138,6 +138,29 @@ export interface AutoReplaceData { depIndex?: number; } +export interface LookupUpdate { + blockedByPin?: boolean; + branchName?: string; + commitMessageAction?: string; + displayFrom?: string; + displayTo?: string; + isLockfileUpdate?: boolean; + isPin?: boolean; + isRange?: boolean; + isRollback?: boolean; + isSingleVersion?: boolean; + fromVersion?: string; + newDigest?: string; + newDigestShort?: string; + newMajor?: number; + newMinor?: number; + newValue: string; + newVersion?: string; + semanticCommitType?: string; + toVersion?: string; + updateType: UpdateType; +} + export interface PackageDependency<T = Record<string, any>> extends Package<T> { warnings?: ValidationMessage[]; commitMessageTopic?: string; diff --git a/lib/workers/common.ts b/lib/workers/common.ts index af470e93ab..f4c5f4d916 100644 --- a/lib/workers/common.ts +++ b/lib/workers/common.ts @@ -1,5 +1,9 @@ import { Merge } from 'type-fest'; -import { PackageDependency, ArtifactError } from '../manager/common'; +import { + PackageDependency, + ArtifactError, + LookupUpdate, +} from '../manager/common'; import { RenovateSharedConfig, RenovateConfig, @@ -7,7 +11,6 @@ import { RenovateAdminConfig, ValidationMessage, } from '../config'; -import { LookupUpdate } from './repository/process/lookup/common'; import { File, PlatformPrOptions } from '../platform'; import { Release } from '../datasource'; diff --git a/lib/workers/repository/process/lookup/common.ts b/lib/workers/repository/process/lookup/common.ts deleted file mode 100644 index cafb0d2a18..0000000000 --- a/lib/workers/repository/process/lookup/common.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { UpdateType } from '../../../../config'; - -export interface LookupUpdate { - blockedByPin?: boolean; - branchName?: string; - commitMessageAction?: string; - displayFrom?: string; - displayTo?: string; - isLockfileUpdate?: boolean; - isPin?: boolean; - isRange?: boolean; - isRollback?: boolean; - isSingleVersion?: boolean; - fromVersion?: string; - newDigest?: string; - newDigestShort?: string; - newMajor?: number; - newMinor?: number; - newValue: string; - newVersion?: string; - semanticCommitType?: string; - toVersion?: string; - updateType: UpdateType; -} diff --git a/lib/workers/repository/process/lookup/index.ts b/lib/workers/repository/process/lookup/index.ts index 1e60af4c79..01bad0ab4e 100644 --- a/lib/workers/repository/process/lookup/index.ts +++ b/lib/workers/repository/process/lookup/index.ts @@ -10,8 +10,7 @@ import { Release, isGetPkgReleasesConfig, } from '../../../../datasource'; -import { LookupUpdate } from './common'; -import { RangeConfig } from '../../../../manager/common'; +import { RangeConfig, LookupUpdate } from '../../../../manager/common'; import { RenovateConfig, UpdateType, diff --git a/lib/workers/repository/process/lookup/rollback.ts b/lib/workers/repository/process/lookup/rollback.ts index 8232a0c5c9..ab030b66d7 100644 --- a/lib/workers/repository/process/lookup/rollback.ts +++ b/lib/workers/repository/process/lookup/rollback.ts @@ -1,6 +1,6 @@ import { logger } from '../../../../logger'; import * as allVersioning from '../../../../versioning'; -import { LookupUpdate } from './common'; +import { LookupUpdate } from '../../../../manager/common'; export interface RollbackConfig { currentValue?: string; -- GitLab