Make consistent versions clearer

william2958 · william2958 · commit 615ed0b1e172 · 2024-06-18T17:30:48.000-07:00
diff --git a/libraries/rush-lib/src/api/RushConfiguration.ts b/libraries/rush-lib/src/api/RushConfiguration.ts
@@ -828,7 +828,7 @@ export class RushConfiguration {
     } else if (
       !this.subspacesFeatureEnabled &&
       rushConfigurationJson.ensureConsistentVersions !== undefined &&
-      this.defaultSubspace.getCommonVersions().ensureConsistentVersions
+      this.defaultSubspace.getCommonVersions().ensureConsistentVersions !== undefined
     ) {
       throw new Error(
         `When the ensureConsistentVersions config is defined in the ${RushConstants.rushJsonFilename} file, ` +
diff --git a/libraries/rush-lib/src/api/Subspace.ts b/libraries/rush-lib/src/api/Subspace.ts
@@ -276,10 +276,12 @@ export class Subspace {
    * @beta
    */
   public get shouldEnsureConsistentVersions(): boolean {
-    const subspaceEnsureConsistentVersions: boolean =
-      this.getCommonVersions().ensureConsistentVersions !== undefined;
-    if (this._rushConfiguration.subspacesFeatureEnabled || subspaceEnsureConsistentVersions) {
-      return subspaceEnsureConsistentVersions;
+    // If the subspaces feature is enabled, or the ensureConsistentVersions field is defined, return the value of the field
+    if (
+      this._rushConfiguration.subspacesFeatureEnabled &&
+      this.getCommonVersions().ensureConsistentVersions !== undefined
+    ) {
+      return !!this.getCommonVersions().ensureConsistentVersions;
     }
 
     // Fallback to ensureConsistentVersions in rush.json if subspaces is not enabled,
