@hubspot/cli 7.7.35-experimental.0 → 7.8.0-beta.0

package/lib/app/migrate.d.ts

@@ -12,18 +12,14 @@ export type MigrateAppArgs = CommonArgs & AccountArgs & EnvironmentArgs & Config
 export declare function getUnmigratableReason(reasonCode: string, projectName: string | undefined, accountId: number): string;
 export declare function generateFilterAppsByProjectNameFunction(projectConfig?: LoadedProjectConfig): (app: MigrationApp) => boolean;
 export declare function buildErrorMessageFromMigrationStatus(error: MigrationFailed): string;
-export declare function getHasMigratableThemes(projectConfig?: LoadedProjectConfig): Promise<{
-    hasMigratableThemes: boolean;
-    migratableThemesCount: number;
-}>;
 export declare function fetchMigrationApps(derivedAccountId: number, platformVersion: string, projectConfig?: LoadedProjectConfig): Promise<{
     migratableApps: MigratableApp[];
     unmigratableApps: UnmigratableApp[];
 }>;
-export declare function validateMigrationAppsAndThemes(appId: MigrateAppArgs['appId'], derivedAccountId: number, { migratableApps, unmigratableApps, }: {
+export declare function validateMigrationApps(appId: MigrateAppArgs['appId'], derivedAccountId: number, { migratableApps, unmigratableApps, }: {
     migratableApps: MigratableApp[];
     unmigratableApps: UnmigratableApp[];
-}, hasMigratableThemes: boolean, projectConfig?: LoadedProjectConfig): Promise<void>;
+}, projectConfig?: LoadedProjectConfig): Promise<void>;
 export declare function promptForAppToMigrate(allApps: MigrationApp[], derivedAccountId: number): Promise<number>;
 export declare function selectAppToMigrate(allApps: MigrationApp[], derivedAccountId: number, appId?: number): Promise<{
     proceed: boolean;
@@ -33,9 +29,7 @@ export declare function handleMigrationSetup(derivedAccountId: number, options:
     appIdToMigrate?: number | undefined;
     projectName?: string;
     projectDest?: string;
-    isThemesMigration?: boolean;
 }>;
-export declare function handleThemesMigration(projectConfig: LoadedProjectConfig, platformVersion: string): Promise<void>;
 export declare function beginAppMigration(derivedAccountId: number, appId: number, platformVersion: string): Promise<{
     migrationId: number;
     uidMap: Record<string, string>;

package/lib/app/migrate.js

@@ -2,7 +2,7 @@ import path from 'path';
 import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
 import { extractZipArchive } from '@hubspot/local-dev-lib/archive';
 import chalk from 'chalk';
-import { validateUid, migrateThemes, getProjectThemeDetails, } from '@hubspot/project-parsing-lib';
+import { validateUid } from '@hubspot/project-parsing-lib';
 import { UNMIGRATABLE_REASONS } from '@hubspot/local-dev-lib/constants/projects';
 import { mapToUserFacingType } from '@hubspot/project-parsing-lib/src/lib/transform.js';
 import { MIGRATION_STATUS } from '@hubspot/local-dev-lib/types/Migration';
@@ -10,19 +10,15 @@ import { downloadProject } from '@hubspot/local-dev-lib/api/projects';
 import { Separator } from '@inquirer/prompts';
 import { confirmPrompt, inputPrompt, listPrompt, } from '../prompts/promptUtils.js';
 import { uiAccountDescription, uiCommandReference, uiLine, uiLink, } from '../ui/index.js';
-import { writeProjectConfig } from '../projects/config.js';
 import { ensureProjectExists } from '../projects/ensureProjectExists.js';
 import SpinniesManager from '../ui/SpinniesManager.js';
 import { DEFAULT_POLLING_STATUS_LOOKUP, poll } from '../polling.js';
 import { checkMigrationStatusV2, CLI_UNMIGRATABLE_REASONS, continueAppMigration, initializeAppMigration, isMigrationStatus, listAppsForMigration, } from '../../api/migrate.js';
 import fs from 'fs';
 import { lib } from '../../lang/en.js';
-import { PROJECT_CONFIG_FILE } from '../constants.js';
 import { hasUnfiedAppsAccess } from '../hasFeature.js';
 import { getProjectBuildDetailUrl, getProjectDetailUrl, } from '../projects/urls.js';
 import { uiLogger } from '../ui/logger.js';
-import { debugError } from '../errorHandlers/index.js';
-import { useV3Api } from '../projects/platformVersion.js';
 export function getUnmigratableReason(reasonCode, projectName, accountId) {
     switch (reasonCode) {
         case UNMIGRATABLE_REASONS.UP_TO_DATE:
@@ -59,17 +55,6 @@ export function buildErrorMessageFromMigrationStatus(error) {
     })
         .join('\n\t- ')}`;
 }
-export async function getHasMigratableThemes(projectConfig) {
-    if (!projectConfig?.projectConfig?.name || !projectConfig?.projectDir) {
-        return { hasMigratableThemes: false, migratableThemesCount: 0 };
-    }
-    const projectSrcDir = path.resolve(projectConfig.projectDir, projectConfig.projectConfig.srcDir);
-    const { legacyThemeDetails, legacyReactThemeDetails } = await getProjectThemeDetails(projectSrcDir);
-    return {
-        hasMigratableThemes: legacyThemeDetails.length > 0 || legacyReactThemeDetails.length > 0,
-        migratableThemesCount: legacyThemeDetails.length + legacyReactThemeDetails.length,
-    };
-}
 export async function fetchMigrationApps(derivedAccountId, platformVersion, projectConfig) {
     const { data: { migratableApps, unmigratableApps }, } = await listAppsForMigration(derivedAccountId, platformVersion);
     const filteredMigratableApps = migratableApps.filter(generateFilterAppsByProjectNameFunction(projectConfig));
@@ -79,23 +64,11 @@ export async function fetchMigrationApps(derivedAccountId, platformVersion, proj
         unmigratableApps: filteredUnmigratableApps,
     };
 }
-export async function validateMigrationAppsAndThemes(appId, derivedAccountId, { migratableApps, unmigratableApps, }, hasMigratableThemes, projectConfig) {
+export async function validateMigrationApps(appId, derivedAccountId, { migratableApps, unmigratableApps, }, projectConfig) {
     const allApps = [...migratableApps, ...unmigratableApps];
     if (allApps.length > 1 && projectConfig) {
         throw new Error(lib.migrate.errors.project.multipleApps);
     }
-    if (hasMigratableThemes) {
-        if (useV3Api(projectConfig?.projectConfig?.platformVersion)) {
-            throw new Error(lib.migrate.errors.project.themesAlreadyMigrated);
-        }
-        if (allApps.length > 0 && projectConfig) {
-            throw new Error(lib.migrate.errors.project.themesAndAppsNotAllowed);
-        }
-        if (!projectConfig) {
-            throw new Error(lib.migrate.errors.project.noProjectForThemesMigration);
-        }
-        return;
-    }
     if (!projectConfig?.projectConfig) {
         allApps.forEach(app => {
             if (app.projectName) {
@@ -178,35 +151,20 @@ export async function handleMigrationSetup(derivedAccountId, options, projectCon
         text: lib.migrate.spinners.checkingForMigratableComponents,
     });
     const { name, dest, appId } = options;
-    const { hasMigratableThemes, migratableThemesCount } = await getHasMigratableThemes(projectConfig);
     const { migratableApps, unmigratableApps } = await fetchMigrationApps(derivedAccountId, options.platformVersion, projectConfig);
     SpinniesManager.remove('checkingForMigratableComponents');
-    await validateMigrationAppsAndThemes(appId, derivedAccountId, { migratableApps, unmigratableApps }, hasMigratableThemes, projectConfig);
+    await validateMigrationApps(appId, derivedAccountId, { migratableApps, unmigratableApps }, projectConfig);
     const allApps = [...migratableApps, ...unmigratableApps];
-    let proceed = false;
-    let appIdToMigrate;
-    if (hasMigratableThemes) {
-        uiLogger.log(lib.migrate.prompt.themesMigration(migratableThemesCount));
-        proceed = await confirmPrompt(lib.migrate.prompt.proceed, {
-            defaultAnswer: false,
-        });
-    }
-    else {
-        const appSelectionPrompt = await selectAppToMigrate(allApps, derivedAccountId, appId);
-        appIdToMigrate = appSelectionPrompt.appIdToMigrate;
-        proceed = appSelectionPrompt.proceed;
-    }
+    const { proceed, appIdToMigrate } = await selectAppToMigrate(allApps, derivedAccountId, appId);
     if (!proceed) {
         return {};
     }
     // If it's a project we don't want to prompt for dest and name, so just return early
-    // Theme migrations can only be initiated from the project directory
     if (projectConfig &&
         projectConfig?.projectConfig &&
         projectConfig?.projectDir) {
         return {
             appIdToMigrate,
-            isThemesMigration: hasMigratableThemes,
             projectName: projectConfig.projectConfig.name,
             projectDest: projectConfig.projectDir,
         };
@@ -231,35 +189,6 @@ export async function handleMigrationSetup(derivedAccountId, options, projectCon
         }));
     return { appIdToMigrate, projectName, projectDest };
 }
-export async function handleThemesMigration(projectConfig, platformVersion) {
-    if (!projectConfig?.projectDir || !projectConfig?.projectConfig?.srcDir) {
-        throw new Error(lib.migrate.errors.project.invalidConfig);
-    }
-    const projectSrcDir = path.resolve(projectConfig.projectDir, projectConfig.projectConfig.srcDir);
-    let migrated = false;
-    let failureReason;
-    try {
-        const migrationResult = await migrateThemes(projectConfig.projectDir, projectSrcDir);
-        migrated = migrationResult.migrated;
-        failureReason = migrationResult.failureReason;
-    }
-    catch (error) {
-        debugError(error);
-        throw new Error(lib.migrate.errors.project.failedToMigrateThemes);
-    }
-    if (!migrated) {
-        throw new Error(failureReason || lib.migrate.errors.project.failedToMigrateThemes);
-    }
-    const newProjectConfig = { ...projectConfig.projectConfig };
-    newProjectConfig.platformVersion = platformVersion;
-    const projectConfigPath = path.join(projectConfig.projectDir, PROJECT_CONFIG_FILE);
-    const success = writeProjectConfig(projectConfigPath, newProjectConfig);
-    if (!success) {
-        throw new Error(lib.migrate.errors.project.failedToUpdateProjectConfig);
-    }
-    uiLogger.log('');
-    uiLogger.log(lib.migrate.success.themesMigrationSuccess(platformVersion));
-}
 export async function beginAppMigration(derivedAccountId, appId, platformVersion) {
     SpinniesManager.add('beginningMigration', {
         text: lib.migrate.spinners.beginningMigration,
@@ -412,11 +341,7 @@ export async function migrateApp2025_2(derivedAccountId, options, projectConfig)
             throw new Error(lib.migrate.errors.project.doesNotExist(derivedAccountId));
         }
     }
-    const { appIdToMigrate, projectName, projectDest, isThemesMigration } = await handleMigrationSetup(derivedAccountId, options, projectConfig);
-    if (isThemesMigration) {
-        await handleThemesMigration(projectConfig, options.platformVersion);
-        return;
-    }
+    const { appIdToMigrate, projectName, projectDest } = await handleMigrationSetup(derivedAccountId, options, projectConfig);
     if (!appIdToMigrate || !projectName || !projectDest) {
         return;
     }

package/lib/app/migrate_legacy.js

@@ -1,5 +1,5 @@
 import { fetchPublicAppMetadata } from '@hubspot/local-dev-lib/api/appsDev';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from '../ui/logger.js';
 import { checkMigrationStatus, downloadProject, migrateApp as migrateNonProjectApp_v2023_2, } from '@hubspot/local-dev-lib/api/projects';
 import path from 'path';
 import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
@@ -9,7 +9,7 @@ import { promptUser } from '../prompts/promptUtils.js';
 import { ApiErrorContext, logError } from '../errorHandlers/index.js';
 import { EXIT_CODES } from '../enums/exitCodes.js';
 import { uiAccountDescription, uiLine, uiLink } from '../ui/index.js';
-import { i18n } from '../lang.js';
+import { commands } from '../../lang/en.js';
 import { isAppDeveloperAccount, isUnifiedAccount } from '../accountTypes.js';
 import { selectPublicAppForMigrationPrompt } from '../prompts/selectPublicAppForMigrationPrompt.js';
 import { projectNameAndDestPrompt } from '../prompts/projectNameAndDestPrompt.js';
@@ -42,9 +42,7 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
         const preventProjectMigrations = selectedApp.preventProjectMigrations;
         const listingInfo = selectedApp.listingInfo;
         if (preventProjectMigrations && listingInfo) {
-            logger.error(i18n(`commands.project.subcommands.migrateApp.errors.invalidApp`, {
-                appId,
-            }));
+            uiLogger.error(commands.project.migrateApp.errors.invalidApp(appId));
             return process.exit(EXIT_CODES.ERROR);
         }
     }
@@ -58,24 +56,22 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
         noLogs: true,
     });
     if (projectExists) {
-        throw new Error(i18n(`commands.project.subcommands.migrateApp.errors.projectAlreadyExists`, {
-            projectName,
-        }));
+        throw new Error(commands.project.migrateApp.errors.projectAlreadyExists(projectName));
     }
     await trackCommandMetadataUsage('migrate-app', { step: 'STARTED' }, derivedAccountId);
-    logger.log('');
+    uiLogger.log('');
     uiLine();
-    logger.warn(`${i18n(`commands.project.subcommands.migrateApp.warning.title`)}\n`);
-    logger.log(i18n(`commands.project.subcommands.migrateApp.warning.projectConversion`));
-    logger.log(`${i18n(`commands.project.subcommands.migrateApp.warning.appConfig`)}\n`);
-    logger.log(`${i18n(`commands.project.subcommands.migrateApp.warning.buildAndDeploy`)}\n`);
-    logger.log(`${i18n(`commands.project.subcommands.migrateApp.warning.existingApps`)}\n`);
-    logger.log(i18n(`commands.project.subcommands.migrateApp.warning.copyApp`));
+    uiLogger.warn(commands.project.migrateApp.warning.title);
+    uiLogger.log(commands.project.migrateApp.warning.projectConversion);
+    uiLogger.log(commands.project.migrateApp.warning.appConfig);
+    uiLogger.log(commands.project.migrateApp.warning.buildAndDeploy);
+    uiLogger.log(commands.project.migrateApp.warning.existingApps);
+    uiLogger.log(commands.project.migrateApp.warning.copyApp);
     uiLine();
     const { shouldCreateApp } = await promptUser({
         name: 'shouldCreateApp',
         type: 'confirm',
-        message: i18n(`commands.project.subcommands.migrateApp.createAppPrompt`),
+        message: commands.project.migrateApp.createAppPrompt,
     });
     process.stdin.resume();
     if (!shouldCreateApp) {
@@ -84,12 +80,12 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
     try {
         SpinniesManager.init();
         SpinniesManager.add('migrateApp', {
-            text: i18n(`commands.project.subcommands.migrateApp.migrationStatus.inProgress`),
+            text: commands.project.migrateApp.migrationStatus.inProgress(),
         });
         handleKeypress(async (key) => {
             if ((key.ctrl && key.name === 'c') || key.name === 'q') {
                 SpinniesManager.remove('migrateApp');
-                logger.log(i18n(`commands.project.subcommands.migrateApp.migrationInterrupted`));
+                uiLogger.log(commands.project.migrateApp.migrationInterrupted);
                 return process.exit(EXIT_CODES.SUCCESS);
             }
         });
@@ -104,20 +100,20 @@ export async function migrateApp2023_2(derivedAccountId, options, accountConfig)
             const { data: zippedProject } = await downloadProject(derivedAccountId, projectName, 1);
             await extractZipArchive(zippedProject, sanitizeFileName(projectName), path.resolve(absoluteDestPath), { includesRootDir: true, hideLogs: true });
             SpinniesManager.succeed('migrateApp', {
-                text: i18n(`commands.project.subcommands.migrateApp.migrationStatus.done`),
+                text: commands.project.migrateApp.migrationStatus.done(),
                 succeedColor: 'white',
             });
-            logger.log('');
+            uiLogger.log('');
             uiLine();
-            logger.success(i18n(`commands.project.subcommands.migrateApp.migrationStatus.success`));
-            logger.log('');
-            logger.log(uiLink(i18n(`commands.project.subcommands.migrateApp.projectDetailsLink`), `${baseUrl}/developer-projects/${derivedAccountId}/project/${encodeURIComponent(project.name)}`));
+            uiLogger.success(commands.project.migrateApp.migrationStatus.success());
+            uiLogger.log('');
+            uiLogger.log(uiLink(commands.project.migrateApp.projectDetailsLink, `${baseUrl}/developer-projects/${derivedAccountId}/project/${encodeURIComponent(project.name)}`));
             process.exit(EXIT_CODES.SUCCESS);
         }
     }
     catch (error) {
         SpinniesManager.fail('migrateApp', {
-            text: i18n(`commands.project.subcommands.migrateApp.migrationStatus.failure`),
+            text: commands.project.migrateApp.migrationStatus.failure(),
             failColor: 'white',
         });
         throw error;

package/lib/buildAccount.js

@@ -1,13 +1,12 @@
 import { getAccessToken, updateConfigWithAccessToken, } from '@hubspot/local-dev-lib/personalAccessKey';
 import { accountNameExistsInConfig, updateAccountConfig, writeConfig, getAccountId, } from '@hubspot/local-dev-lib/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from './ui/logger.js';
 import { createDeveloperTestAccount, fetchDeveloperTestAccountGateSyncStatus, generateDeveloperTestAccountPersonalAccessKey, } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
 import { createSandbox, createV2Sandbox, getSandboxPersonalAccessKey, } from '@hubspot/local-dev-lib/api/sandboxHubs';
 import { personalAccessKeyPrompt } from './prompts/personalAccessKeyPrompt.js';
 import { createDeveloperTestAccountConfigPrompt } from './prompts/createDeveloperTestAccountConfigPrompt.js';
-import { i18n } from './lang.js';
 import { cliAccountNamePrompt } from './prompts/accountNamePrompt.js';
 import SpinniesManager from './ui/SpinniesManager.js';
 import { debugError, logError } from './errorHandlers/index.js';
@@ -32,10 +31,8 @@ export async function saveAccountToConfig(accountId, accountName, env, personalA
         const invalidAccountName = accountNameExistsInConfig(nameForConfig);
         if (invalidAccountName) {
             if (!force) {
-                logger.log('');
-                logger.warn(i18n(`lib.prompts.accountNamePrompt.errors.accountNameExists`, {
-                    name: nameForConfig,
-                }));
+                uiLogger.log('');
+                uiLogger.warn(lib.prompts.accountNamePrompt.errors.accountNameExists(nameForConfig));
                 const { name: promptName } = await cliAccountNamePrompt(nameForConfig + `_${accountId}`);
                 validName = promptName;
             }
@@ -52,7 +49,7 @@ export async function saveAccountToConfig(accountId, accountName, env, personalA
         name: validName,
     });
     writeConfig();
-    logger.log('');
+    uiLogger.log('');
     return validName;
 }
 export async function createDeveloperTestAccountV3(parentAccountId, testAccountConfig) {
@@ -92,7 +89,7 @@ export async function buildDeveloperTestAccount(testAccountName, parentAccountCo
         accountName: testAccountName,
     };
     if (!parentAccountId) {
-        throw new Error(i18n(`lib.developerTestAccount.create.loading.fail`));
+        throw new Error(lib.developerTestAccount.create.loading.fail(''));
     }
     if (useV3) {
         testAccountConfig = await createDeveloperTestAccountConfigPrompt({
@@ -103,11 +100,9 @@ export async function buildDeveloperTestAccount(testAccountName, parentAccountCo
     SpinniesManager.init({
         succeedColor: 'white',
     });
-    logger.log('');
+    uiLogger.log('');
     SpinniesManager.add('buildDeveloperTestAccount', {
-        text: i18n(`lib.developerTestAccount.create.loading.add`, {
-            accountName: testAccountName,
-        }),
+        text: lib.developerTestAccount.create.loading.add(testAccountName),
     });
     let developerTestAccountId;
     let developerTestAccountPersonalAccessKey;
@@ -123,18 +118,13 @@ export async function buildDeveloperTestAccount(testAccountName, parentAccountCo
             developerTestAccountPersonalAccessKey = data.personalAccessKey;
         }
         SpinniesManager.succeed('buildDeveloperTestAccount', {
-            text: i18n(`lib.developerTestAccount.create.loading.succeed`, {
-                accountName: testAccountName,
-                accountId: developerTestAccountId,
-            }),
+            text: lib.developerTestAccount.create.loading.succeed(testAccountName, developerTestAccountId.toString()),
         });
     }
     catch (e) {
         debugError(e);
         SpinniesManager.fail('buildDeveloperTestAccount', {
-            text: i18n(`lib.developerTestAccount.create.loading.fail`, {
-                accountName: testAccountName,
-            }),
+            text: lib.developerTestAccount.create.loading.fail(testAccountName),
         });
         handleDeveloperTestAccountCreateError(e, parentAccountId, env, portalLimit);
     }
@@ -148,26 +138,20 @@ export async function buildDeveloperTestAccount(testAccountName, parentAccountCo
     return developerTestAccountId;
 }
 export async function buildSandbox(sandboxName, parentAccountConfig, sandboxType, env, force = false) {
-    let i18nKey;
-    if (sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) {
-        i18nKey = 'lib.sandbox.create.loading.standard';
-    }
-    else {
-        i18nKey = 'lib.sandbox.create.loading.developer';
-    }
+    const sandboxTypeKey = sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
+        ? 'standard'
+        : 'developer';
     const id = getAccountIdentifier(parentAccountConfig);
     const parentAccountId = getAccountId(id);
     if (!parentAccountId) {
-        throw new Error(i18n(`${i18nKey}.fail`));
+        throw new Error(lib.sandbox.create[sandboxTypeKey].loading.fail(''));
     }
     SpinniesManager.init({
         succeedColor: 'white',
     });
-    logger.log('');
+    uiLogger.log('');
     SpinniesManager.add('buildSandbox', {
-        text: i18n(`${i18nKey}.add`, {
-            accountName: sandboxName,
-        }),
+        text: lib.sandbox.create[sandboxTypeKey].loading.add(sandboxName),
     });
     let sandbox;
     try {
@@ -175,18 +159,13 @@ export async function buildSandbox(sandboxName, parentAccountConfig, sandboxType
         const { data } = await createSandbox(parentAccountId, sandboxName, sandboxApiType);
         sandbox = { name: sandboxName, ...data };
         SpinniesManager.succeed('buildSandbox', {
-            text: i18n(`${i18nKey}.succeed`, {
-                accountName: sandboxName,
-                accountId: sandbox.sandbox.sandboxHubId,
-            }),
+            text: lib.sandbox.create[sandboxTypeKey].loading.succeed(sandboxName, sandbox.sandbox.sandboxHubId.toString()),
         });
     }
     catch (e) {
         debugError(e);
         SpinniesManager.fail('buildSandbox', {
-            text: i18n(`${i18nKey}.fail`, {
-                accountName: sandboxName,
-            }),
+            text: lib.sandbox.create[sandboxTypeKey].loading.fail(sandboxName),
         });
         handleSandboxCreateError(e, env, sandboxName, parentAccountId);
     }
@@ -200,26 +179,20 @@ export async function buildSandbox(sandboxName, parentAccountConfig, sandboxType
     return sandbox;
 }
 export async function buildV2Sandbox(sandboxName, parentAccountConfig, sandboxType, syncObjectRecords, env, force = false) {
-    let i18nKey;
-    if (sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) {
-        i18nKey = 'lib.sandbox.create.loading.standard';
-    }
-    else {
-        i18nKey = 'lib.sandbox.create.loading.developer';
-    }
+    const sandboxTypeKey = sandboxType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
+        ? 'standard'
+        : 'developer';
     const id = getAccountIdentifier(parentAccountConfig);
     const parentAccountId = getAccountId(id);
     if (!parentAccountId) {
-        throw new Error(i18n(`${i18nKey}.fail`));
+        throw new Error(lib.sandbox.create[sandboxTypeKey].loading.fail(''));
     }
     SpinniesManager.init({
         succeedColor: 'white',
     });
-    logger.log('');
+    uiLogger.log('');
     SpinniesManager.add('buildV2Sandbox', {
-        text: i18n(`${i18nKey}.add`, {
-            accountName: sandboxName,
-        }),
+        text: lib.sandbox.create[sandboxTypeKey].loading.add(sandboxName),
     });
     let sandbox;
     let pak;
@@ -230,18 +203,13 @@ export async function buildV2Sandbox(sandboxName, parentAccountConfig, sandboxTy
         const { data: { personalAccessKey }, } = await getSandboxPersonalAccessKey(parentAccountId, sandbox.sandboxHubId);
         pak = personalAccessKey.encodedOAuthRefreshToken;
         SpinniesManager.succeed('buildV2Sandbox', {
-            text: i18n(`${i18nKey}.succeed`, {
-                accountName: sandboxName,
-                accountId: sandbox.sandboxHubId,
-            }),
+            text: lib.sandbox.create[sandboxTypeKey].loading.succeed(sandboxName, sandbox.sandboxHubId.toString()),
         });
     }
     catch (e) {
         debugError(e);
         SpinniesManager.fail('buildV2Sandbox', {
-            text: i18n(`${i18nKey}.fail`, {
-                accountName: sandboxName,
-            }),
+            text: lib.sandbox.create[sandboxTypeKey].loading.fail(sandboxName),
         });
         handleSandboxCreateError(e, env, sandboxName, parentAccountId);
     }

package/lib/commonOpts.d.ts

@@ -13,7 +13,7 @@ export declare function addTestingOptions(yargs: Argv): Argv;
 export declare function addUseEnvironmentOptions(yargs: Argv): Argv;
 export declare function addJSONOutputOptions(yargs: Argv): Argv;
 export declare function addCustomHelpOutput(yargs: Argv, command: string | string[], describe?: string): Promise<void>;
-export declare function setLogLevel(options: Arguments<{
+export declare function setCLILogLevel(options: Arguments<{
     debug?: boolean;
     networkDebug?: boolean;
     json?: boolean;

package/lib/commonOpts.js

@@ -1,19 +1,21 @@
 import chalk from 'chalk';
 import yargsParser from 'yargs-parser';
-import { LOG_LEVEL, logger, setLogLevel as setLoggerLogLevel, } from '@hubspot/local-dev-lib/logger';
+import { LOG_LEVEL, setLogLevel } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from './ui/logger.js';
 import { DEFAULT_CMS_PUBLISH_MODE, CMS_PUBLISH_MODE, } from '@hubspot/local-dev-lib/constants/files';
 import { getAccountConfig, getAndLoadConfigIfNeeded, } from '@hubspot/local-dev-lib/config';
 import { debugError } from './errorHandlers/index.js';
 import { EXIT_CODES } from './enums/exitCodes.js';
 import { uiCommandReference } from './ui/index.js';
-import { i18n } from './lang.js';
+import { lib } from '../lang/en.js';
 import { getTerminalUISupport, UI_COLORS } from './ui/index.js';
+import SpinniesManager from './ui/SpinniesManager.js';
 export function addGlobalOptions(yargs) {
     yargs.version(false);
     yargs.option('debug', {
         alias: 'd',
         default: false,
-        describe: i18n('lib.commonOpts.options.debug.describe'),
+        describe: lib.commonOpts.options.debug,
         type: 'boolean',
     });
     yargs.option('network-debug', {
@@ -26,21 +28,21 @@ export function addGlobalOptions(yargs) {
 export function addAccountOptions(yargs) {
     return yargs.option('account', {
         alias: 'a',
-        describe: i18n('lib.commonOpts.options.account.describe'),
+        describe: lib.commonOpts.options.account,
         type: 'string',
     });
 }
 export function addConfigOptions(yargs) {
     return yargs.option('config', {
         alias: 'c',
-        describe: i18n('lib.commonOpts.options.config.describe'),
+        describe: lib.commonOpts.options.config,
         type: 'string',
     });
 }
 export function addOverwriteOptions(yargs) {
     return yargs.option('overwrite', {
         alias: 'o',
-        describe: i18n('lib.commonOpts.options.overwrite.describe'),
+        describe: lib.commonOpts.options.overwrite,
         type: 'boolean',
         default: false,
     });
@@ -49,13 +51,13 @@ export function addCmsPublishModeOptions(yargs, { read, write }) {
     const cmsPublishModes = `<${Object.values(CMS_PUBLISH_MODE).join(' | ')}>`;
     return yargs.option('cms-publish-mode', {
         alias: 'm',
-        describe: i18n(`lib.commonOpts.options.modes.describe.${read ? 'read' : write ? 'write' : 'default'}`, { modes: cmsPublishModes }),
+        describe: lib.commonOpts.options.modes[read ? 'read' : write ? 'write' : 'default'](cmsPublishModes),
         type: 'string',
     });
 }
 export function addTestingOptions(yargs) {
     return yargs.option('qa', {
-        describe: i18n('lib.commonOpts.options.qa.describe'),
+        describe: lib.commonOpts.options.qa,
         type: 'boolean',
         default: false,
         hidden: true,
@@ -63,7 +65,7 @@ export function addTestingOptions(yargs) {
 }
 export function addUseEnvironmentOptions(yargs) {
     yargs.option('use-env', {
-        describe: i18n('lib.commonOpts.options.useEnv.describe'),
+        describe: lib.commonOpts.options.useEnv,
         type: 'boolean',
     });
     yargs.conflicts('use-env', 'account');
@@ -72,7 +74,7 @@ export function addUseEnvironmentOptions(yargs) {
 export function addJSONOutputOptions(yargs) {
     return yargs.option('json', {
         alias: 'format-output-as-json',
-        describe: i18n('lib.commonOpts.options.jsonOutput.describe'),
+        describe: lib.commonOpts.options.jsonOutput,
         type: 'boolean',
         hidden: true,
     });
@@ -80,27 +82,27 @@ export function addJSONOutputOptions(yargs) {
 // Remove this once we've upgraded to yargs 18.0.0
 function uiBetaTagWithColor(message) {
     const terminalUISupport = getTerminalUISupport();
-    const tag = i18n(`lib.ui.betaTagWithStyle`);
+    const tag = lib.ui.betaTagWithStyle;
     const result = `${terminalUISupport.color ? chalk.hex(UI_COLORS.SORBET)(tag) : tag} ${message}`;
     return result;
 }
 // Remove this once we've upgraded to yargs 18.0.0
 function uiDeprecatedTagWithColor(message) {
     const terminalUISupport = getTerminalUISupport();
-    const tag = i18n(`lib.ui.deprecatedTagWithStyle`);
+    const tag = lib.ui.deprecatedTagWithStyle;
     const result = `${terminalUISupport.color ? chalk.yellow(tag) : tag} ${message}`;
     return result;
 }
 export async function addCustomHelpOutput(yargs, command, describe) {
     try {
         // Remove this once we've upgraded to yargs 18.0.0
-        if (describe && describe.includes(i18n(`lib.ui.betaTag`))) {
-            describe = describe.replace(i18n(`lib.ui.betaTag`) + ' ', '');
+        if (describe && describe.includes(lib.ui.betaTag)) {
+            describe = describe.replace(lib.ui.betaTag + ' ', '');
             describe = uiBetaTagWithColor(describe);
         }
         // Remove this once we've upgraded to yargs 18.0.0
-        if (describe && describe.includes(i18n(`lib.ui.deprecatedTag`))) {
-            describe = describe.replace(i18n(`lib.ui.deprecatedTag`) + ' ', '');
+        if (describe && describe.includes(lib.ui.deprecatedTag)) {
+            describe = describe.replace(lib.ui.deprecatedTag + ' ', '');
             describe = uiDeprecatedTagWithColor(describe);
         }
         const parsedArgv = yargsParser(process.argv.slice(2));
@@ -132,7 +134,7 @@ export async function addCustomHelpOutput(yargs, command, describe) {
             if (commandHelp.startsWith('\n')) {
                 commandHelp = commandHelp.slice(1);
             }
-            logger.log(`${uiCommandReference(fullCommand, false)}\n\n${describe ? `${describe}\n\n` : ''}${commandHelp}`);
+            uiLogger.log(`${uiCommandReference(fullCommand, false)}\n\n${describe ? `${describe}\n\n` : ''}${commandHelp}`);
             process.exit(EXIT_CODES.SUCCESS);
         }
     }
@@ -141,20 +143,21 @@ export async function addCustomHelpOutput(yargs, command, describe) {
         debugError(e);
     }
 }
-export function setLogLevel(options) {
+export function setCLILogLevel(options) {
     const { debug, networkDebug, json } = options;
     if (json) {
-        setLoggerLogLevel(LOG_LEVEL.ERROR);
+        setLogLevel(LOG_LEVEL.ERROR);
+        SpinniesManager.setDisableOutput(true);
     }
     else if (debug) {
-        setLoggerLogLevel(LOG_LEVEL.DEBUG);
+        setLogLevel(LOG_LEVEL.DEBUG);
     }
     else {
-        setLoggerLogLevel(LOG_LEVEL.LOG);
+        setLogLevel(LOG_LEVEL.LOG);
     }
     if (networkDebug) {
         process.env.HUBSPOT_NETWORK_LOGGING = 'true';
-        setLoggerLogLevel(LOG_LEVEL.DEBUG);
+        setLogLevel(LOG_LEVEL.DEBUG);
     }
 }
 export function getCommandName(argv) {

package/lib/configOptions.js

@@ -79,6 +79,13 @@ async function enterTimeout() {
             message: lib.configOptions.setHttpTimeout.promptMessage,
             type: 'input',
             default: 30000,
+            validate: (timeout) => {
+                const timeoutNum = parseInt(timeout, 10);
+                if (isNaN(timeoutNum) || timeoutNum < 3000) {
+                    return lib.configOptions.setHttpTimeout.error(timeout);
+                }
+                return true;
+            },
         },
     ]);
     return timeout;