fix: assign config.force after every mergeChildConfig

lib/config/index.js

@@ -180,7 +180,7 @@ function mergeChildConfig(parent, child) {
       );
     }
   }
-  return config;
+  return Object.assign(config, config.force);
 }
 
 function filterConfig(inputConfig, targetStage) {

lib/util/package-rules.js

@@ -2,7 +2,6 @@ const minimatch = require('minimatch');
 
 const versioning = require('../versioning');
 const { mergeChildConfig } = require('../config');
-const { applyForceConfig } = require('../workers/repository/init/force');
 
 module.exports = {
   applyPackageRules,
@@ -134,5 +133,5 @@ function applyPackageRules(inputConfig) {
       delete config.matchCurrentVersion;
     }
   });
-  return applyForceConfig(config);
+  return config;
 }

lib/workers/repository/init/force.js

-const { mergeChildConfig } = require('../../../config');
-
-function applyForceConfig(input) {
-  let config = { ...input };
-  if (config.force && Object.keys(config.force).length) {
-    logger.debug('Applying forced config');
-    config = mergeChildConfig(config, config.force);
-    config.packageRules = config.packageRules || [];
-    config.packageRules.push({
-      ...config.force,
-      packagePatterns: ['.*'],
-    });
-  }
-  return config;
-}
-
-module.exports = {
-  applyForceConfig,
-};

lib/workers/repository/init/index.js

@@ -4,7 +4,6 @@ const { initApis } = require('../init/apis');
 const { checkBaseBranch } = require('./base');
 const { mergeRenovateConfig } = require('./config');
 const { detectSemanticCommits } = require('./semantic');
-const { applyForceConfig } = require('./force');
 
 async function initRepo(input) {
   let config = {
@@ -17,7 +16,6 @@ async function initRepo(input) {
   config = await initApis(config);
   config = await checkOnboardingBranch(config);
   config = await mergeRenovateConfig(config);
-  config = await applyForceConfig(config);
   checkIfConfigured(config);
   config = await checkBaseBranch(config);
   config.semanticCommits = await detectSemanticCommits(config);

test/workers/repository/init/__snapshots__/force.spec.js.snap

-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`workers/repository/init/flatten flattenPackageRules() forces 1`] = `
-Object {
-  "a": 2,
-  "b": 2,
-  "force": Object {
-    "a": 2,
-    "b": 2,
-  },
-  "packageRules": Array [
-    Object {
-      "a": 2,
-      "b": 2,
-      "packagePatterns": Array [
-        ".*",
-      ],
-    },
-  ],
-}
-`;

test/workers/repository/init/force.spec.js

-const {
-  applyForceConfig,
-} = require('../../../../lib/workers/repository/init/force');
-
-describe('workers/repository/init/flatten', () => {
-  describe('flattenPackageRules()', () => {
-    it('returns empty', () => {
-      expect(applyForceConfig({})).toEqual({});
-    });
-    it('forces', () => {
-      const res = applyForceConfig({ a: 1, force: { a: 2, b: 2 } });
-      expect(res).toMatchSnapshot();
-      expect(res.a).toEqual(2);
-      expect(res.b).toEqual(2);
-    });
-  });
-});