Skip to content

Commit

Permalink
refactor(preset): update regexManagers: to customManagers: (#28979)
Browse files Browse the repository at this point in the history
  • Loading branch information
setchy committed May 13, 2024
1 parent b5908cf commit 2bec323
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 7 deletions.
2 changes: 1 addition & 1 deletion docs/usage/.pages
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ nav:
- 'Noise Reduction': 'noise-reduction.md'
- 'Upgrade best practices': 'upgrade-best-practices.md'
- Included Presets:
- 'Custom Manager Presets': 'presets-customManagers.md'
- 'Default Presets': 'presets-default.md'
- 'Docker Presets': 'presets-docker.md'
- 'Full Config Presets': 'presets-config.md'
Expand All @@ -41,7 +42,6 @@ nav:
- 'npm Presets': 'presets-npm.md'
- 'Package Presets': 'presets-packages.md'
- 'Preview Presets': 'presets-preview.md'
- 'Regex Manager Presets': 'presets-regexManagers.md'
- 'Replacement Presets': 'presets-replacements.md'
- 'Schedule Presets': 'presets-schedule.md'
- 'Security Presets': 'presets-security.md'
Expand Down
2 changes: 1 addition & 1 deletion docs/usage/configuration-options.md
Original file line number Diff line number Diff line change
Expand Up @@ -703,7 +703,7 @@ For template fields, use the triple brace `{{{ }}}` notation to avoid Handlebars

<!-- prettier-ignore -->
!!! tip
Look at our [Regex Manager Presets](./presets-regexManagers.md), they may have what you need.
Look at our [Custom Manager Presets](./presets-customManagers.md), they may have what you need.

### customType

Expand Down
11 changes: 11 additions & 0 deletions lib/config/presets/common.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,17 @@ export const removedPresets: Record<string, string | null> = {
'github>whitesource/merge-confidence:beta': 'mergeConfidence:all-badges',
'replacements:messageFormat-{{package}}-to-@messageformat/{{package}}':
'replacements:messageFormat-to-scoped',
'regexManagers:biomeVersions': 'customManagers:biomeVersions',
'regexManagers:bitbucketPipelinesVersions':
'customManagers:bitbucketPipelinesVersions',
'regexManagers:dockerfileVersions': 'customManagers:dockerfileVersions',
'regexManagers:githubActionsVersions': 'customManagers:githubActionsVersions',
'regexManagers:gitlabPipelineVersions':
'customManagers:gitlabPipelineVersions',
'regexManagers:helmChartYamlAppVersions':
'customManagers:helmChartYamlAppVersions',
'regexManagers:mavenPropertyVersions': 'customManagers:mavenPropertyVersions',
'regexManagers:tfvarsVersions': 'customManagers:tfvarsVersions',
};

const renamedMonorepos: Record<string, string> = {
Expand Down
8 changes: 8 additions & 0 deletions lib/config/presets/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1062,6 +1062,14 @@ describe('config/presets/index', () => {
`);
});

it('handles renamed regexManagers presets', async () => {
const res = await presets.getPreset(
'regexManagers:dockerfileVersions',
{},
);
expect(res.customManagers).toHaveLength(1);
});

it('gets linters', async () => {
const res = await presets.getPreset('packages:linters', {});
expect(res).toMatchSnapshot();
Expand Down
2 changes: 1 addition & 1 deletion lib/config/presets/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ export function parsePreset(input: string): ParsedPreset {
const presetsPackages = [
'compatibility',
'config',
'customManagers',
'default',
'docker',
'group',
Expand All @@ -157,7 +158,6 @@ export function parsePreset(input: string): ParsedPreset {
'npm',
'packages',
'preview',
'regexManagers',
'replacements',
'schedule',
'security',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { codeBlock } from 'common-tags';
import { regexMatches } from '../../../../test/util';
import { extractPackageFile } from '../../../modules/manager/custom/regex';
import { presets } from './regex-managers';
import { presets } from './custom-managers';

describe('config/presets/internal/regex-managers', () => {
describe('config/presets/internal/custom-managers', () => {
describe('Update `$schema` version in biome.json', () => {
const customManager = presets['biomeVersions'].customManagers?.[0];

Expand Down
4 changes: 2 additions & 2 deletions lib/config/presets/internal/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { Preset, PresetConfig } from '../types';
import * as configPreset from './config';
import * as customManagersPreset from './custom-managers';
import * as defaultPreset from './default';
import * as dockerPreset from './docker';
import * as groupPreset from './group';
Expand All @@ -9,7 +10,6 @@ import * as monorepoPreset from './monorepo';
import * as npm from './npm';
import * as packagesPreset from './packages';
import * as previewPreset from './preview';
import * as regexManagersPreset from './regex-managers';
import * as replacements from './replacements';
import * as schedulePreset from './schedule';
import * as securityPreset from './security';
Expand All @@ -19,6 +19,7 @@ import * as workaroundsPreset from './workarounds';

export const groups: Record<string, Record<string, Preset>> = {
config: configPreset.presets,
customManagers: customManagersPreset.presets,
default: defaultPreset.presets,
docker: dockerPreset.presets,
group: groupPreset.presets,
Expand All @@ -28,7 +29,6 @@ export const groups: Record<string, Record<string, Preset>> = {
npm: npm.presets,
packages: packagesPreset.presets,
preview: previewPreset.presets,
regexManagers: regexManagersPreset.presets,
replacements: replacements.presets,
schedule: schedulePreset.presets,
security: securityPreset.presets,
Expand Down

0 comments on commit 2bec323

Please sign in to comment.