cistack 3.2.0 → 4.0.0

package/src/generators/release.js

@@ -13,7 +13,9 @@ class ReleaseGenerator {
     this.config = config;             // full detected + merged stack config
     this.projectPath = projectPath;
     this.primaryLang = (config.languages && config.languages[0]) || { name: 'JavaScript', packageManager: 'npm', nodeVersion: '20' };
+    this.lockFiles = new Set(config.lockFiles || []);
     this.extraConfig = config._config || {}; // raw cistack.config.js
+    this.defaultBranch = config.defaultBranch || config.currentBranch || null;
   }
 
   generate() {
@@ -25,12 +27,12 @@ class ReleaseGenerator {
     const nodeVersion = lang.nodeVersion || '20';
 
     const runCmd = (script) =>
-      pm === 'yarn' ? `yarn ${script}` : pm === 'pnpm' ? `pnpm ${script}` : `npm run ${script}`;
+      pm === 'yarn' ? `yarn run ${script}` : pm === 'pnpm' ? `pnpm run ${script}` : pm === 'bun' ? `bun run ${script}` : `npm run ${script}`;
 
     const installCmd =
-      pm === 'npm'   ? 'npm ci' :
-      pm === 'yarn'  ? 'yarn install --frozen-lockfile' :
-      pm === 'pnpm'  ? 'pnpm install --frozen-lockfile' :
+      pm === 'npm'   ? (this.lockFiles.has('package-lock.json') ? 'npm ci' : 'npm install') :
+      pm === 'yarn'  ? (this.lockFiles.has('yarn.lock') ? 'yarn install --frozen-lockfile' : 'yarn install') :
+      pm === 'pnpm'  ? (this.lockFiles.has('pnpm-lock.yaml') ? 'pnpm install --frozen-lockfile' : 'pnpm install') :
                        'bun install';
 
     // ── common setup steps ────────────────────────────────────────────────
@@ -41,13 +43,16 @@ class ReleaseGenerator {
     if (pm === 'pnpm') {
       setupSteps.push({ name: 'Install pnpm', uses: 'pnpm/action-setup@v3', with: { version: 'latest' } });
     }
+    if (pm === 'bun') {
+      setupSteps.push({ name: 'Set up Bun', uses: 'oven-sh/setup-bun@v2', with: { 'bun-version': 'latest' } });
+    }
 
     setupSteps.push({
       name: 'Set up Node.js',
       uses: 'actions/setup-node@v4',
       with: {
         'node-version': nodeVersion,
-        cache: pm === 'yarn' ? 'yarn' : pm === 'pnpm' ? 'pnpm' : 'npm',
+        cache: pm === 'yarn' ? 'yarn' : pm === 'pnpm' ? 'pnpm' : pm === 'npm' ? 'npm' : undefined,
         ...(this.release.publishToNpm ? { 'registry-url': 'https://registry.npmjs.org' } : {}),
       },
     });
@@ -83,7 +88,7 @@ class ReleaseGenerator {
             name: 'Create Release PR or Publish',
             uses: 'changesets/action@v1',
             with: {
-              publish: runCmd('release'),
+              publish: this.release.command || runCmd('release'),
               title: 'chore: version packages',
               commit: 'chore: version packages',
             },
@@ -139,7 +144,7 @@ class ReleaseGenerator {
       default: {
         releaseSteps.push({
           name: '🚀 Release',
-          run: this.release.command || 'npm run release',
+          run: this.release.command || runCmd('release'),
           env: envVars,
         });
       }
@@ -149,7 +154,7 @@ class ReleaseGenerator {
       ? `# Required secrets: ${requiredSecrets.filter((s) => s !== 'GITHUB_TOKEN').join(', ')}\n# Add these at: Settings → Secrets and Variables → Actions\n\n`
       : '';
 
-    const branches = (this.extraConfig.branches) || ['main', 'master'];
+    const branches = this._resolveBranches(['main', 'master']);
 
     const workflow = {
       name: 'Release',
@@ -166,8 +171,8 @@ class ReleaseGenerator {
         release: {
           name: `🏷️ Release (${tool})`,
           'runs-on': 'ubuntu-latest',
-          // Only run on the default branch, not every push in a monorepo etc.
-          if: "github.ref == 'refs/heads/main' || github.ref == 'refs/heads/master'",
+          // Only run on the configured branches, not every push in a monorepo etc.
+          if: branches.map(b => `github.ref == 'refs/heads/${b}'`).join(' || '),
           steps: [...setupSteps, ...releaseSteps],
         },
       },
@@ -190,6 +195,16 @@ class ReleaseGenerator {
         raw,
     };
   }
+
+  _resolveBranches(fallback) {
+    if (Array.isArray(this.extraConfig.branches) && this.extraConfig.branches.length > 0) {
+      return [...new Set(this.extraConfig.branches)];
+    }
+    if (this.defaultBranch) {
+      return [this.defaultBranch];
+    }
+    return fallback;
+  }
 }
 
 module.exports = ReleaseGenerator;