@hubspot/cli 7.8.12-experimental.0 → 7.8.12-experimental.1

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;

package/lib/constants.d.ts

@@ -76,7 +76,6 @@ export declare const APP_AUTH_TYPES: {
     readonly STATIC: "static";
 };
 export declare const FEATURES: {
-    readonly UNIFIED_THEME_PREVIEW: "cms:react:unifiedThemePreview";
     readonly UNIFIED_APPS: "Developers:UnifiedApps:PrivateBeta";
     readonly SANDBOXES_V2: "sandboxes:v2:enabled";
     readonly SANDBOXES_V2_CLI: "sandboxes:v2:cliEnabled";
@@ -125,3 +124,9 @@ export declare const CONFIG_LOCAL_STATE_FLAGS: {
 };
 export declare const EMPTY_PROJECT = "empty";
 export declare const PROJECT_WITH_APP = "app";
+export declare const LEGACY_SERVERLESS_FILE = "serverless.json";
+export declare const LEGACY_PUBLIC_APP_FILE = "public-app.json";
+export declare const LEGACY_PRIVATE_APP_FILE = "app.json";
+export declare const THEME_FILE = "theme.json";
+export declare const CMS_ASSETS_FILE = "cms-assets.json";
+export declare const LEGACY_CONFIG_FILES: string[];

package/lib/constants.js

@@ -68,7 +68,6 @@ export const APP_AUTH_TYPES = {
     STATIC: 'static',
 };
 export const FEATURES = {
-    UNIFIED_THEME_PREVIEW: 'cms:react:unifiedThemePreview',
     UNIFIED_APPS: 'Developers:UnifiedApps:PrivateBeta',
     SANDBOXES_V2: 'sandboxes:v2:enabled',
     SANDBOXES_V2_CLI: 'sandboxes:v2:cliEnabled',
@@ -117,3 +116,13 @@ export const CONFIG_LOCAL_STATE_FLAGS = {
 };
 export const EMPTY_PROJECT = 'empty';
 export const PROJECT_WITH_APP = 'app';
+export const LEGACY_SERVERLESS_FILE = 'serverless.json';
+export const LEGACY_PUBLIC_APP_FILE = 'public-app.json';
+export const LEGACY_PRIVATE_APP_FILE = 'app.json';
+export const THEME_FILE = 'theme.json';
+export const CMS_ASSETS_FILE = 'cms-assets.json';
+export const LEGACY_CONFIG_FILES = [
+    LEGACY_SERVERLESS_FILE,
+    LEGACY_PRIVATE_APP_FILE,
+    LEGACY_PUBLIC_APP_FILE,
+];

package/lib/dependencyManagement.js

@@ -4,16 +4,12 @@ import path from 'path';
 import { exec as execAsync } from 'node:child_process';
 import { walk } from '@hubspot/local-dev-lib/fs';
 import { getProjectConfig } from './projects/config.js';
-import { uiLink } from './ui/index.js';
-import { i18n } from './lang.js';
+import { commands } from '../lang/en.js';
 import SpinniesManager from './ui/SpinniesManager.js';
 import { isGloballyInstalled, executeInstall, DEFAULT_PACKAGE_MANAGER, } from './npm.js';
 class NoPackageJsonFilesError extends Error {
     constructor(projectName) {
-        super(i18n(`commands.project.subcommands.installDeps.noPackageJsonInProject`, {
-            projectName,
-            link: uiLink('Learn how to create a project from scratch.', 'https://developers.hubspot.com/beta-docs/guides/crm/intro/create-a-project'),
-        }));
+        super(commands.project.installDeps.noPackageJsonInProject(projectName));
     }
 }
 export async function installPackages({ packages, installLocations, }) {
@@ -28,31 +24,20 @@ async function installPackagesInDirectory(directory, packages) {
     SpinniesManager.init();
     SpinniesManager.add(spinner, {
         text: packages && packages.length
-            ? i18n(`commands.project.subcommands.installDeps.addingDependenciesToLocation`, {
-                dependencies: `[${packages.join(', ')}]`,
-                directory: relativeDir,
-            })
-            : i18n(`commands.project.subcommands.installDeps.installingDependencies`, {
-                directory: relativeDir,
-            }),
+            ? commands.project.installDeps.addingDependenciesToLocation(`[${packages.join(', ')}]`, relativeDir)
+            : commands.project.installDeps.installingDependencies(relativeDir),
     });
     try {
         await executeInstall(packages, null, { cwd: directory });
         SpinniesManager.succeed(spinner, {
-            text: i18n(`commands.project.subcommands.installDeps.installationSuccessful`, {
-                directory: relativeDir,
-            }),
+            text: commands.project.installDeps.installationSuccessful(relativeDir),
         });
     }
     catch (e) {
         SpinniesManager.fail(spinner, {
-            text: i18n(`commands.project.subcommands.installDeps.installingDependenciesFailed`, {
-                directory: relativeDir,
-            }),
+            text: commands.project.installDeps.installingDependenciesFailed(relativeDir),
         });
-        throw new Error(i18n(`commands.project.subcommands.installDeps.installingDependenciesFailed`, {
-            directory: relativeDir,
-        }), {
+        throw new Error(commands.project.installDeps.installingDependenciesFailed(relativeDir), {
             cause: e,
         });
     }
@@ -62,14 +47,11 @@ export async function getProjectPackageJsonLocations(dir) {
     if (!projectConfig ||
         !projectConfig.projectDir ||
         !projectConfig.projectConfig) {
-        throw new Error(i18n(`commands.project.subcommands.installDeps.noProjectConfig`));
+        throw new Error(commands.project.installDeps.noProjectConfig);
     }
     const { projectDir, projectConfig: { srcDir, name }, } = projectConfig;
     if (!(await isGloballyInstalled(DEFAULT_PACKAGE_MANAGER))) {
-        throw new Error(i18n(`commands.project.subcommands.installDeps.packageManagerNotInstalled`, {
-            packageManager: DEFAULT_PACKAGE_MANAGER,
-            link: uiLink(DEFAULT_PACKAGE_MANAGER, 'https://docs.npmjs.com/downloading-and-installing-node-js-and-npm'),
-        }));
+        throw new Error(commands.project.installDeps.packageManagerNotInstalled(DEFAULT_PACKAGE_MANAGER));
     }
     if (!fs.existsSync(projectConfig.projectDir) ||
         !fs.existsSync(path.join(projectDir, srcDir))) {

package/lib/developerTestAccounts.js

@@ -3,9 +3,9 @@ import { getAccountId, getConfigAccounts } from '@hubspot/local-dev-lib/config';
 import { getAccountIdentifier } from '@hubspot/local-dev-lib/config/getAccountIdentifier';
 import { fetchDeveloperTestAccounts } from '@hubspot/local-dev-lib/api/developerTestAccounts';
 import { isMissingScopeError, isSpecifiedError, } from '@hubspot/local-dev-lib/errors/index';
-import { logger } from '@hubspot/local-dev-lib/logger';
+import { uiLogger } from './ui/logger.js';
 import { getHubSpotWebsiteOrigin } from '@hubspot/local-dev-lib/urls';
-import { i18n } from './lang.js';
+import { lib } from '../lang/en.js';
 import { uiAccountDescription } from './ui/index.js';
 import { logError } from './errorHandlers/index.js';
 export function getHasDevTestAccounts(appDeveloperAccountConfig) {
@@ -39,42 +39,28 @@ export async function validateDevTestAccountUsageLimits(accountConfig) {
     if (count >= limit) {
         const hasDevTestAccounts = getHasDevTestAccounts(accountConfig);
         if (hasDevTestAccounts) {
-            throw new Error(i18n('lib.developerTestAccount.create.failure.alreadyInConfig', {
-                accountName: accountConfig.name || accountId,
-                limit,
-            }));
+            throw new Error(lib.developerTestAccount.create.failure.alreadyInConfig(accountConfig.name || accountId, limit));
         }
         else {
-            throw new Error(i18n('lib.developerTestAccount.create.failure.limit', {
-                accountName: accountConfig.name || accountId,
-                limit,
-            }));
+            throw new Error(lib.developerTestAccount.create.failure.limit(accountConfig.name || accountId, limit));
         }
     }
     return data;
 }
 export function handleDeveloperTestAccountCreateError(err, accountId, env, portalLimit) {
     if (isMissingScopeError(err)) {
-        logger.error(i18n('lib.developerTestAccount.create.failure.scopes.message', {
-            accountName: uiAccountDescription(accountId),
-        }));
+        uiLogger.error(lib.developerTestAccount.create.failure.scopes.message);
         const websiteOrigin = getHubSpotWebsiteOrigin(env);
         const url = `${websiteOrigin}/personal-access-key/${accountId}`;
-        logger.info(i18n('lib.developerTestAccount.create.failure.scopes.instructions', {
-            accountName: uiAccountDescription(accountId),
-            url,
-        }));
+        uiLogger.info(lib.developerTestAccount.create.failure.scopes.instructions(uiAccountDescription(accountId), url));
     }
     else if (isSpecifiedError(err, {
         statusCode: 400,
         errorType: 'TEST_PORTAL_LIMIT_REACHED',
     })) {
-        logger.log('');
-        logger.error(i18n('lib.developerTestAccount.create.failure.limit', {
-            accountName: uiAccountDescription(accountId),
-            limit: portalLimit,
-        }));
-        logger.log('');
+        uiLogger.log('');
+        uiLogger.error(lib.developerTestAccount.create.failure.limit(uiAccountDescription(accountId), portalLimit));
+        uiLogger.log('');
     }
     else {
         logError(err);

package/lib/doctor/Diagnosis.js

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { helpers } from '../interpolation.js';
 import { uiAccountDescription } from '../ui/index.js';
 import { indent } from '../ui/index.js';
-import { i18n } from '../lang.js';
+import { lib } from '../../lang/en.js';
 export class Diagnosis {
     prefixes;
     diagnosis;
@@ -18,38 +18,30 @@ export class Diagnosis {
         };
         this.diagnosis = {
             cli: {
-                header: i18n(`lib.doctor.diagnosis.cli.header`),
+                header: lib.doctor.diagnosis.cli.header,
                 sections: [],
             },
             cliConfig: {
-                header: i18n(`lib.doctor.diagnosis.cliConfig.header`),
+                header: lib.doctor.diagnosis.cliConfig.header,
                 sections: [],
             },
             defaultAccountOverrideFile: {
-                header: i18n(`lib.doctor.diagnosis.defaultAccountOverrideFile.header`),
+                header: lib.doctor.diagnosis.defaultAccountOverrideFile.header,
                 sections: [],
             },
             project: {
-                header: i18n(`lib.doctor.diagnosis.projectConfig.header`),
+                header: lib.doctor.diagnosis.projectConfig.header,
                 subheaders: [
-                    i18n(`lib.doctor.diagnosis.projectConfig.projectDirSubHeader`, {
-                        projectDir: diagnosticInfo.project?.config?.projectDir,
-                    }),
-                    i18n(`lib.doctor.diagnosis.projectConfig.projectNameSubHeader`, {
-                        projectName: diagnosticInfo.project?.config?.projectConfig?.name,
-                    }),
+                    lib.doctor.diagnosis.projectConfig.projectDirSubHeader(diagnosticInfo.project?.config?.projectDir || ''),
+                    lib.doctor.diagnosis.projectConfig.projectNameSubHeader(diagnosticInfo.project?.config?.projectConfig?.name || ''),
                 ],
                 sections: [],
             },
         };
         if (diagnosticInfo.config) {
             this.diagnosis.cliConfig.subheaders = [
-                i18n(`lib.doctor.diagnosis.cliConfig.configFileSubHeader`, {
-                    filename: diagnosticInfo.config,
-                }),
-                i18n(`lib.doctor.diagnosis.cliConfig.defaultAccountSubHeader`, {
-                    accountDetails: uiAccountDescription(accountId),
-                }),
+                lib.doctor.diagnosis.cliConfig.configFileSubHeader(diagnosticInfo.config),
+                lib.doctor.diagnosis.cliConfig.defaultAccountSubHeader(uiAccountDescription(accountId)),
             ];
         }
     }
@@ -83,12 +75,8 @@ export class Diagnosis {
             return '';
         }
         output.push('');
-        output.push(i18n(`lib.doctor.diagnosis.counts.errors`, {
-            count: this.errorCount,
-        }));
-        output.push(i18n(`lib.doctor.diagnosis.counts.warnings`, {
-            count: this.warningCount,
-        }));
+        output.push(lib.doctor.diagnosis.counts.errors(this.errorCount));
+        output.push(lib.doctor.diagnosis.counts.warnings(this.warningCount));
         output.push('');
         return output.join('\n');
     }