gtx-cli 2.5.30-alpha.8 → 2.5.30

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 2.5.30
+
+### Patch Changes
+
+- [#896](https://github.com/generaltranslation/gt/pull/896) [`443ee73`](https://github.com/generaltranslation/gt/commit/443ee73395a514eec448b03810cb871062bf5b2a) Thanks [@brian-lou](https://github.com/brian-lou)! - Fix dry-run error conditions
+
 ## 2.5.29
 
 ### Patch Changes

package/dist/cli/commands/setupProject.js

@@ -4,14 +4,14 @@ import { noLocalesError, noDefaultLocaleError, noApiKeyError, noProjectIdError,
 import { collectFiles } from '../../formats/files/collectFiles.js';
 import { setupProject } from '../../workflow/setupProject.js';
 export async function handleSetupProject(options, settings, library) {
+    if (!settings.locales) {
+        return logErrorAndExit(noLocalesError);
+    }
+    if (!settings.defaultLocale) {
+        return logErrorAndExit(noDefaultLocaleError);
+    }
     // Validate required settings are present if not in dry run
     if (!options.dryRun) {
-        if (!settings.locales) {
-            return logErrorAndExit(noLocalesError);
-        }
-        if (!settings.defaultLocale) {
-            return logErrorAndExit(noDefaultLocaleError);
-        }
         if (!settings.apiKey) {
             return logErrorAndExit(noApiKeyError);
         }

package/dist/cli/commands/stage.js

@@ -7,14 +7,14 @@ import updateConfig from '../../fs/config/updateConfig.js';
 import { TEMPLATE_FILE_ID } from '../../utils/constants.js';
 import { collectFiles } from '../../formats/files/collectFiles.js';
 export async function handleStage(options, settings, library, stage) {
+    if (!settings.locales) {
+        return logErrorAndExit(noLocalesError);
+    }
+    if (!settings.defaultLocale) {
+        return logErrorAndExit(noDefaultLocaleError);
+    }
     // Validate required settings are present if not in dry run
     if (!options.dryRun) {
-        if (!settings.locales) {
-            return logErrorAndExit(noLocalesError);
-        }
-        if (!settings.defaultLocale) {
-            return logErrorAndExit(noDefaultLocaleError);
-        }
         if (!settings.apiKey) {
             return logErrorAndExit(noApiKeyError);
         }

package/dist/formats/files/collectFiles.js

@@ -12,9 +12,7 @@ export async function collectFiles(options, settings, library) {
     if (library === 'gt-react' || library === 'gt-next') {
         const updates = await aggregateReactTranslations(options, settings, library);
         if (updates.length > 0) {
-            if (!options.dryRun &&
-                !settings.publish &&
-                !settings.files?.placeholderPaths.gt) {
+            if (!settings.publish && !settings.files?.placeholderPaths.gt) {
                 logErrorAndExit(invalidConfigurationError);
             }
             // Convert updates to a file object

package/dist/fs/getPackageResource.d.ts

@@ -1,2 +1 @@
 export declare function fromPackageRoot(relative: string): string;
-export declare function fromBinariesRoot(relative: string): string;

package/dist/fs/getPackageResource.js

@@ -2,10 +2,5 @@ import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 export function fromPackageRoot(relative) {
-    console.log('fromPackageRoot __dirname' + __dirname);
     return path.resolve(__dirname, `../../`, relative);
 }
-export function fromBinariesRoot(relative) {
-    console.log('fromBinariesRoot __dirname' + __dirname);
-    return path.resolve(__dirname, `../`, relative);
-}

package/dist/main.d.ts

@@ -1 +1,2 @@
+#!/usr/bin/env node
 export {};

package/dist/main.js

@@ -1,3 +1,4 @@
+#!/usr/bin/env node
 import { main } from './index.js';
 import dotenv from 'dotenv';
 import { program } from 'commander';

package/dist/utils/packageJson.js

@@ -2,7 +2,7 @@ import { logger } from '../console/logger.js';
 import chalk from 'chalk';
 import path from 'node:path';
 import fs from 'node:fs';
-import { fromBinariesRoot, fromPackageRoot } from '../fs/getPackageResource.js';
+import { fromPackageRoot } from '../fs/getPackageResource.js';
 import { exitSync } from '../console/logging.js';
 // search for package.json such that we can run init in non-js projects
 export async function searchForPackageJson(cwd = process.cwd()) {
@@ -33,22 +33,14 @@ export async function getPackageJson(cwd = process.cwd()) {
     }
 }
 export function getCLIVersion() {
-    console.log('getCLIVersion');
-    let packageJsonPath = fromPackageRoot('package.json');
+    const packageJsonPath = fromPackageRoot('package.json');
     if (!fs.existsSync(packageJsonPath)) {
-        // Try binaries behavior instead
-        packageJsonPath = fromBinariesRoot('package.json');
-        if (!fs.existsSync(packageJsonPath)) {
-            return 'unknown';
-        }
+        return 'unknown';
     }
     try {
-        const result = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')).version;
-        console.log('CLI version: ' + result);
-        return result;
+        return JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')).version;
     }
     catch (error) {
-        console.log(chalk.red('Error getting CLI version: ' + String(error)));
         return 'unknown';
     }
 }

package/package.json

@@ -1,11 +1,10 @@
 {
   "name": "gtx-cli",
-  "version": "2.5.30-alpha.8",
+  "version": "2.5.30",
   "main": "dist/index.js",
-  "bin": "dist/router.js",
+  "bin": "dist/main.js",
   "files": [
     "dist",
-    "binaries",
     "CHANGELOG.md"
   ],
   "type": "module",
@@ -130,15 +129,9 @@
     "typescript": "^5.5.4"
   },
   "scripts": {
-    "build": "tsc && pnpm run build:exe",
-    "build:clean": "sh ../../scripts/clean.sh && rm -rf binaries && pnpm run build",
+    "build": "tsc",
+    "build:clean": "sh ../../scripts/clean.sh && pnpm run build",
     "build:release": "pnpm run build:clean",
-    "build:exe": "sh scripts/build-exe.sh all",
-    "build:exe:darwin-x64": "sh scripts/build-exe.sh darwin-x64",
-    "build:exe:darwin-arm64": "sh scripts/build-exe.sh darwin-arm64",
-    "build:exe:linux-x64": "sh scripts/build-exe.sh linux-x64",
-    "build:exe:linux-arm64": "sh scripts/build-exe.sh linux-arm64",
-    "build:exe:windows-x64": "sh scripts/build-exe.sh windows-x64",
     "lint": "eslint \"src/**/*.{js,ts}\" \"./**/__tests__/**/*.{js,ts}\"",
     "lint:fix": "eslint \"src/**/*.{js,ts}\" \"./**/__tests__/**/*.{js,ts}\" --fix",
     "test": "vitest run --config=./vitest.config.ts",
@@ -146,7 +139,6 @@
     "release": "pnpm run build:clean && pnpm publish",
     "release:alpha": "pnpm run build:clean && pnpm publish --tag alpha",
     "release:beta": "pnpm run build:clean && pnpm publish --tag beta",
-    "release:bin": "pnpm run build:clean && pnpm publish --tag bin",
     "release:latest": "pnpm run build:clean && pnpm publish --tag latest"
   }
 }

package/dist/router.d.ts

@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-export {};

package/dist/router.js

@@ -1,64 +0,0 @@
-#!/usr/bin/env node
-// Routes to proper binary based on platform
-import { spawn } from 'child_process';
-import { fileURLToPath } from 'url';
-import { dirname, join } from 'path';
-import { existsSync, chmodSync, statSync } from 'fs';
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-function detectPlatform() {
-    const platform = process.platform;
-    const arch = process.arch;
-    // Map Node.js platform/arch to our binary names
-    const platformMap = {
-        darwin: {
-            x64: 'gtx-cli-darwin-x64',
-            arm64: 'gtx-cli-darwin-arm64',
-        },
-        linux: {
-            x64: 'gtx-cli-linux-x64',
-            arm64: 'gtx-cli-linux-arm64',
-        },
-        win32: {
-            x64: 'gtx-cli-win32-x64.exe',
-        },
-    };
-    return platformMap[platform]?.[arch] || null;
-}
-function routeToBinary() {
-    const binaryName = detectPlatform();
-    if (!binaryName) {
-        return;
-    }
-    const binaryPath = join(__dirname, '..', 'binaries', binaryName);
-    if (!existsSync(binaryPath)) {
-        return;
-    }
-    // Check and fix execute permissions if needed (Unix-like systems only)
-    if (process.platform !== 'win32') {
-        try {
-            const stats = statSync(binaryPath);
-            const isExecutable = !!(stats.mode & parseInt('100', 8)); // Check owner execute bit
-            if (!isExecutable) {
-                chmodSync(binaryPath, 0o755); // Make executable
-            }
-        }
-        catch (error) {
-            // If we can't check/fix permissions, continue anyway
-            // The spawn might still work or give a more meaningful error
-        }
-    }
-    // Spawn the appropriate binary with all arguments
-    const child = spawn(binaryPath, process.argv.slice(2), {
-        stdio: 'inherit',
-    });
-    child.on('close', (code) => {
-        process.exit(code);
-    });
-    child.on('error', () => {
-        process.exit(1);
-    });
-    return;
-}
-// Entry point
-routeToBinary();