cistack 5.3.0 → 5.5.0

package/README.md

@@ -89,6 +89,8 @@ By default, `cistack` now generates a single GitHub Actions workflow that combin
 
 Dependabot remains a separate file in `.github/dependabot.yml`, because it is not a GitHub Actions workflow.
 
+If you want preview deployments on Dependabot pull requests, add deployment credentials as Dependabot secrets too, not only Actions secrets. For Vercel, that means `VERCEL_TOKEN`, `VERCEL_ORG_ID`, and `VERCEL_PROJECT_ID`.
+
 ### Split mode
 
 If you prefer the old multi-file layout, set:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cistack",
-  "version": "5.3.0",
+  "version": "5.5.0",
   "description": "Automatically generate GitHub Actions CI/CD pipelines by analysing your codebase",
   "main": "src/index.js",
   "types": "index.d.ts",

package/src/generators/workflow.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const fs = require('fs');
+const path = require('path');
 const yaml = require('js-yaml');
 const { version } = require('../../package.json');
 
@@ -45,9 +47,6 @@ class WorkflowGenerator {
   }
 
   _detectRuntimeVersions() {
-    const fs = require('fs');
-    const path = require('path');
-
     // 1. Node.js
     if (!this.primaryLang.nodeVersion) {
       const nvmrcPath = path.join(this.projectPath, '.nvmrc');
@@ -204,7 +203,7 @@ class WorkflowGenerator {
             with: {
               uploadArtifacts: true,
               temporaryPublicStorage: true,
-              configPath: './.lighthouserc.json',
+              ...this._lighthouseActionConfig(),
             },
           },
         ],
@@ -422,7 +421,7 @@ class WorkflowGenerator {
     if (previewSteps.length > 0) {
       jobs.preview = {
         name: `✨ Deploy → ${h.name} (Preview)`,
-        if: "github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == github.repository",
+        if: "github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository",
         'runs-on': 'ubuntu-latest',
         environment: 'preview',
         steps: [
@@ -430,7 +429,7 @@ class WorkflowGenerator {
           ...previewSteps,
           {
             name: 'Comment PR',
-            if: 'always()',
+            if: "always() && github.actor != 'dependabot[bot]'",
             uses: 'actions/github-script@v7',
             with: {
               script: `
@@ -699,6 +698,11 @@ class WorkflowGenerator {
     return steps;
   }
 
+  _lighthouseActionConfig() {
+    const configPath = path.join(this.projectPath, '.lighthouserc.json');
+    return fs.existsSync(configPath) ? { configPath: './.lighthouserc.json' } : {};
+  }
+
   _stepInstallDeps(lang) {
     const pm = lang.packageManager;
     if (pm === 'npm')     return { name: 'Install dependencies', run: this.lockFiles.has('package-lock.json') ? 'npm ci' : 'npm install' };

package/tests/run.js

@@ -494,6 +494,64 @@ test('Frontend Lighthouse is omitted when no build job exists', () => {
   assert(!parsed.jobs.lighthouse);
 });
 
+test('Lighthouse job does not require .lighthouserc.json when the file is absent', () => {
+  const projectDir = makeTempDir();
+  writeFiles(projectDir, {
+    'package.json': json({
+      name: 'lighthouse-default-app',
+      version: '1.0.0',
+      scripts: {
+        build: 'echo build',
+      },
+    }),
+  });
+
+  const generator = new WorkflowGenerator(
+    makeJsProject({
+      frameworks: [{ name: 'React', confidence: 1, buildDir: 'dist' }],
+    }),
+    projectDir
+  );
+
+  const parsed = parseWorkflow(generator._buildCIWorkflow());
+  const lighthouseStep = parsed.jobs.lighthouse.steps.find((step) => step.name === 'Run Lighthouse on build output');
+
+  assert(lighthouseStep);
+  assert(!('configPath' in lighthouseStep.with));
+});
+
+test('Lighthouse job uses .lighthouserc.json when the file exists', () => {
+  const projectDir = makeTempDir();
+  writeFiles(projectDir, {
+    'package.json': json({
+      name: 'lighthouse-config-app',
+      version: '1.0.0',
+      scripts: {
+        build: 'echo build',
+      },
+    }),
+    '.lighthouserc.json': json({
+      ci: {
+        collect: {
+          numberOfRuns: 1,
+        },
+      },
+    }),
+  });
+
+  const generator = new WorkflowGenerator(
+    makeJsProject({
+      frameworks: [{ name: 'React', confidence: 1, buildDir: 'dist' }],
+    }),
+    projectDir
+  );
+
+  const parsed = parseWorkflow(generator._buildCIWorkflow());
+  const lighthouseStep = parsed.jobs.lighthouse.steps.find((step) => step.name === 'Run Lighthouse on build output');
+
+  assert.equal(lighthouseStep.with.configPath, './.lighthouserc.json');
+});
+
 test('E2E jobs fall back to existing jobs instead of depending on a missing build job', () => {
   const projectDir = makeTempDir();
   const generator = new WorkflowGenerator(
@@ -560,7 +618,7 @@ test('Netlify preview configuration uses the detected production branch instead
   assert.equal(previewStep.with['production-branch'], 'release');
 });
 
-test('Preview deploy jobs only run for same-repo pull requests with secrets access', () => {
+test('Preview deploy jobs run for same-repo pull requests, including Dependabot PRs', () => {
   const projectDir = makeTempDir();
   writeFiles(projectDir, {
     'package.json': json({
@@ -582,11 +640,13 @@ test('Preview deploy jobs only run for same-repo pull requests with secrets acce
 
   const deploy = generator.generate().find((workflow) => workflow.filename === 'deploy.yml');
   const parsed = parseWorkflow(deploy.content);
+  const commentStep = parsed.jobs.preview.steps.find((step) => step.name === 'Comment PR');
 
   assert.equal(
     parsed.jobs.preview.if,
-    "github.event_name == 'pull_request' && github.actor != 'dependabot[bot]' && github.event.pull_request.head.repo.full_name == github.repository"
+    "github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository"
   );
+  assert.equal(commentStep.if, "always() && github.actor != 'dependabot[bot]'");
 });
 
 test('Generic JavaScript builds no longer upload a fake dist artifact when no build directory is known', () => {