diff --git a/lib/versioning/aws-machine-image/index.ts b/lib/versioning/aws-machine-image/index.ts index 01bec556d996701e17be6503544915a4901fcc1c..674ec65e35a097e00a9b9389b58da55b91da5768 100644 --- a/lib/versioning/aws-machine-image/index.ts +++ b/lib/versioning/aws-machine-image/index.ts @@ -1,5 +1,5 @@ import { regEx } from '../../util/regex'; -import { GenericVersion, GenericVersioningApi } from '../loose/generic'; +import { GenericVersion, GenericVersioningApi } from '../generic'; import type { VersioningApi } from '../types'; export const id = 'aws-machine-image'; diff --git a/lib/versioning/docker/index.ts b/lib/versioning/docker/index.ts index 3e9ce2ad5e409fac50f1672a4488ce7ac1bbf05e..4dc32bc918545a15fc4a7a768dcae37add691583 100644 --- a/lib/versioning/docker/index.ts +++ b/lib/versioning/docker/index.ts @@ -1,5 +1,5 @@ import { regEx } from '../../util/regex'; -import { GenericVersion, GenericVersioningApi } from '../loose/generic'; +import { GenericVersion, GenericVersioningApi } from '../generic'; import type { VersioningApi } from '../types'; export const id = 'docker'; diff --git a/lib/versioning/loose/utils.spec.ts b/lib/versioning/generic.spec.ts similarity index 99% rename from lib/versioning/loose/utils.spec.ts rename to lib/versioning/generic.spec.ts index 5d9bae18dd21c219d349575ffdb3effe4ef123ad..455acadd525d8783aae09e71b180ce0ab7516b4f 100644 --- a/lib/versioning/loose/utils.spec.ts +++ b/lib/versioning/generic.spec.ts @@ -1,6 +1,6 @@ import { GenericVersion, GenericVersioningApi } from './generic'; -describe('versioning/loose/utils', () => { +describe('versioning/generic', () => { const optionalFunctions = [ 'isLessThanRange', 'valueToVersion', diff --git a/lib/versioning/loose/generic.ts b/lib/versioning/generic.ts similarity index 98% rename from lib/versioning/loose/generic.ts rename to lib/versioning/generic.ts index cfcb3b657fa8b5534448a06cc86e4dbd8bb26f89..32df1a1b9040e53c060173eb1b57567901b30adb 100644 --- a/lib/versioning/loose/generic.ts +++ b/lib/versioning/generic.ts @@ -1,5 +1,5 @@ import is from '@sindresorhus/is'; -import type { NewValueConfig, VersioningApi } from '../types'; +import type { NewValueConfig, VersioningApi } from './types'; export interface GenericVersion { release: number[]; diff --git a/lib/versioning/git/index.ts b/lib/versioning/git/index.ts index 3c2e50991732d6eb634d17a0145ac5c797227493..a5507b95eca3af78ee8ac868bd0b44e2c57d7476 100644 --- a/lib/versioning/git/index.ts +++ b/lib/versioning/git/index.ts @@ -1,5 +1,5 @@ import { regEx } from '../../util/regex'; -import { GenericVersion, GenericVersioningApi } from '../loose/generic'; +import { GenericVersion, GenericVersioningApi } from '../generic'; import type { VersioningApi } from '../types'; export const id = 'git'; diff --git a/lib/versioning/index.spec.ts b/lib/versioning/index.spec.ts index d6f118aa7ecbf951d4327b2e2e512399a508953d..8289aa3cca4d0a426811b93afde4652081409b22 100644 --- a/lib/versioning/index.spec.ts +++ b/lib/versioning/index.spec.ts @@ -1,7 +1,7 @@ import { getOptions } from '../config/options'; import { loadModules } from '../util/modules'; import { isVersioningApiConstructor } from './common'; -import { GenericVersion, GenericVersioningApi } from './loose/generic'; +import { GenericVersion, GenericVersioningApi } from './generic'; import * as semverVersioning from './semver'; import type { VersioningApi, VersioningApiConstructor } from './types'; import * as allVersioning from '.'; diff --git a/lib/versioning/loose/index.ts b/lib/versioning/loose/index.ts index 4386ab2ad438b77b47882a53eca3f346b6989fd9..6bf92038dd5d32285a37114c27da059b83fcc933 100644 --- a/lib/versioning/loose/index.ts +++ b/lib/versioning/loose/index.ts @@ -1,6 +1,6 @@ import { regEx } from '../../util/regex'; +import { GenericVersion, GenericVersioningApi } from '../generic'; import type { VersioningApi } from '../types'; -import { GenericVersion, GenericVersioningApi } from './generic'; export const id = 'loose'; export const displayName = 'Loose'; diff --git a/lib/versioning/nuget/index.ts b/lib/versioning/nuget/index.ts index fdd4dec0da37d3db6e51bf6dfc1884ac2dab97af..bb0e3ebb7e56734bc31329feb885de0bf60950ca 100644 --- a/lib/versioning/nuget/index.ts +++ b/lib/versioning/nuget/index.ts @@ -1,6 +1,6 @@ import semver from 'semver'; import { regEx } from '../../util/regex'; -import { GenericVersion, GenericVersioningApi } from '../loose/generic'; +import { GenericVersion, GenericVersioningApi } from '../generic'; import type { VersioningApi } from '../types'; export const id = 'nuget'; diff --git a/lib/versioning/regex/index.ts b/lib/versioning/regex/index.ts index 417dd48633603fa624ecd3a84178b85018c1a4ec..782aad65cfbfbdeb002eb94aa6b4f6808411b68f 100644 --- a/lib/versioning/regex/index.ts +++ b/lib/versioning/regex/index.ts @@ -2,7 +2,7 @@ import is from '@sindresorhus/is'; import semver from 'semver'; import { CONFIG_VALIDATION } from '../../constants/error-messages'; import { regEx } from '../../util/regex'; -import { GenericVersion, GenericVersioningApi } from '../loose/generic'; +import { GenericVersion, GenericVersioningApi } from '../generic'; import type { VersioningApiConstructor } from '../types'; export const id = 'regex';