Merge remote-tracking branch 'origin/main' into setup-pkg-new

# Conflicts:
#	packages/create-cli/package.json

Author: BioPhoton

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 0.73.0 (2025-08-08)
+
+### 🚀 Features
+
+- **ci:** add searchCommits option to extend portal cache range ([0b14111f](https://github.com/code-pushup/cli/commit/0b14111f))
+
+### ❤️ Thank You
+
+- Matěj Chalk
+
 ## 0.72.1 (2025-08-06)
 
 ### 🩹 Fixes

eslint.config.js

@@ -1,4 +1,5 @@
 import nxEslintPlugin from '@nx/eslint-plugin';
+import jestExtendedPlugin from 'eslint-plugin-jest-extended';
 import jsoncParser from 'jsonc-eslint-parser';
 import tseslint from 'typescript-eslint';
 import node from '@code-pushup/eslint-config/node.js';
@@ -84,13 +85,19 @@ export default tseslint.config(
   },
   {
     files: ['**/*.test.ts', '**/*.spec.ts'],
+    plugins: { 'jest-extended': jestExtendedPlugin },
     rules: {
       'vitest/consistent-test-filename': [
         'warn',
         {
           pattern: String.raw`.*\.(bench|type|unit|int|e2e)\.test\.[tj]sx?$`,
         },
       ],
+      'jest-extended/prefer-to-be-array': 'warn',
+      'jest-extended/prefer-to-be-false': 'warn',
+      'jest-extended/prefer-to-be-object': 'warn',
+      'jest-extended/prefer-to-be-true': 'warn',
+      'jest-extended/prefer-to-have-been-called-once': 'warn',
     },
   },
   {

package-lock.json

@@ -22,7 +22,7 @@
     "node": ">=22.14"
   },
   "dependencies": {
-    "@code-pushup/portal-client": "^0.14.3",
+    "@code-pushup/portal-client": "^0.15.0",
     "@isaacs/cliui": "^8.0.2",
     "@nx/devkit": "19.8.13",
     "@poppinss/cliui": "6.4.1",
@@ -89,6 +89,7 @@
     "eslint-import-resolver-typescript": "^3.6.1",
     "eslint-plugin-functional": "^7.1.0",
     "eslint-plugin-import": "^2.31.0",
+    "eslint-plugin-jest-extended": "^3.0.0",
     "eslint-plugin-jest-formatting": "^3.1.0",
     "eslint-plugin-n": "^17.15.0",
     "eslint-plugin-promise": "^7.2.1",
@@ -99,6 +100,7 @@
     "globals": "^15.13.0",
     "husky": "^8.0.0",
     "inquirer": "^9.3.7",
+    "jest-extended": "^6.0.0",
     "jsdom": "~24.0.0",
     "jsonc-eslint-parser": "^2.4.0",
     "knip": "^5.33.3",

package.json

@@ -109,6 +109,7 @@ Optionally, you can override default options for further customization:
 | `logger`           | `Logger`                  | `console`                        | Logger for reporting progress and encountered problems                                                                                                   |
 | `skipComment`      | `boolean`                 | `false`                          | Toggles if comparison comment is posted to PR                                                                                                            |
 | `configPatterns`   | `ConfigPatterns \| null`  | `null`                           | Additional configuration which enables [faster CI runs](#faster-ci-runs-with-configpatterns)                                                             |
+| `searchCommits`    | `boolean \| number`       | `false`                          | If base branch has no cached report in portal, [extends search up to 100 recent commits](#search-latest-commits-for-previous-report)                     |
 
 [^1]: By default, the `code-pushup.config` file is autodetected as described in [`@code-pushup/cli` docs](../cli/README.md#configuration).
 
@@ -217,32 +218,6 @@ await runInCI(refs, api, {
 });
 ```
 
-### Faster CI runs with `configPatterns`
-
-By default, the `print-config` command is run sequentially for each project in order to reliably detect how `code-pushup` is configured - specifically, where to read output files from (`persist` config) and whether portal may be used as a cache (`upload` config). This allows for each project to be configured in its own way without breaking anything, but for large monorepos these extra `code-pushup print-config` executions can accumulate and significantly slow down CI pipelines.
-
-As a more scalable alternative, `configPatterns` may be provided. A user declares upfront how every project is configured, which allows `print-config` to be skipped. It's the user's responsibility to ensure this configuration holds for every project (it won't be checked). The `configPatterns` support string interpolation, substituting `{projectName}` with each project's name. Other than that, each project's `code-pushup.config` must have exactly the same `persist` and `upload` configurations.
-
-```ts
-await runInCI(refs, api, {
-  monorepo: true,
-  configPatterns: {
-    persist: {
-      outputDir: '.code-pushup/{projectName}',
-      filename: 'report',
-      format: ['json', 'md'],
-    },
-    // optional: will use portal as cache when comparing reports in PRs
-    upload: {
-      server: 'https://api.code-pushup.example.com/graphql',
-      apiKey: 'cp_...',
-      organization: 'example',
-      project: '{projectName}',
-    },
-  },
-});
-```
-
 ### Monorepo result
 
 In monorepo mode, the resolved object includes the merged diff at the top-level, as well as a list of projects.
@@ -273,3 +248,48 @@ if (result.mode === 'monorepo') {
   }
 }
 ```
+
+## Advanced usage
+
+### Faster CI runs with `configPatterns`
+
+By default, the `print-config` command is run sequentially for each project in order to reliably detect how `code-pushup` is configured - specifically, where to read output files from (`persist` config) and whether portal may be used as a cache (`upload` config). This allows for each project to be configured in its own way without breaking anything, but for large monorepos these extra `code-pushup print-config` executions can accumulate and significantly slow down CI pipelines.
+
+As a more scalable alternative, `configPatterns` may be provided. A user declares upfront how every project is configured, which allows `print-config` to be skipped. It's the user's responsibility to ensure this configuration holds for every project (it won't be checked). The `configPatterns` support string interpolation, substituting `{projectName}` with each project's name. Other than that, each project's `code-pushup.config` must have exactly the same `persist` and `upload` configurations.
+
+```ts
+await runInCI(refs, api, {
+  monorepo: true,
+  configPatterns: {
+    persist: {
+      outputDir: '.code-pushup/{projectName}',
+      filename: 'report',
+      format: ['json', 'md'],
+    },
+    // optional: will use portal as cache when comparing reports in PRs
+    upload: {
+      server: 'https://api.code-pushup.example.com/graphql',
+      apiKey: 'cp_...',
+      organization: 'example',
+      project: '{projectName}',
+    },
+  },
+});
+```
+
+### Search latest commits for previous report
+
+When comparing reports, the report for the base branch can be cached. If a project has an `upload` configuration, then the Portal API is queried for a report matching that commit. If no such report was uploaded, then the report is looked up in CI artifacts (implemented in `downloadReportArtifact` in [`ProviderApiClient`](#provider-api-client)). If there's no report to be found, then the base branch is checked and the previous report is collected.
+
+In some scenarios, there may not be a report for the latest commit in main branch, but some other recent commit may have a usable report - e.g. if `nxProjectsFilter` is used with `--affected` flag. In that case, the `searchCommits` option can be enabled. Then a limited number of recent commits in the main branch will be checked, but.
+
+```ts
+await runInCI(refs, api, {
+  monorepo: 'nx',
+  nxProjectsFilter: '--with-target=code-pushup --affected',
+  // checks 10 most recent commits by default
+  searchCommits: true,
+  // optionally, number of searched commits may be extended up to 100
+  // searchCommits: 30
+});
+```

packages/ci/README.md

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/ci",
-  "version": "0.72.1",
+  "version": "0.73.0",
   "description": "CI automation logic for Code PushUp (provider-agnostic)",
   "license": "MIT",
   "homepage": "https://github.com/code-pushup/cli/tree/main/packages/ci#readme",
@@ -26,9 +26,9 @@
   },
   "type": "module",
   "dependencies": {
-    "@code-pushup/models": "0.72.1",
-    "@code-pushup/portal-client": "^0.14.3",
-    "@code-pushup/utils": "0.72.1",
+    "@code-pushup/models": "0.73.0",
+    "@code-pushup/portal-client": "^0.15.0",
+    "@code-pushup/utils": "0.73.0",
     "glob": "^11.0.1",
     "simple-git": "^3.20.0",
     "yaml": "^2.5.1",

packages/ci/package.json

@@ -15,4 +15,8 @@ export const DEFAULT_SETTINGS: Settings = {
   nxProjectsFilter: '--with-target={task}',
   skipComment: false,
   configPatterns: null,
+  searchCommits: false,
 };
+
+export const MIN_SEARCH_COMMITS = 1;
+export const MAX_SEARCH_COMMITS = 100;

packages/ci/src/lib/constants.ts

@@ -31,7 +31,7 @@ describe('issues comparison', () => {
           },
         },
       ),
-    ).toBe(true);
+    ).toBeTrue();
   });
 
   it('should not match issues from different audits', () => {
@@ -63,7 +63,7 @@ describe('issues comparison', () => {
           },
         },
       ),
-    ).toBe(false);
+    ).toBeFalse();
   });
 
   it('should match issues based on adjusted line', () => {
@@ -97,7 +97,7 @@ describe('issues comparison', () => {
           },
         },
       ),
-    ).toBe(true);
+    ).toBeTrue();
   });
 
   it('should match issues from renamed files', () => {
@@ -124,7 +124,7 @@ describe('issues comparison', () => {
           },
         },
       ),
-    ).toBe(true);
+    ).toBeTrue();
   });
 
   it('should match issues based on adjusted line range', () => {
@@ -165,7 +165,7 @@ describe('issues comparison', () => {
           },
         },
       ),
-    ).toBe(true);
+    ).toBeTrue();
   });
 });
 

