Exit with an error on invalid change files (#986)

microsoft · Sep 10, 2024 · f313e50 · f313e50
1 parent 70e438c
commit f313e50
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 23 deletions.
diff --git a/change/beachball-d1d64636-b7a3-490c-80a1-af0e305a05ca.json b/change/beachball-d1d64636-b7a3-490c-80a1-af0e305a05ca.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "Exit with an error on invalid change files",
+  "packageName": "beachball",
+  "email": "[email protected]",
+  "dependentChangeType": "patch"
+}
diff --git a/src/validation/validate.ts b/src/validation/validate.ts
@@ -113,29 +113,6 @@ export function validate(
     hasError = true; // the helper logs this
   }
 
-  if (hasError) {
-    // If any of the above basic checks failed, it doesn't make sense to check if change files are needed
-    process.exit(1);
-  }
-
-  let isChangeNeeded = false;
-
-  if (allowFetching) {
-    // This has the side effect of fetching, so call it even if !allowMissingChangeFiles for now
-    isChangeNeeded = isChangeFileNeeded(options, packageInfos);
-
-    if (isChangeNeeded && !allowMissingChangeFiles) {
-      logValidationError('Change files are needed!');
-      console.log(options.changehint);
-      process.exit(1); // exit here (this is the main poin)
-    }
-
-    if (options.disallowDeletedChangeFiles && areChangeFilesDeleted(options)) {
-      logValidationError('Change files must not be deleted!');
-      process.exit(1);
-    }
-  }
-
   const changeSet = readChangeFiles(options, packageInfos);
 
   for (const { changeFile, change } of changeSet) {
@@ -161,6 +138,29 @@ export function validate(
     }
   }
 
+  if (hasError) {
+    // If any of the above basic checks failed, it doesn't make sense to check if change files are needed
+    process.exit(1);
+  }
+
+  let isChangeNeeded = false;
+
+  if (allowFetching) {
+    // This has the side effect of fetching, so call it even if !allowMissingChangeFiles for now
+    isChangeNeeded = isChangeFileNeeded(options, packageInfos);
+
+    if (isChangeNeeded && !allowMissingChangeFiles) {
+      logValidationError('Change files are needed!');
+      console.log(options.changehint);
+      process.exit(1); // exit here (this is the main poin)
+    }
+
+    if (options.disallowDeletedChangeFiles && areChangeFilesDeleted(options)) {
+      logValidationError('Change files must not be deleted!');
+      process.exit(1);
+    }
+  }
+
   if (!isChangeNeeded) {
     console.log('\nValidating package dependencies...');
     // TODO: It would be preferable if this could be done without getting the full bump info,