feat: apply group settings when only one update is present

docs/usage/configuration-options.md

@@ -1999,6 +1999,8 @@ For example, to group all non-major devDependencies updates together into a sing
   <br>
   Lock file maintenance will never be grouped with other dependency updates.
 
+## `groupSingleUpdates`
+
 ## `groupSlug`
 
 By default, Renovate will "slugify" the groupName to determine the branch name.

lib/config/options/index.ts

@@ -2579,6 +2579,15 @@ const options: Readonly<RenovateOptions>[] = [
     mergeable: true,
     advancedUse: true,
   },
+  {
+    name: 'groupSingleUpdates',
+    description:
+      'Apply group settings even when the group contains only one update.',
+    type: 'boolean',
+    default: false,
+    cli: false,
+    env: false,
+  },
   // Pull Request options
   {
     name: 'labels',

lib/config/types.ts

@@ -102,6 +102,7 @@ export interface RenovateSharedConfig {
   gitIgnoredAuthors?: string[];
   group?: GroupConfig;
   groupName?: string;
+  groupSingleUpdates?: boolean;
   groupSlug?: string;
   hashedBranchLength?: number;
   ignoreDeps?: string[];

lib/workers/repository/updates/generate.spec.ts

@@ -49,6 +49,101 @@ describe('workers/repository/updates/generate', () => {
       expect(res.minimumGroupSize).toBe(1);
     });
 
+    it('uses group settings for single upgrade when groupSingleUpdates is true', () => {
+      const branch = [
+        {
+          manager: 'some-manager',
+          branchName: 'some-branch',
+          depName: 'some-dep',
+          groupName: 'some-group',
+          prTitle: 'some-title',
+          releaseTimestamp: '2017-02-07T20:01:41+00:00' as Timestamp,
+          groupSingleUpdates: true,
+          group: {
+            foo: 2,
+          },
+        },
+      ] satisfies BranchUpgradeConfig[];
+      const res = generateBranchConfig(branch);
+      expect(res.groupName).toBe('some-group');
+      expect(res.isGroup).toBeTrue();
+      expect(res.recreateClosed).toBe(false);
+    });
+
+    it('uses group settings when same dep appears in multiple files and groupSingleUpdates is true', () => {
+      const branch = [
+        {
+          manager: 'some-manager',
+          branchName: 'some-branch',
+          depName: 'some-dep',
+          newVersion: '2.0.0',
+          groupName: 'some-group',
+          prTitle: 'some-title',
+          releaseTimestamp: '2017-02-07T20:01:41+00:00' as Timestamp,
+          groupSingleUpdates: true,
+          group: {
+            foo: 2,
+          },
+          packageFile: 'package.json',
+        },
+        {
+          manager: 'some-manager',
+          branchName: 'some-branch',
+          depName: 'some-dep',
+          newVersion: '2.0.0',
+          groupName: 'some-group',
+          prTitle: 'some-title',
+          releaseTimestamp: '2017-02-07T20:01:41+00:00' as Timestamp,
+          groupSingleUpdates: true,
+          group: {
+            foo: 2,
+          },
+          packageFile: 'packages/core/package.json',
+        },
+      ] satisfies BranchUpgradeConfig[];
+      const res = generateBranchConfig(branch);
+      expect(res.groupName).toBe('some-group');
+      expect(res.isGroup).toBeTrue();
+    });
+
+    it('does not group single upgrade when groupSingleUpdates is false', () => {
+      const branch = [
+        {
+          manager: 'some-manager',
+          branchName: 'some-branch',
+          depName: 'some-dep',
+          groupName: 'some-group',
+          prTitle: 'some-title',
+          releaseTimestamp: '2017-02-07T20:01:41+00:00' as Timestamp,
+          groupSingleUpdates: false,
+          group: {
+            foo: 2,
+          },
+        },
+      ] satisfies BranchUpgradeConfig[];
+      const res = generateBranchConfig(branch);
+      expect(res.groupName).toBeUndefined();
+      expect(res.recreateClosed).toBe(false);
+    });
+
+    it('does not group single upgrade without groupName even with groupSingleUpdates', () => {
+      const branch = [
+        {
+          manager: 'some-manager',
+          branchName: 'some-branch',
+          depName: 'some-dep',
+          prTitle: 'some-title',
+          releaseTimestamp: '2017-02-07T20:01:41+00:00' as Timestamp,
+          groupSingleUpdates: true,
+          group: {
+            foo: 2,
+          },
+        },
+      ] satisfies BranchUpgradeConfig[];
+      const res = generateBranchConfig(branch);
+      expect(res.groupName).toBeUndefined();
+    });
+
     it('handles lockFileMaintenance', () => {
       const branch = [
         {

lib/workers/repository/updates/generate.ts

@@ -275,7 +275,9 @@ export function generateBranchConfig(
   const typesGroup =
     depNames.length > 1 && !hasGroupName && isTypesGroup(branchUpgrades);
   logger.trace(`groupEligible: ${groupEligible}`);
-  const useGroupSettings = hasGroupName && groupEligible;
+  const useGroupSettings =
+    hasGroupName &&
+    (groupEligible || branchUpgrades[0].groupSingleUpdates === true);
   logger.trace(`useGroupSettings: ${useGroupSettings}`);
   let releaseTimestamp: Timestamp;