Skip to content

Commit

Permalink
build(deps): update dependency prettier to v3 (renovatebot#23627)
Browse files Browse the repository at this point in the history
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Sergei Zharinov <zharinov@users.noreply.github.com>
  • Loading branch information
2 people authored and jon4hz committed Nov 9, 2023
1 parent 777a1cf commit 6f8878b
Show file tree
Hide file tree
Showing 32 changed files with 176 additions and 201 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,8 @@ jobs:
- name: Unit tests
shell: bash
env:
NODE_OPTIONS: --experimental-vm-modules
run: |
for shard in ${{ matrix.shards }};
do
Expand Down
80 changes: 32 additions & 48 deletions lib/config/validation.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,8 @@ describe('config/validation', () => {
},
major: null,
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(0);
expect(errors).toHaveLength(3);
expect(errors).toMatchSnapshot();
Expand All @@ -206,9 +205,8 @@ describe('config/validation', () => {
},
],
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(0);
expect(errors).toHaveLength(1);
expect(errors[0].message).toContain('ansible');
Expand Down Expand Up @@ -242,9 +240,8 @@ describe('config/validation', () => {
},
],
])('validates enabled managers for %s', async (_case, config) => {
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(0);
expect(errors).toHaveLength(0);
});
Expand All @@ -259,9 +256,8 @@ describe('config/validation', () => {
])(
'errors if included not supported enabled managers for %s',
async (_case, config) => {
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(0);
expect(errors).toHaveLength(1);
expect(errors).toMatchSnapshot();
Expand Down Expand Up @@ -299,9 +295,8 @@ describe('config/validation', () => {
],
major: null,
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(1);
expect(errors).toMatchSnapshot();
expect(errors).toHaveLength(15);
Expand All @@ -327,9 +322,8 @@ describe('config/validation', () => {
},
},
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(4);
expect(errors).toMatchSnapshot();
expect(errors).toHaveLength(4);
Expand Down Expand Up @@ -363,9 +357,8 @@ describe('config/validation', () => {
fileMatch: ['x?+'],
},
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(0);
expect(errors).toHaveLength(2);
expect(errors).toMatchSnapshot();
Expand Down Expand Up @@ -692,9 +685,8 @@ describe('config/validation', () => {
example2: 'https://www.example2.com/example',
},
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(0);
expect(errors).toHaveLength(0);
});
Expand All @@ -707,9 +699,8 @@ describe('config/validation', () => {
} as unknown as string, // intentional incorrect config to check error message
},
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(0);
expect(errors).toMatchObject([
{
Expand All @@ -727,9 +718,8 @@ describe('config/validation', () => {
example2: 'http://www.example.com',
},
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(0);
expect(errors).toMatchObject([
{
Expand Down Expand Up @@ -759,9 +749,8 @@ describe('config/validation', () => {
},
],
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(errors).toHaveLength(1);
expect(warnings).toHaveLength(1);
expect(errors).toMatchSnapshot();
Expand All @@ -779,9 +768,8 @@ describe('config/validation', () => {
},
},
} as never;
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(errors).toHaveLength(1);
expect(warnings).toHaveLength(0);
expect(errors).toMatchSnapshot();
Expand All @@ -791,9 +779,8 @@ describe('config/validation', () => {
const config = {
hostType: 'npm',
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(errors).toHaveLength(0);
expect(warnings).toHaveLength(1);
expect(warnings).toMatchSnapshot();
Expand Down Expand Up @@ -869,9 +856,8 @@ describe('config/validation', () => {
example2: 'https://www.example2.com/example',
},
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(0);
expect(errors).toHaveLength(0);
});
Expand All @@ -883,9 +869,8 @@ describe('config/validation', () => {
example2: 123,
},
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(0);
expect(errors).toMatchObject([
{
Expand All @@ -900,9 +885,8 @@ describe('config/validation', () => {
const config = {
schedule: ['30 5 * * *'],
};
const { warnings, errors } = await configValidation.validateConfig(
config,
);
const { warnings, errors } =
await configValidation.validateConfig(config);
expect(warnings).toHaveLength(0);
expect(errors).toMatchObject([
{
Expand Down
15 changes: 6 additions & 9 deletions lib/modules/datasource/conan/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -91,9 +91,8 @@ export class ConanDatasource extends Datasource {
conanPackage.userAndChannel,
'/revisions',
);
const revisionRep = await this.http.getJson<ConanRevisionsJSON>(
revisionLookUp,
);
const revisionRep =
await this.http.getJson<ConanRevisionsJSON>(revisionLookUp);
const revisions = revisionRep?.body.revisions;
return revisions?.[0].revision ?? null;
}
Expand Down Expand Up @@ -180,19 +179,17 @@ export class ConanDatasource extends Datasource {
url,
`v2/conans/${conanPackage.conanName}/${latestVersion}/${conanPackage.userAndChannel}/latest`,
);
const revResp = await this.http.getJson<ConanRevisionJSON>(
latestRevisionUrl,
);
const revResp =
await this.http.getJson<ConanRevisionJSON>(latestRevisionUrl);
const packageRev = revResp.body.revision;

const [user, channel] = conanPackage.userAndChannel.split('/');
const packageUrl = joinUrlParts(
`${groups.host}/artifactory/api/storage/${groups.repo}`,
`${user}/${conanPackage.conanName}/${latestVersion}/${channel}/${packageRev}/export/conanfile.py?properties=conan.package.url`,
);
const packageUrlResp = await this.http.getJson<ConanProperties>(
packageUrl,
);
const packageUrlResp =
await this.http.getJson<ConanProperties>(packageUrl);

if (
packageUrlResp.body.properties &&
Expand Down
5 changes: 2 additions & 3 deletions lib/modules/datasource/cpan/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,8 @@ export class CpanDatasource extends Datasource {
deprecated: isDeprecated,
maturity,
} = hit;
const version = module.find(
({ name }) => name === packageName,
)?.version;
const version = module.find(({ name }) => name === packageName)
?.version;
if (version) {
// https://metacpan.org/pod/CPAN::DistnameInfo#maturity
const isStable = maturity === 'released';
Expand Down
4 changes: 2 additions & 2 deletions lib/modules/datasource/go/releases-direct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,8 @@ export class GoDirectDatasource extends Datasource {
}

if (res.releases) {
res.releases = res.releases.filter((release) =>
release.version?.startsWith('v'),
res.releases = res.releases.filter(
(release) => release.version?.startsWith('v'),
);
}

Expand Down
5 changes: 2 additions & 3 deletions lib/modules/datasource/nuget/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ export function parseRegistryUrl(registryUrl: string): ParsedRegistryUrl {
return { feedUrl: registryUrl, protocolVersion: null };
}
let protocolVersion = 2;
const protocolVersionMatch = protocolVersionRegExp.exec(
parsedUrl.hash,
)?.groups;
const protocolVersionMatch = protocolVersionRegExp.exec(parsedUrl.hash)
?.groups;
if (protocolVersionMatch) {
const { protocol } = protocolVersionMatch;
parsedUrl.hash = '';
Expand Down
10 changes: 4 additions & 6 deletions lib/modules/datasource/terraform-provider/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,8 @@ export class TerraformProviderDatasource extends TerraformDatasource {
const repository = TerraformProviderDatasource.getRepository({
packageName,
});
const serviceDiscovery = await this.getTerraformServiceDiscoveryResult(
registryUrl,
);
const serviceDiscovery =
await this.getTerraformServiceDiscoveryResult(registryUrl);

if (registryUrl === this.defaultRegistryUrls[0]) {
return await this.queryRegistryExtendedApi(
Expand Down Expand Up @@ -220,9 +219,8 @@ export class TerraformProviderDatasource extends TerraformDatasource {
}

// check public or private Terraform registry
const serviceDiscovery = await this.getTerraformServiceDiscoveryResult(
registryURL,
);
const serviceDiscovery =
await this.getTerraformServiceDiscoveryResult(registryURL);
if (!serviceDiscovery) {
logger.trace(`Failed to retrieve service discovery from ${registryURL}`);
return null;
Expand Down
10 changes: 4 additions & 6 deletions lib/modules/manager/asdf/upgradeable-tooling.ts
Original file line number Diff line number Diff line change
Expand Up @@ -297,19 +297,17 @@ export const upgradeableTooling: Record<string, ToolingDefinition> = {
currentValue: semeruJreMatches.version,
};
}
const temurinJdkMatches = version.match(
/^temurin-(?<version>\d\S+)/,
)?.groups;
const temurinJdkMatches = version.match(/^temurin-(?<version>\d\S+)/)
?.groups;
if (temurinJdkMatches) {
return {
datasource: JavaVersionDatasource.id,
packageName: 'java-jdk',
currentValue: temurinJdkMatches.version,
};
}
const temurinJreMatches = version.match(
/^temurin-jre-(?<version>\d\S+)/,
)?.groups;
const temurinJreMatches = version.match(/^temurin-jre-(?<version>\d\S+)/)
?.groups;
if (temurinJreMatches) {
return {
datasource: JavaVersionDatasource.id,
Expand Down
10 changes: 8 additions & 2 deletions lib/modules/manager/bazel-module/bazelrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,17 @@ const spaceRegex = regEx(`\\s+`);

export class ImportEntry {
readonly entryType = 'import';
constructor(readonly path: string, readonly isTry: boolean) {}
constructor(
readonly path: string,
readonly isTry: boolean,
) {}
}

export class BazelOption {
constructor(readonly name: string, readonly value?: string) {}
constructor(
readonly name: string,
readonly value?: string,
) {}

static parse(input: string): BazelOption[] {
const options: BazelOption[] = [];
Expand Down
5 changes: 2 additions & 3 deletions lib/modules/manager/composer/schema.ts
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,8 @@ export const ComposerExtract = z

const gitRepo = gitRepos[depName];
if (gitRepo) {
const bitbucketMatchGroups = bitbucketUrlRegex.exec(
gitRepo.url,
)?.groups;
const bitbucketMatchGroups = bitbucketUrlRegex.exec(gitRepo.url)
?.groups;

if (bitbucketMatchGroups) {
dep.datasource = BitbucketTagsDatasource.id;
Expand Down
14 changes: 4 additions & 10 deletions lib/modules/manager/dockerfile/extract.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,8 @@ describe('modules/manager/dockerfile/extract', () => {
});

it('handles from as', () => {
const res = extractPackageFile(
'FROM node:8.9.0-alpine as base\n',
'',
{},
)?.deps;
const res = extractPackageFile('FROM node:8.9.0-alpine as base\n', '', {})
?.deps;
expect(res).toEqual([
{
autoReplaceStringTemplate:
Expand Down Expand Up @@ -724,11 +721,8 @@ describe('modules/manager/dockerfile/extract', () => {
});

it('handles FROM without ARG default value', () => {
const res = extractPackageFile(
'ARG img_base\nFROM $img_base\n',
'',
{},
)?.deps;
const res = extractPackageFile('ARG img_base\nFROM $img_base\n', '', {})
?.deps;
expect(res).toEqual([
{
autoReplaceStringTemplate:
Expand Down
5 changes: 2 additions & 3 deletions lib/modules/manager/maven-wrapper/artifacts.ts
Original file line number Diff line number Diff line change
Expand Up @@ -176,9 +176,8 @@ function getExtraEnvOptions(deps: PackageDependency[]): ExtraEnv {
function getCustomMavenWrapperRepoUrl(
deps: PackageDependency[],
): string | null {
const replaceString = deps.find(
(dep) => dep.depName === 'maven-wrapper',
)?.replaceString;
const replaceString = deps.find((dep) => dep.depName === 'maven-wrapper')
?.replaceString;

if (!replaceString) {
return null;
Expand Down

0 comments on commit 6f8878b

Please sign in to comment.