Merge branch 'main' into plugin-bundle-stats-poc

Author: BioPhoton

CHANGELOG.md

@@ -1,3 +1,34 @@
+## 0.69.5 (2025-07-11)
+
+### 🩹 Fixes
+
+- **plugin-js-packages:** include url for outdated packages in modern yarn ([297766d1](https://github.com/code-pushup/cli/commit/297766d1))
+- **plugin-js-packages:** include transitive dependencies in audit for modern yarn ([8e285e93](https://github.com/code-pushup/cli/commit/8e285e93))
+
+### ❤️ Thank You
+
+- Matěj Chalk
+
+## 0.69.4 (2025-07-09)
+
+### 🩹 Fixes
+
+- **plugin-js-packages:** parse yarn 4 audit output correctly ([8041d870](https://github.com/code-pushup/cli/commit/8041d870))
+
+### ❤️ Thank You
+
+- Matěj Chalk
+
+## 0.69.3 (2025-07-07)
+
+### 🩹 Fixes
+
+- **plugin-js-packages:** prevent negative scores in yarn v2+ workspaces ([b6f96330](https://github.com/code-pushup/cli/commit/b6f96330))
+
+### ❤️ Thank You
+
+- Matěj Chalk
+
 ## 0.69.2 (2025-06-16)
 
 ### 🩹 Fixes

README.md

@@ -16,6 +16,16 @@
 
 ---
 
+![Type safety](https://api.staging.code-pushup.dev/badges/code-pushup/cli/type-safety?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Bug prevention](https://api.staging.code-pushup.dev/badges/code-pushup/cli/bug-prevention?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Code style](https://api.staging.code-pushup.dev/badges/code-pushup/cli/code-style?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Code coverage](https://api.staging.code-pushup.dev/badges/code-pushup/cli/code-coverage?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Security](https://api.staging.code-pushup.dev/badges/code-pushup/cli/security?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Updates](https://api.staging.code-pushup.dev/badges/code-pushup/cli/updates?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+![Documentation](https://api.staging.code-pushup.dev/badges/code-pushup/cli/docs?apiKey=cp_def67c4efe558a9149061d0c62de893e1689ad793071db332790238446173fef)
+
+---
+
 ### 🔌 Code quality tools are like phone chargers. Everyone has a different plug.
 
 _Common problems with keeping track of technical quality:_

code-pushup.preset.ts

@@ -20,7 +20,9 @@ import {
 } from './packages/plugin-jsdocs/src/lib/constants.js';
 import { filterGroupsByOnlyAudits } from './packages/plugin-jsdocs/src/lib/utils.js';
 import lighthousePlugin, {
+  type LighthouseUrls,
   lighthouseGroupRef,
+  mergeLighthouseCategories,
 } from './packages/plugin-lighthouse/src/index.js';
 import typescriptPlugin, {
   type TypescriptPluginOptions,
@@ -135,11 +137,14 @@ export const jsPackagesCoreConfig = async (): Promise<CoreConfig> => ({
 });
 
 export const lighthouseCoreConfig = async (
-  url: string,
-): Promise<CoreConfig> => ({
-  plugins: [await lighthousePlugin(url)],
-  categories: lighthouseCategories,
-});
+  urls: LighthouseUrls,
+): Promise<CoreConfig> => {
+  const lhPlugin = await lighthousePlugin(urls);
+  return {
+    plugins: [lhPlugin],
+    categories: mergeLighthouseCategories(lhPlugin, lighthouseCategories),
+  };
+};
 
 export const jsDocsCoreConfig = (
   config: JsDocsPluginConfig | string[],

e2e/plugin-lighthouse-e2e/tests/__snapshots__/collect.e2e.test.ts.snap

@@ -77,6 +77,12 @@ exports[`PLUGIN collect report with lighthouse-plugin NPM package > should run p
           "title": "Document has a valid \`hreflang\`",
         },
       ],
+      "context": {
+        "urlCount": 1,
+        "weights": {
+          "1": 1,
+        },
+      },
       "groups": [
         {
           "refs": [

packages/ci/package.json

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

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/cli",
-  "version": "0.69.2",
+  "version": "0.69.5",
   "license": "MIT",
   "description": "A CLI to run all kinds of code quality measurements to align your team with company goals",
   "homepage": "https://code-pushup.dev",
@@ -45,9 +45,9 @@
     "node": ">=20"
   },
   "dependencies": {
-    "@code-pushup/models": "0.69.2",
-    "@code-pushup/core": "0.69.2",
-    "@code-pushup/utils": "0.69.2",
+    "@code-pushup/models": "0.69.5",
+    "@code-pushup/core": "0.69.5",
+    "@code-pushup/utils": "0.69.5",
     "yargs": "^17.7.2",
     "ansis": "^3.3.0",
     "simple-git": "^3.20.0"

packages/cli/src/lib/implementation/filter.middleware.ts

@@ -116,10 +116,13 @@ function applyPluginFilters(
   options: Pick<FilterOptions, 'skipPlugins' | 'onlyPlugins'>,
 ): CoreConfig['plugins'] {
   const { skipPlugins = [], onlyPlugins = [] } = options;
-  const filteredPlugins = filterPluginsFromCategories({
-    categories,
-    plugins,
-  });
+  const filteredPlugins =
+    onlyPlugins.length === 0
+      ? filterPluginsFromCategories({
+          categories,
+          plugins,
+        })
+      : plugins;
   if (skipPlugins.length === 0 && onlyPlugins.length === 0) {
     return filteredPlugins;
   }

packages/cli/src/lib/implementation/filter.middleware.unit.test.ts

@@ -414,6 +414,44 @@ describe('filterMiddleware', () => {
       ),
     );
   });
+
+  it('should allow onlyPlugins to include plugins not referenced by categories', () => {
+    const { plugins } = filterMiddleware({
+      plugins: [
+        {
+          slug: 'p1',
+          audits: [{ slug: 'a1-p1', isSkipped: false }],
+          groups: [
+            {
+              slug: 'g1-p1',
+              refs: [{ slug: 'a1-p1', weight: 1 }],
+              isSkipped: false,
+            },
+          ],
+        },
+        {
+          slug: 'p2',
+          audits: [{ slug: 'a1-p2', isSkipped: false }],
+          groups: [
+            {
+              slug: 'g1-p2',
+              refs: [{ slug: 'a1-p2', weight: 1 }],
+              isSkipped: false,
+            },
+          ],
+        },
+      ] as PluginConfig[],
+      categories: [
+        {
+          slug: 'c1',
+          refs: [{ type: 'group', plugin: 'p1', slug: 'g1-p1', weight: 1 }],
+        },
+      ] as CategoryConfig[],
+      onlyPlugins: ['p2'],
+    });
+
+    expect(plugins.map(plugin => plugin.slug)).toStrictEqual(['p2']);
+  });
 });
 
 describe('filterSkippedInPlugins', () => {

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/core",
-  "version": "0.69.2",
+  "version": "0.69.5",
   "license": "MIT",
   "description": "Core business logic for the used by the Code PushUp CLI",
   "homepage": "https://github.com/code-pushup/cli/tree/main/packages/core#readme",
@@ -39,8 +39,8 @@
   },
   "type": "module",
   "dependencies": {
-    "@code-pushup/models": "0.69.2",
-    "@code-pushup/utils": "0.69.2",
+    "@code-pushup/models": "0.69.5",
+    "@code-pushup/utils": "0.69.5",
     "ansis": "^3.3.0"
   },
   "peerDependencies": {

packages/create-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@code-pushup/create-cli",
-  "version": "0.69.2",
+  "version": "0.69.5",
   "license": "MIT",
   "bin": "index.js",
   "homepage": "https://github.com/code-pushup/cli/tree/main/packages/create-cli#readme",
@@ -26,7 +26,7 @@
   },
   "type": "module",
   "dependencies": {
-    "@code-pushup/nx-plugin": "0.69.2",
-    "@code-pushup/utils": "0.69.2"
+    "@code-pushup/nx-plugin": "0.69.5",
+    "@code-pushup/utils": "0.69.5"
   }
 }