From 92477ae1c767d75cfc038c57eeac990aaa32f5a2 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Tue, 29 Mar 2022 09:01:14 +0200
Subject: [PATCH] fix: Revert "fix: resolve repoConfig.packageRules.extends
with repo config" (#14842)
---
lib/config/options/index.ts | 3 ++-
lib/workers/repository/init/merge.spec.ts | 28 +++++++----------------
lib/workers/repository/init/merge.ts | 7 ------
3 files changed, 10 insertions(+), 28 deletions(-)
diff --git a/lib/config/options/index.ts b/lib/config/options/index.ts
index a28240c12e..6fd3ef2a76 100644
--- a/lib/config/options/index.ts
+++ b/lib/config/options/index.ts
@@ -152,7 +152,8 @@ const options: RenovateOptions[] = [
},
{
name: 'extends',
- description: 'Configuration presets to use/extend.',
+ description:
+ 'Configuration presets to use/extend. Note: does not work if configured in config.js.',
stage: 'package',
type: 'array',
subType: 'string',
diff --git a/lib/workers/repository/init/merge.spec.ts b/lib/workers/repository/init/merge.spec.ts
index 464754b503..36c7a4076d 100644
--- a/lib/workers/repository/init/merge.spec.ts
+++ b/lib/workers/repository/init/merge.spec.ts
@@ -185,28 +185,16 @@ describe('workers/repository/init/merge', () => {
it('migrates nested config', async () => {
git.getFileList.mockResolvedValue(['renovate.json']);
fs.readLocalFile.mockResolvedValue('{}');
- migrateAndValidate.migrateAndValidate.mockImplementation((_, c) =>
- Promise.resolve({
- ...c,
- warnings: [],
- errors: [],
- })
- );
- migrate.migrateConfig.mockImplementation((c) => ({
+ migrateAndValidate.migrateAndValidate.mockResolvedValue({
+ warnings: [],
+ errors: [],
+ });
+ migrate.migrateConfig.mockReturnValueOnce({
isMigrated: true,
- migratedConfig: c,
- }));
- config.extends = [':automergeAll'];
- config.packageRules = [{ extends: ['monorepo:react'] }];
- const ret = await mergeRenovateConfig(config);
- expect(ret).toMatchObject({
- automerge: true,
- packageRules: [
- {
- matchSourceUrlPrefixes: ['https://github.com/facebook/react'],
- },
- ],
+ migratedConfig: {},
});
+ config.extends = [':automergeDisabled'];
+ expect(await mergeRenovateConfig(config)).toBeDefined();
});
it('continues if no errors', async () => {
git.getFileList.mockResolvedValue(['package.json', '.renovaterc.json']);
diff --git a/lib/workers/repository/init/merge.ts b/lib/workers/repository/init/merge.ts
index d603978a6b..701697a766 100644
--- a/lib/workers/repository/init/merge.ts
+++ b/lib/workers/repository/init/merge.ts
@@ -177,13 +177,6 @@ export async function mergeRenovateConfig(
];
delete returnConfig.extends;
}
- if (is.nonEmptyArray(returnConfig.packageRules)) {
- configFileParsed.packageRules = [
- ...returnConfig.packageRules,
- ...(configFileParsed.packageRules || []),
- ];
- delete returnConfig.packageRules;
- }
checkForRepoConfigError(repoConfig);
const migratedConfig = await migrateAndValidate(config, configFileParsed);
if (migratedConfig.errors.length) {
--
GitLab