gtx-cli 1.2.24-alpha.6 → 1.2.24

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # gtx-cli
 
+## 1.2.24
+
+### Patch Changes
+
+- [#358](https://github.com/generaltranslation/gt/pull/358) [`b0ea226`](https://github.com/generaltranslation/gt/commit/b0ea226310abb04ef5aa9ef1af23ee37b9e18cd1) Thanks [@brian-lou](https://github.com/brian-lou)! - Release Locadex (Beta) version
+
 ## 1.2.23
 
 ### Patch Changes

package/dist/cli/base.js

@@ -14,6 +14,7 @@ import { installPackage } from '../utils/installPackage.js';
 import { getPackageManager } from '../utils/packageManager.js';
 import { retrieveCredentials, setCredentials } from '../utils/credentials.js';
 import { areCredentialsSet } from '../utils/credentials.js';
+import { validateConfigExists } from '../config/validateSettings.js';
 export class BaseCLI {
     library;
     additionalModules;
@@ -51,6 +52,7 @@ export class BaseCLI {
             .option('--dry-run', 'Dry run, does not send updates to General Translation API', false)
             .action(async (initOptions) => {
             displayHeader('Starting translation...');
+            validateConfigExists();
             const settings = await generateSettings(initOptions);
             const options = { ...initOptions, ...settings };
             await this.handleGenericTranslate(options);

package/dist/cli/react.js

@@ -13,6 +13,7 @@ import { stageProject } from '../translation/stage.js';
 import { createUpdates } from '../translation/parse.js';
 import { translate } from '../translation/translate.js';
 import updateConfig from '../fs/config/updateConfig.js';
+import { validateConfigExists } from '../config/validateSettings.js';
 const DEFAULT_TIMEOUT = 600;
 const pkg = 'gt-react';
 export class ReactCLI extends BaseCLI {
@@ -235,6 +236,7 @@ export class ReactCLI extends BaseCLI {
         await stageProject(options, pkg);
     }
     async handleTranslate(initOptions) {
+        validateConfigExists();
         const settings = await generateSettings(initOptions);
         // First run the base class's handleTranslate method
         const options = { ...initOptions, ...settings };

package/dist/config/validateSettings.d.ts

@@ -1,2 +1,3 @@
 import { Settings } from '../types/index.js';
 export declare function validateSettings(settings: Settings): void;
+export declare function validateConfigExists(): string | undefined;

package/dist/config/validateSettings.js

@@ -1,5 +1,6 @@
 import { isValidLocale, isSupersetLocale } from 'generaltranslation';
 import { logErrorAndExit } from '../console/logging.js';
+import fs from 'node:fs';
 export function validateSettings(settings) {
     // Validate locales
     for (const locale of settings.locales) {
@@ -18,3 +19,12 @@ export function validateSettings(settings) {
         logErrorAndExit(`defaultLocale: ${settings.defaultLocale} is a superset of another locale (${locale})! Please change the defaultLocale to a more specific locale.`);
     }
 }
+export function validateConfigExists() {
+    const possibleConfigPaths = ['gt.config.json', 'src/gt.config.json'];
+    for (const possibleConfigPath of possibleConfigPaths) {
+        if (fs.existsSync(possibleConfigPath)) {
+            return possibleConfigPath;
+        }
+    }
+    logErrorAndExit('No gt.config.json file found. Are you in the correct directory?');
+}

package/dist/setup/wizard.js

@@ -49,6 +49,10 @@ Please let us know what you would like to see supported at https://github.com/ge
         framework: frameworkType,
     });
     const packageJson = await getPackageJson();
+    if (!packageJson) {
+        logError(chalk.red('No package.json found in the current directory. Please run this command from the root of your project.'));
+        process.exit(1);
+    }
     // Check if gt-next or gt-react is installed
     if (frameworkType === 'next-app' &&
         !isPackageInstalled('gt-next', packageJson)) {

package/dist/utils/packageJson.d.ts

@@ -1,5 +1,5 @@
 export declare function searchForPackageJson(cwd?: string): Promise<Record<string, any> | null>;
-export declare function getPackageJson(cwd?: string): Promise<Record<string, any>>;
+export declare function getPackageJson(cwd?: string): Promise<Record<string, any> | null>;
 export declare function getCLIVersion(): string;
 export declare function updatePackageJson(packageJson: Record<string, any>, cwd?: string): Promise<void>;
 export declare function isPackageInstalled(packageName: string, packageJson: Record<string, any>, asDevDependency?: boolean, checkBoth?: boolean): boolean;

package/dist/utils/packageJson.js

@@ -2,7 +2,6 @@ import { logError } from '../console/logging.js';
 import chalk from 'chalk';
 import path from 'node:path';
 import fs from 'node:fs';
-import { logErrorAndExit } from '../console/logging.js';
 import { fromPackageRoot } from '../fs/getPackageResource.js';
 // search for package.json such that we can run init in non-js projects
 export async function searchForPackageJson(cwd = process.cwd()) {
@@ -23,14 +22,13 @@ export async function getPackageJson(cwd = process.cwd()) {
     const packageJsonPath = path.join(cwd, 'package.json');
     // Check if package.json exists
     if (!fs.existsSync(packageJsonPath)) {
-        logErrorAndExit(chalk.red('No package.json found in the current directory. Please run this command from the root of your project.'));
+        return null;
     }
     try {
         return JSON.parse(await fs.promises.readFile(packageJsonPath, 'utf8'));
     }
     catch (error) {
-        logError(chalk.red('Error parsing package.json: ' + String(error)));
-        process.exit(1);
+        return null;
     }
 }
 export function getCLIVersion() {

package/dist/utils/packageManager.js

@@ -23,6 +23,9 @@ export const BUN = {
     }),
     addOverride: async (pkgName, pkgVersion) => {
         const packageDotJson = await getPackageJson();
+        if (!packageDotJson) {
+            return;
+        }
         const overrides = packageDotJson.overrides || {};
         await updatePackageJson({
             ...packageDotJson,
@@ -54,6 +57,9 @@ export const DENO = {
     },
     addOverride: async (pkgName, pkgVersion) => {
         const packageDotJson = await getPackageJson();
+        if (!packageDotJson) {
+            return;
+        }
         const overrides = packageDotJson.overrides || {};
         await updatePackageJson({
             ...packageDotJson,
@@ -87,6 +93,9 @@ export const YARN_V1 = {
     },
     addOverride: async (pkgName, pkgVersion) => {
         const packageDotJson = await getPackageJson();
+        if (!packageDotJson) {
+            return;
+        }
         const resolutions = packageDotJson.resolutions || {};
         await updatePackageJson({
             ...packageDotJson,
@@ -121,6 +130,9 @@ export const YARN_V2 = {
     },
     addOverride: async (pkgName, pkgVersion) => {
         const packageDotJson = await getPackageJson();
+        if (!packageDotJson) {
+            return;
+        }
         const resolutions = packageDotJson.resolutions || {};
         await updatePackageJson({
             ...packageDotJson,
@@ -151,6 +163,9 @@ export const PNPM = {
     },
     addOverride: async (pkgName, pkgVersion) => {
         const packageDotJson = await getPackageJson();
+        if (!packageDotJson) {
+            return;
+        }
         const pnpm = packageDotJson.pnpm || {};
         const overrides = pnpm.overrides || {};
         await updatePackageJson({
@@ -185,6 +200,9 @@ export const NPM = {
     },
     addOverride: async (pkgName, pkgVersion) => {
         const packageDotJson = await getPackageJson();
+        if (!packageDotJson) {
+            return;
+        }
         const overrides = packageDotJson.overrides || {};
         await updatePackageJson({
             ...packageDotJson,

package/package.json

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