@docupace/pipeline 1.0.82 → 1.0.83

package/README.md

@@ -133,4 +133,4 @@ dp-auth0-cli configureFromSite sourceSite targetSite dev prod true true true fal
 
 ## License
 
-ISC
+ISC

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docupace/pipeline",
-  "version": "1.0.82",
+  "version": "1.0.83",
   "main": "index.js",
   "type": "module",
   "bin": {

package/src/merge/cli-merge-all.js

@@ -3,6 +3,7 @@ import { readFileSync, existsSync, mkdirSync } from 'fs';
 import { join, dirname } from 'path';
 import { fileURLToPath } from 'url';
 import { getExistingPRsWithDescription } from './pr.js';
+import { BuildResults } from './common.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 
@@ -214,18 +215,22 @@ async function runPreparePhase(
 
     // Log result based on exit code
     switch (result.exitCode) {
-      case 0:
+      case BuildResults.success:
         console.log(`✅ ${configName}: Merge and build successful`);
         break;
-      case 2:
+      case BuildResults.unresolvedConflicts:
         console.log(`⚠️ ${configName}: Merge has unresolved conflicts`);
         break;
-      case 3:
+      case BuildResults.buildFailed:
         console.log(`⚠️ ${configName}: Build failed`);
         break;
-      case 4:
+      case BuildResults.noChanges:
         console.log(`✅ ${configName}: No Changes`);
         break;
+      case BuildResults.changeLogsExist:
+        console.log(`❌ Stopping Merge`);
+        process.exit(1);
+        break;
       default:
         console.log(
           `❌ ${configName}: Unknown error (exit code: ${result.exitCode})`,
@@ -428,6 +433,15 @@ async function mergeAll(verbose = false) {
         verbose,
       );
 
+      if (
+        branchResult.success &&
+        branchResult.summary.successes > 0 &&
+        i < config.mergeBranches.length - 1
+      ) {
+        console.log('Pausing before next merge');
+        await new Promise((res) => setTimeout(res, 90000));
+      }
+
       if (!branchResult.success) {
         console.log(`Exiting due to failure of one or more merges`);
         process.exit(1);

package/src/merge/cli-merge.js

@@ -3,6 +3,7 @@ import { createBitbucketPR } from './pr.js';
 import { autoResolveConflicts } from './cli-resolve.js';
 import { getPackageNames } from '../changeset/package-util.js';
 import { writeChangesetFile } from '../changeset/create.js';
+import { BuildResults } from './common.js';
 
 /**
  * Create and checkout merge branch from target branch
@@ -216,9 +217,27 @@ function mergeIntoTarget(
       stdio: verbose ? 'inherit' : 'pipe',
     });
 
-    execSync(`git branch -d ${mergeBranchName}`, {
-      stdio: verbose ? 'inherit' : 'pipe',
-    });
+    // Delete local merge branch
+    try {
+      execSync(`git branch -d ${mergeBranchName}`, {
+        stdio: 'pipe',
+      });
+      if (verbose)
+        console.log(`🗑️  Deleted local merge branch: ${mergeBranchName}`);
+    } catch {
+      // Branch doesn't exist, which is fine
+    }
+
+    // Delete remote merge branch
+    try {
+      execSync(`git push origin --delete ${mergeBranchName}`, {
+        stdio: 'pipe',
+      });
+      if (verbose)
+        console.log(`🗑️  Deleted remote merge branch: ${mergeBranchName}`);
+    } catch (e) {
+      console.error('Failed to delete remote branch', e);
+    }
 
     if (verbose) console.log(`✅ Successfully merged into ${targetBranch}`);
   } else {
@@ -269,6 +288,62 @@ function cleanupFailedMerge(verbose = false) {
   }
 }
 
+/**
+ * Check if source branch has uncommitted changesets
+ */
+function checkForUncommittedChangesets(sourceBranch, verbose = false) {
+  if (verbose)
+    console.log(`🔍 Checking for uncommitted changesets in ${sourceBranch}`);
+
+  // Store current branch
+  const currentBranch = execSync('git branch --show-current', {
+    encoding: 'utf8',
+    stdio: 'pipe',
+  }).trim();
+
+  try {
+    // Checkout source branch
+
+    execSync(`git checkout ${sourceBranch}`, {
+      stdio: 'pipe',
+    });
+
+    execSync(`git pull`, {
+      stdio: verbose ? 'inherit' : 'pipe',
+    });
+
+    // Check for .md files in .changeset directory (excluding README.md)
+    try {
+      const changesetFiles = execSync(
+        'find .changeset -name "*.md" -not -name "README.md" 2>/dev/null | head -1',
+        {
+          encoding: 'utf8',
+          stdio: 'pipe',
+        },
+      ).trim();
+
+      if (changesetFiles) {
+        console.log(
+          `❌ Cannot merge a branch where version has not been bumped. Found changesets in ${sourceBranch}`,
+        );
+        process.exit(BuildResults.changeLogsExist);
+      }
+    } catch (error) {
+      if (error.message.includes('Cannot merge')) {
+        throw error;
+      }
+      // If find command fails (no .changeset directory), that's fine
+    }
+
+    if (verbose) console.log('✅ No uncommitted changesets found');
+  } finally {
+    // Return to original branch
+    execSync(`git checkout ${currentBranch}`, {
+      stdio: 'pipe',
+    });
+  }
+}
+
 export function setupMerge(program) {
   program
     .command('merge')
@@ -306,6 +381,11 @@ export function setupMerge(program) {
           );
         }
 
+        // Check for uncommitted changesets in source branch
+        if (!mergeFail && !mergeSuccess) {
+          checkForUncommittedChangesets(sourceBranch, verbose);
+        }
+
         // 1. Create merge branch from target branch
         const mergeBranchName = createMergeBranch(
           sourceBranch,
@@ -327,7 +407,7 @@ export function setupMerge(program) {
             console.log('✅ No changes to merge');
             execSync(`git checkout ${targetBranch}`, { stdio: 'pipe' });
             execSync(`git branch -d ${mergeBranchName}`, { stdio: 'pipe' });
-            process.exit(4);
+            process.exit(BuildResults.noChanges);
           }
 
           // 4. If conflicts, try auto-resolve
@@ -378,7 +458,7 @@ export function setupMerge(program) {
               console.log(
                 `⚠️  Merge completed with unresolved conflicts on branch: ${mergeBranchName}`,
               );
-              process.exit(2);
+              process.exit(BuildResults.unresolvedConflicts);
             }
 
             console.log(
@@ -420,9 +500,9 @@ export function setupMerge(program) {
               });
             }
             if (buildPassed) {
-              process.exit(0);
+              process.exit(BuildResults.success);
             } else {
-              process.exit(3);
+              process.exit(BuildResults.buildFailed);
             }
           } else {
             // 6e) Build failed, dev mode, or prepare-only - create PR

package/src/merge/common.js

@@ -0,0 +1,7 @@
+export const BuildResults = {
+  success: 0,
+  unresolvedConflicts: 2,
+  buildFailed: 3,
+  noChanges: 4,
+  changeLogsExist: 5,
+};