renovate/renovate
1
0
Fork 0
mirror of https://github.com/renovatebot/renovate.git synced 2025-01-13 15:36:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

fix(package-rules): add groupSlug to matched package rule if necessary (#10621)

Browse source 
* fix(package-rules): add groupSlug to matched package rule if necessary

* Update lib/util/package-rules.spec.ts

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>

Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
This commit is contained in:
Rhys Arkins 2021-06-27 10:01:06 +02:00 committed by GitHub
parent 3be44469bb
commit 248d7c7719
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/util/package-rules.spec.ts
View file

@ -714,4 +714,23 @@ describe('applyPackageRules()', () => {
applyPackageRules({ ...config1, packageRules: null })
).toMatchSnapshot();
});
it('creates groupSlug if necessary', () => {
const config: TestConfig = {
depName: 'foo',
packageRules: [
{
matchPackagePatterns: ['*'],
groupName: 'A',
groupSlug: 'a',
},
{
matchPackagePatterns: ['*'],
groupName: 'B',
},
],
};
const res = applyPackageRules(config);
expect(res.groupSlug).toEqual('b');
});
});

10
lib/util/package-rules.ts
View file

@ -1,5 +1,6 @@
import is from '@sindresorhus/is';
import minimatch from 'minimatch';
import slugify from 'slugify';
import { mergeChildConfig } from '../config';
import type { PackageRule, PackageRuleInputConfig } from '../config/types';
import { logger } from '../logger';
@ -262,7 +263,14 @@ export function applyPackageRules<T extends PackageRuleInputConfig>(
// This rule is considered matched if there was at least one positive match and no negative matches
if (matchesRule(config, packageRule)) {
// Package rule config overrides any existing config
config = mergeChildConfig(config, packageRule);
const toApply = { ...packageRule };
if (config.groupSlug && packageRule.groupName && !packageRule.groupSlug) {
// Need to apply groupSlug otherwise the existing one will take precedence
toApply.groupSlug = slugify(packageRule.groupName, {
lower: true,
});
}
config = mergeChildConfig(config, toApply);
delete config.matchPackageNames;
delete config.matchPackagePatterns;
delete config.matchPackagePrefixes;