fix: resolve repoConfig.packageRules.extends with repo config

[anomiex]

Changes

Redo #14688, working around the undocumented setting thing from #14827.

Context

Closes #14974

Documentation (please check one with an [x])

• I have updated the documentation, or
• No documentation update is required

How I've tested my work (please tick one)

I have verified these changes via:

• Code inspection only, or
• Newly added/modified unit tests, or
• No unit tests but ran on a real repository, or
• Both unit tests + ran on a real repository

[viceice]

needs test case(s) to validate that the bug for sourceUrl never happen again.

[anomiex]

It turns out that's easier said than done, because the tests for the merge module unconditionally mock the migrate-validate module that's responsible for actually throwing the error.

I've added a test that checks that the mocked migrateAndValidate function wasn't passed the packageRules. If you know of a better way to test it, feel free to contribute.

[viceice]

I'm not sure here 🤷‍♂️

[viceice]

@rarkins I'm still not sure about side effects here.

[rarkins]

Same here. Let's try to step back:

The problem here is that an extends array within packageRules within config.js doesn't get resolved. If it's present within a renovate.json then it does.

This happens because:

• extends values are "lazily" resolved, meaning not during global init but instead waiting until repo init
• we are resolving extends within repo config before merging it with global config, meaning they are missed out

We already have a bit of a hack to copy extends from the root of global config into the repo config before resolving it, but extends within packageRules - or anywhere else non-root will be missed out.

So would this change work instead?

diff --git a/lib/workers/repository/init/merge.ts b/lib/workers/repository/init/merge.ts
index 1ead00699..4ad24befa 100644
--- a/lib/workers/repository/init/merge.ts
+++ b/lib/workers/repository/init/merge.ts
@@ -249,6 +249,7 @@ export async function mergeRenovateConfig(
     delete resolvedConfig.hostRules;
   }
   returnConfig = mergeChildConfig(returnConfig, resolvedConfig);
+  returnConfig = await presets.resolveConfigPresets(returnConfig, config);
   returnConfig.renovateJsonPresent = true;
   // istanbul ignore if
   if (returnConfig.ignorePaths?.length) {

[anomiex]

So would this change work instead?

It does for my use case. Updated the PR to use that.

[viceice]

🤷‍♂️

[anomiex]

@rarkins The auto-merge isn't happening for some reason?

[viceice]

@rarkins The auto-merge isn't happening for some reason?

press the button:

[renovate-release]

🎉 This PR is included in version 32.84.3 🎉

The release is available on:

• GitHub release
• 32.84.3

Your semantic-release bot 📦🚀