gtx-cli 2.6.11 → 2.6.12

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.6.12
+
+### Patch Changes
+
+- [#992](https://github.com/generaltranslation/gt/pull/992) [`776a12f`](https://github.com/generaltranslation/gt/commit/776a12f5ac2fbc3bb832d96ca337fcbadbf1fd49) Thanks [@brian-lou](https://github.com/brian-lou)! - Enable branching for default; graceful fallback
+
 ## 2.6.11
 
 ### Patch Changes

package/dist/cli/flags.js

@@ -36,7 +36,8 @@ export function attachTranslateFlags(command) {
         .option('--experimental-clear-locale-dirs', 'Clear locale directories before downloading new translations', false)
         .option('--branch <branch>', 'Specify a custom branch to use for translations')
         .option('--disable-branch-detection', 'Disable additional branch detection and optimizations and use the manually specified branch', false)
-        .option('--enable-branching', 'Enable branching for the project', false) // disabled by default for now
+        .option('--enable-branching', 'Enable branching for the project')
+        .option('--no-enable-branching', 'Disable branching for the project')
         .option('--remote-name <name>', 'Specify a custom remote name to use for branch detection', DEFAULT_GIT_REMOTE_NAME);
     return command;
 }

package/dist/config/generateSettings.js

@@ -176,7 +176,7 @@ export async function generateSettings(flags, cwd = process.cwd()) {
     // Add branch options if not provided
     const branchOptions = mergedOptions.branchOptions || {};
     branchOptions.enabled =
-        flags.enableBranching ?? gtConfig.branchOptions?.enabled ?? false;
+        flags.enableBranching ?? gtConfig.branchOptions?.enabled ?? true;
     branchOptions.currentBranch =
         flags.branch ?? gtConfig.branchOptions?.currentBranch ?? undefined;
     branchOptions.autoDetectBranches = flags.disableBranchDetection

package/dist/generated/version.d.ts

@@ -1 +1 @@
-export declare const PACKAGE_VERSION = "2.6.11";
+export declare const PACKAGE_VERSION = "2.6.12";

package/dist/generated/version.js

@@ -1,2 +1,2 @@
 // This file is auto-generated. Do not edit manually.
-export const PACKAGE_VERSION = '2.6.11';
+export const PACKAGE_VERSION = '2.6.12';

package/dist/workflow/BranchStep.js

@@ -84,13 +84,15 @@ export class BranchStep extends WorkflowStep {
                 }
                 catch (error) {
                     if (error instanceof ApiError && error.code === 403) {
-                        logger.error('Failed to create branch. To enable branching, please upgrade your plan.');
                         // retry with default branch
-                        const createBranchResult = await this.gt.createBranch({
-                            branchName: 'main', // name doesn't matter for default branch
-                            defaultBranch: true,
-                        });
-                        this.branchData.currentBranch = createBranchResult.branch;
+                        try {
+                            const createBranchResult = await this.gt.createBranch({
+                                branchName: 'main', // name doesn't matter for default branch
+                                defaultBranch: true,
+                            });
+                            this.branchData.currentBranch = createBranchResult.branch;
+                        }
+                        catch { }
                     }
                 }
             }
@@ -98,6 +100,9 @@ export class BranchStep extends WorkflowStep {
                 this.branchData.currentBranch = currentBranch;
             }
         }
+        if (this.branchData.currentBranch.id === '') {
+            return logErrorAndExit('Something went wrong while resolving branch information. Please try again.');
+        }
         // Now set the incoming and checked out branches (first one that exists)
         this.branchData.incomingBranch =
             incoming

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gtx-cli",
-  "version": "2.6.11",
+  "version": "2.6.12",
   "main": "dist/index.js",
   "bin": "dist/main.js",
   "files": [