packages/ci/src/lib/issues.unit.test.ts

@@ -21,6 +21,7 @@ export type Options = {
   logger?: Logger;
   skipComment?: boolean;
   configPatterns?: ConfigPatterns | null;
+  searchCommits?: boolean | number;
 };
 
 /**

packages/ci/src/lib/models.ts

@@ -30,7 +30,7 @@ describe('npmHandler', () => {
         },
         MEMFS_VOLUME,
       );
-      await expect(npmHandler.isConfigured(options)).resolves.toBe(true);
+      await expect(npmHandler.isConfigured(options)).resolves.toBeTrue();
     });
 
     it('should NOT detect NPM workspaces when "workspaces" not set in package.json', async () => {
@@ -41,7 +41,7 @@ describe('npmHandler', () => {
         },
         MEMFS_VOLUME,
       );
-      await expect(npmHandler.isConfigured(options)).resolves.toBe(false);
+      await expect(npmHandler.isConfigured(options)).resolves.toBeFalse();
     });
 
     it("should NOT detect NPM workspaces when package-lock.json doesn't exist", async () => {
@@ -55,7 +55,7 @@ describe('npmHandler', () => {
         },
         MEMFS_VOLUME,
       );
-      await expect(npmHandler.isConfigured(options)).resolves.toBe(false);
+      await expect(npmHandler.isConfigured(options)).resolves.toBeFalse();
     });
   });