diff --git a/lib/modules/datasource/api.ts b/lib/modules/datasource/api.ts index 9321d416b92456e30984e5608c01af5ccf83c702..9a7cfa1546ae4bba21783fda78659b472db3c739 100644 --- a/lib/modules/datasource/api.ts +++ b/lib/modules/datasource/api.ts @@ -6,7 +6,7 @@ import { AzurePipelinesTasksDatasource } from './azure-pipelines-tasks'; import { BazelDatasource } from './bazel'; import { BitbucketTagsDatasource } from './bitbucket-tags'; import { BitriseDatasource } from './bitrise'; -import { CdnJsDatasource } from './cdnjs'; +import { CdnjsDatasource } from './cdnjs'; import { ClojureDatasource } from './clojure'; import { ConanDatasource } from './conan'; import { CondaDatasource } from './conda'; @@ -75,7 +75,7 @@ api.set(AzurePipelinesTasksDatasource.id, new AzurePipelinesTasksDatasource()); api.set(BazelDatasource.id, new BazelDatasource()); api.set(BitbucketTagsDatasource.id, new BitbucketTagsDatasource()); api.set(BitriseDatasource.id, new BitriseDatasource()); -api.set(CdnJsDatasource.id, new CdnJsDatasource()); +api.set(CdnjsDatasource.id, new CdnjsDatasource()); api.set(ClojureDatasource.id, new ClojureDatasource()); api.set(ConanDatasource.id, new ConanDatasource()); api.set(CondaDatasource.id, new CondaDatasource()); diff --git a/lib/modules/datasource/cdnjs/index.spec.ts b/lib/modules/datasource/cdnjs/index.spec.ts index 3c09dcf986e18bf710d704ea9895cb85d6a5d144..3bedc1160066bd9b8d6f484ebc0f5ba62d183b27 100644 --- a/lib/modules/datasource/cdnjs/index.spec.ts +++ b/lib/modules/datasource/cdnjs/index.spec.ts @@ -3,7 +3,7 @@ import { Fixtures } from '../../../../test/fixtures'; import * as httpMock from '../../../../test/http-mock'; import { EXTERNAL_HOST_ERROR } from '../../../constants/error-messages'; import { HttpError } from '../../../util/http'; -import { CdnJsDatasource } from '.'; +import { CdnjsDatasource } from '.'; const baseUrl = 'https://api.cdnjs.com/'; @@ -19,7 +19,7 @@ describe('modules/datasource/cdnjs/index', () => { httpMock.scope(baseUrl).get(pathFor('foo/bar')).reply(200, '}'); await expect( getPkgReleases({ - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'foo/bar', }), ).rejects.toThrow(EXTERNAL_HOST_ERROR); @@ -29,7 +29,7 @@ describe('modules/datasource/cdnjs/index', () => { httpMock.scope(baseUrl).get(pathFor('foo/bar')).replyWithError('error'); await expect( getPkgReleases({ - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'foo/bar', }), ).rejects.toThrow(EXTERNAL_HOST_ERROR); @@ -39,7 +39,7 @@ describe('modules/datasource/cdnjs/index', () => { httpMock.scope(baseUrl).get(pathFor('foo/bar')).reply(404); expect( await getPkgReleases({ - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'foo/bar', }), ).toBeNull(); @@ -52,7 +52,7 @@ describe('modules/datasource/cdnjs/index', () => { .reply(200, {}); expect( await getPkgReleases({ - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'doesnotexist/doesnotexist', }), ).toBeNull(); @@ -62,7 +62,7 @@ describe('modules/datasource/cdnjs/index', () => { httpMock.scope(baseUrl).get(pathFor('foo/bar')).reply(401); await expect( getPkgReleases({ - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'foo/bar', }), ).rejects.toThrow(EXTERNAL_HOST_ERROR); @@ -72,7 +72,7 @@ describe('modules/datasource/cdnjs/index', () => { httpMock.scope(baseUrl).get(pathFor('foo/bar')).reply(429); await expect( getPkgReleases({ - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'foo/bar', }), ).rejects.toThrow(EXTERNAL_HOST_ERROR); @@ -82,7 +82,7 @@ describe('modules/datasource/cdnjs/index', () => { httpMock.scope(baseUrl).get(pathFor('foo/bar')).reply(502); await expect( getPkgReleases({ - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'foo/bar', }), ).rejects.toThrow(EXTERNAL_HOST_ERROR); @@ -92,7 +92,7 @@ describe('modules/datasource/cdnjs/index', () => { httpMock.scope(baseUrl).get(pathFor('foo/bar')).replyWithError('error'); await expect( getPkgReleases({ - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'foo/bar', }), ).rejects.toThrow(EXTERNAL_HOST_ERROR); @@ -104,7 +104,7 @@ describe('modules/datasource/cdnjs/index', () => { .get(pathFor('d3-force/d3-force.js')) .reply(200, Fixtures.get('d3-force.json')); const res = await getPkgReleases({ - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'd3-force/d3-force.js', }); expect(res).toMatchSnapshot(); @@ -120,7 +120,7 @@ describe('modules/datasource/cdnjs/index', () => { const res = await getDigest( { - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'foo/bar', }, '1.2.0', @@ -136,7 +136,7 @@ describe('modules/datasource/cdnjs/index', () => { const res = await getDigest( { - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'foo/bar', }, '1.2.0', @@ -152,7 +152,7 @@ describe('modules/datasource/cdnjs/index', () => { const res = await getDigest( { - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'foo/bar', }, '1.2.0', @@ -165,7 +165,7 @@ describe('modules/datasource/cdnjs/index', () => { await expect( getDigest( { - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'foo/bar', }, '1.2.0', @@ -181,7 +181,7 @@ describe('modules/datasource/cdnjs/index', () => { const res = await getDigest( { - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, packageName: 'bootstrap/js/bootstrap.min.js', }, '5.2.3', diff --git a/lib/modules/datasource/cdnjs/index.ts b/lib/modules/datasource/cdnjs/index.ts index daf17b6961b72590bacf3707b38b00b15eeb5283..f6730ff55ca28204d94ae8bc803a00424b85313d 100644 --- a/lib/modules/datasource/cdnjs/index.ts +++ b/lib/modules/datasource/cdnjs/index.ts @@ -17,11 +17,11 @@ import { CdnjsAPIVersionResponseSchema, } from './schema'; -export class CdnJsDatasource extends Datasource { +export class CdnjsDatasource extends Datasource { static readonly id = 'cdnjs'; constructor() { - super(CdnJsDatasource.id); + super(CdnjsDatasource.id); } override readonly customRegistrySupport = false; @@ -33,7 +33,7 @@ export class CdnJsDatasource extends Datasource { 'The source URL is determined from the `repository` field in the results.'; @cache({ - namespace: `datasource-${CdnJsDatasource.id}`, + namespace: `datasource-${CdnjsDatasource.id}`, key: ({ packageName }: GetReleasesConfig) => packageName.split('/')[0], }) async getReleases(config: GetReleasesConfig): Promise<ReleaseResult | null> { @@ -76,7 +76,7 @@ export class CdnJsDatasource extends Datasource { } @cache({ - namespace: `datasource-${CdnJsDatasource.id}-digest`, + namespace: `datasource-${CdnjsDatasource.id}-digest`, key: ({ registryUrl, packageName }: DigestConfig, newValue: string) => `${registryUrl}:${packageName}:${newValue}}`, }) diff --git a/lib/modules/manager/cdnurl/extract.ts b/lib/modules/manager/cdnurl/extract.ts index 5af79ad59fe57eee7a139ad2f547a7d73e09a015..f7ce2a671f6b5db3cca02b50d01d18da34282652 100644 --- a/lib/modules/manager/cdnurl/extract.ts +++ b/lib/modules/manager/cdnurl/extract.ts @@ -1,5 +1,5 @@ import { regEx } from '../../../util/regex'; -import { CdnJsDatasource } from '../../datasource/cdnjs'; +import { CdnjsDatasource } from '../../datasource/cdnjs'; import type { PackageDependency, PackageFileContent } from '../types'; export const cloudflareUrlRegex = regEx( @@ -20,7 +20,7 @@ export function extractPackageFile(content: string): PackageFileContent { match = cloudflareUrlRegex.exec(rest); deps.push({ - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, depName, packageName: `${depName}/${asset}`, currentValue, diff --git a/lib/modules/manager/cdnurl/index.ts b/lib/modules/manager/cdnurl/index.ts index 574dc5cc1b577c86ae93adc92591258c81b4cab5..dd9a68da9278dedbe7331a0ee4f07373b576d635 100644 --- a/lib/modules/manager/cdnurl/index.ts +++ b/lib/modules/manager/cdnurl/index.ts @@ -1,5 +1,5 @@ import type { Category } from '../../../constants'; -import { CdnJsDatasource } from '../../datasource/cdnjs'; +import { CdnjsDatasource } from '../../datasource/cdnjs'; import * as semverVersioning from '../../versioning/semver'; import { extractPackageFile } from './extract'; @@ -12,4 +12,4 @@ export const defaultConfig = { export const categories: Category[] = ['cd']; -export const supportedDatasources = [CdnJsDatasource.id]; +export const supportedDatasources = [CdnjsDatasource.id]; diff --git a/lib/modules/manager/html/extract.ts b/lib/modules/manager/html/extract.ts index 51b69c9fe1f43f91820122cfc9c7bb6f6f1bfa59..7ddb220cfdf5593c3f0097577e23f4f3edfb995d 100644 --- a/lib/modules/manager/html/extract.ts +++ b/lib/modules/manager/html/extract.ts @@ -1,5 +1,5 @@ import { regEx } from '../../../util/regex'; -import { CdnJsDatasource } from '../../datasource/cdnjs'; +import { CdnjsDatasource } from '../../datasource/cdnjs'; import { cloudflareUrlRegex } from '../cdnurl/extract'; import type { PackageDependency, PackageFileContent } from '../types'; @@ -16,7 +16,7 @@ export function extractDep(tag: string): PackageDependency | null { } const { depName, currentValue, asset } = match.groups; const dep: PackageDependency = { - datasource: CdnJsDatasource.id, + datasource: CdnjsDatasource.id, depName, packageName: `${depName}/${asset}`, currentValue, diff --git a/lib/modules/manager/html/index.ts b/lib/modules/manager/html/index.ts index ad6e2a725347e137d01131d1f687d343f59004ca..b28ddb2ed2b4afe96f75e78b8a2b198318fd6e37 100644 --- a/lib/modules/manager/html/index.ts +++ b/lib/modules/manager/html/index.ts @@ -1,5 +1,5 @@ import type { Category } from '../../../constants'; -import { CdnJsDatasource } from '../../datasource/cdnjs'; +import { CdnjsDatasource } from '../../datasource/cdnjs'; import * as semverVersioning from '../../versioning/semver'; import { extractPackageFile } from './extract'; @@ -16,4 +16,4 @@ export const defaultConfig = { export const categories: Category[] = ['cd']; -export const supportedDatasources = [CdnJsDatasource.id]; +export const supportedDatasources = [CdnjsDatasource.id];