@hubspot/cli 7.8.0-experimental.0 → 7.8.0

package/commands/project/dev/deprecatedFlow.js

@@ -1,13 +1,12 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { getAccountConfig, getConfigAccounts, getEnv, } from '@hubspot/local-dev-lib/config';
 import { getValidEnv } from '@hubspot/local-dev-lib/environment';
 import { findProjectComponents, getProjectComponentTypes, } from '../../../lib/projects/structure.js';
 import { ComponentTypes } from '../../../types/Projects.js';
-import { i18n } from '../../../lib/lang.js';
+import { commands } from '../../../lang/en.js';
+import { uiLogger } from '../../../lib/ui/logger.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import { uiCommandReference } from '../../../lib/ui/index.js';
 import SpinniesManager from '../../../lib/ui/SpinniesManager.js';
-import LocalDevManager from '../../../lib/projects/localDev/LocalDevManager.js';
+import LocalDevManager_DEPRECATED from '../../../lib/projects/localDev/LocalDevManager_DEPRECATED.js';
 import { confirmDefaultAccountIsTarget, suggestRecommendedNestedAccount, checkIfAccountFlagIsSupported, checkIfDefaultAccountIsSupported, createSandboxForLocalDev, createDeveloperTestAccountForLocalDev, useExistingDevTestAccount, checkIfParentAccountIsAuthed, hasSandboxes, } from '../../../lib/projects/localDev/helpers/account.js';
 import { createInitialBuildForNewProject, createNewProjectForLocalDev, } from '../../../lib/projects/localDev/helpers/project.js';
 import { handleExit } from '../../../lib/process.js';
@@ -23,28 +22,20 @@ export async function deprecatedProjectDevFlow({ args, accountId, projectConfig,
     const hasPublicApps = !!componentTypes[ComponentTypes.PublicApp];
     const accountConfig = getAccountConfig(accountId);
     if (!accountConfig) {
-        logger.error(i18n('commands.project.subcommands.dev.errors.noAccount', {
-            accountId: accountId,
-            authCommand: uiCommandReference('hs auth'),
-        }));
+        uiLogger.error(commands.project.dev.errors.noAccount(accountId));
         process.exit(EXIT_CODES.ERROR);
     }
     if (runnableComponents.length === 0) {
-        logger.error(i18n(`commands.project.subcommands.dev.errors.noRunnableComponents`, {
-            projectDir,
-            command: uiCommandReference('hs project add'),
-        }));
+        uiLogger.error(commands.project.dev.errors.noRunnableComponents);
         process.exit(EXIT_CODES.SUCCESS);
     }
     else if (hasPrivateApps && hasPublicApps) {
-        logger.error(i18n(`commands.project.subcommands.dev.errors.invalidProjectComponents`));
+        uiLogger.error(commands.project.dev.errors.invalidProjectComponents);
         process.exit(EXIT_CODES.SUCCESS);
     }
     const accounts = getConfigAccounts();
     if (!accounts) {
-        logger.error(i18n(`commands.project.subcommands.dev.errors.noAccountsInConfig`, {
-            authCommand: uiCommandReference('hs auth'),
-        }));
+        uiLogger.error(commands.project.dev.errors.noAccountsInConfig);
         process.exit(EXIT_CODES.ERROR);
     }
     let bypassRecommendedAccountPrompt = false;
@@ -110,7 +101,7 @@ export async function deprecatedProjectDevFlow({ args, accountId, projectConfig,
         targetProjectAccountId = derivedAccountId;
     }
     if (!targetProjectAccountId || !targetTestingAccountId) {
-        logger.error(i18n(`commands.project.subcommands.dev.errors.noAccount`));
+        uiLogger.error(commands.project.dev.errors.noAccount(accountId));
         process.exit(EXIT_CODES.ERROR);
     }
     // eslint-disable-next-line prefer-const
@@ -130,7 +121,7 @@ export async function deprecatedProjectDevFlow({ args, accountId, projectConfig,
         project = await createNewProjectForLocalDev(projectConfig, targetProjectAccountId, createNewSandbox, hasPublicApps);
         deployedBuild = await createInitialBuildForNewProject(projectConfig, projectDir, targetProjectAccountId);
     }
-    const LocalDev = new LocalDevManager({
+    const LocalDev = new LocalDevManager_DEPRECATED({
         runnableComponents,
         debug: args.debug,
         deployedBuild,

package/commands/project/dev/index.js

@@ -2,24 +2,24 @@ import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { getAccountId } from '@hubspot/local-dev-lib/config';
 import { getProjectConfig, validateProjectConfig, } from '../../../lib/projects/config.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import { uiBetaTag, uiLine } from '../../../lib/ui/index.js';
+import { uiLine } from '../../../lib/ui/index.js';
 import { deprecatedProjectDevFlow } from './deprecatedFlow.js';
 import { unifiedProjectDevFlow } from './unifiedFlow.js';
-import { useV3Api } from '../../../lib/projects/platformVersion.js';
+import { isV2Project } from '../../../lib/projects/platformVersion.js';
 import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
 import { loadProfile, exitIfUsingProfiles, } from '../../../lib/projectProfiles.js';
 import { commands } from '../../../lang/en.js';
 import { uiLogger } from '../../../lib/ui/logger.js';
 const command = 'dev';
-const describe = uiBetaTag(commands.project.dev.describe, false);
-function validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV3) {
+const describe = commands.project.dev.describe;
+function validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV2) {
     // Legacy projects do not support targetTestingAccount and targetProjectAccount
-    if (testingAccount && projectAccount && !useV3) {
+    if (testingAccount && projectAccount && !useV2) {
         uiLogger.error(commands.project.dev.errors.unsupportedAccountFlagLegacy);
         process.exit(EXIT_CODES.ERROR);
     }
-    if (userProvidedAccount && useV3) {
-        uiLogger.error(commands.project.dev.errors.unsupportedAccountFlagV3);
+    if (userProvidedAccount && useV2) {
+        uiLogger.error(commands.project.dev.errors.unsupportedAccountFlagV2);
         process.exit(EXIT_CODES.ERROR);
     }
 }
@@ -27,15 +27,15 @@ async function handler(args) {
     const { derivedAccountId, userProvidedAccount, testingAccount, projectAccount, } = args;
     const { projectConfig, projectDir } = await getProjectConfig();
     validateProjectConfig(projectConfig, projectDir);
-    const useV3 = useV3Api(projectConfig.platformVersion);
+    const useV2Projects = isV2Project(projectConfig.platformVersion);
     if (!projectDir) {
         uiLogger.error(commands.project.dev.errors.noProjectConfig);
         process.exit(EXIT_CODES.ERROR);
     }
-    validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV3);
-    uiBetaTag(commands.project.dev.logs.betaMessage);
-    if (useV3) {
-        uiLogger.log(commands.project.dev.logs.learnMoreMessageV3);
+    validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV2Projects);
+    uiLogger.log(commands.project.dev.logs.header);
+    if (useV2Projects) {
+        uiLogger.log(commands.project.dev.logs.learnMoreMessageV2);
     }
     else {
         uiLogger.log(commands.project.dev.logs.learnMoreMessageLegacy);
@@ -54,7 +54,7 @@ async function handler(args) {
     else if (userProvidedAccount && derivedAccountId) {
         targetProjectAccountId = derivedAccountId;
     }
-    if (!targetProjectAccountId && useV3Api(projectConfig.platformVersion)) {
+    if (!targetProjectAccountId && isV2Project(projectConfig.platformVersion)) {
         if (args.profile) {
             profile = loadProfile(projectConfig, projectDir, args.profile);
             if (!profile) {
@@ -73,13 +73,13 @@ async function handler(args) {
     if (!targetProjectAccountId) {
         // The user is not using profile or account flags, so we can use the derived accountId
         targetProjectAccountId = derivedAccountId;
-        if (useV3) {
+        if (useV2Projects) {
             uiLogger.log('');
             uiLogger.log(commands.project.dev.logs.defaultProjectAccountExplanation(targetProjectAccountId));
         }
     }
     trackCommandUsage('project-dev', {}, targetProjectAccountId);
-    if (useV3Api(projectConfig.platformVersion)) {
+    if (isV2Project(projectConfig.platformVersion)) {
         const targetTestingAccountId = (testingAccount && getAccountId(testingAccount)) || undefined;
         await unifiedProjectDevFlow({
             args,
@@ -109,15 +109,19 @@ function projectDevBuilder(yargs) {
     yargs.options('testing-account', {
         type: 'string',
         description: commands.project.dev.options.testingAccount,
-        hidden: true,
         implies: ['project-account'],
     });
     yargs.options('project-account', {
         type: 'string',
         description: commands.project.dev.options.projectAccount,
-        hidden: true,
         implies: ['testingAccount'],
     });
+    yargs.option('account', {
+        alias: 'a',
+        describe: '',
+        type: 'string',
+        description: commands.project.dev.options.account,
+    });
     yargs.example([['$0 project dev', commands.project.dev.examples.default]]);
     yargs.conflicts('profile', 'account');
     yargs.conflicts('profile', 'testing-account');
@@ -126,7 +130,6 @@ function projectDevBuilder(yargs) {
 }
 export const builder = makeYargsBuilder(projectDevBuilder, command, describe, {
     useGlobalOptions: true,
-    useAccountOptions: true,
     useConfigOptions: true,
     useEnvironmentOptions: true,
 });

package/commands/project/dev/unifiedFlow.js

@@ -1,6 +1,7 @@
 import path from 'path';
 import util from 'util';
 import { HUBSPOT_ACCOUNT_TYPES } from '@hubspot/local-dev-lib/constants/config';
+import { startPortManagerServer, stopPortManagerServer, } from '@hubspot/local-dev-lib/portManager';
 import { isTranslationError } from '@hubspot/project-parsing-lib/src/lib/errors.js';
 import { translateForLocalDev } from '@hubspot/project-parsing-lib';
 import { getEnv, getConfigAccounts, getAccountConfig, } from '@hubspot/local-dev-lib/config';
@@ -8,8 +9,8 @@ import { getValidEnv } from '@hubspot/local-dev-lib/environment';
 import { logError } from '../../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
 import { ensureProjectExists } from '../../../lib/projects/ensureProjectExists.js';
-import { createInitialBuildForNewProject, createNewProjectForLocalDev, compareLocalProjectToDeployed, } from '../../../lib/projects/localDev/helpers/project.js';
-import { useExistingDevTestAccount, createDeveloperTestAccountForLocalDev, selectAccountTypePrompt, } from '../../../lib/projects/localDev/helpers/account.js';
+import { createInitialBuildForNewProject, createNewProjectForLocalDev, compareLocalProjectToDeployed, checkAndInstallDependencies, } from '../../../lib/projects/localDev/helpers/project.js';
+import { useExistingDevTestAccount, createDeveloperTestAccountForLocalDev, selectAccountTypePrompt, createSandboxForLocalDev, } from '../../../lib/projects/localDev/helpers/account.js';
 import { selectDeveloperTestTargetAccountPrompt, selectSandboxTargetAccountPrompt, } from '../../../lib/prompts/projectDevTargetAccountPrompt.js';
 import SpinniesManager from '../../../lib/ui/SpinniesManager.js';
 import LocalDevProcess from '../../../lib/projects/localDev/LocalDevProcess.js';
@@ -93,6 +94,9 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
             const sandboxAccountPromptResponse = await selectSandboxTargetAccountPrompt(accounts, targetProjectAccountConfig);
             targetTestingAccountId =
                 sandboxAccountPromptResponse.targetAccountId || undefined;
+            if (sandboxAccountPromptResponse.createNestedAccount) {
+                targetTestingAccountId = await createSandboxForLocalDev(targetProjectAccountId, targetProjectAccountConfig, env);
+            }
         }
         else {
             targetTestingAccountId = targetProjectAccountId;
@@ -109,13 +113,16 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
     let project = uploadedProject;
     SpinniesManager.init();
     if (projectExists && project) {
-        await compareLocalProjectToDeployed(projectConfig, targetProjectAccountId, project.deployedBuild?.buildId, projectNodes);
+        await compareLocalProjectToDeployed(projectConfig, targetProjectAccountId, project.deployedBuild?.buildId, projectNodes, args.profile);
     }
     else {
         project = await createNewProjectForLocalDev(projectConfig, targetProjectAccountId, false, false);
         await createInitialBuildForNewProject(projectConfig, projectDir, targetProjectAccountId, true, args.profile);
     }
+    // Check for missing/outdated dependencies
+    await checkAndInstallDependencies();
     // End setup, start local dev process
+    await startPortManagerServer();
     const localDevProcess = new LocalDevProcess({
         initialProjectNodes: projectNodes,
         initialProjectProfileData: projectProfileData,
@@ -125,15 +132,14 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         targetTestingAccountId: targetTestingAccountId,
         projectConfig,
         projectDir,
-        projectName: project.name,
-        projectId: project.id,
+        projectData: project,
         env,
     });
-    await localDevProcess.start();
-    const watcher = new LocalDevWatcher(localDevProcess);
-    watcher.start();
     const websocketServer = new LocalDevWebsocketServer(localDevProcess, args.debug);
+    const watcher = new LocalDevWatcher(localDevProcess);
     await websocketServer.start();
+    await localDevProcess.start();
+    watcher.start();
     handleKeypress(async (key) => {
         if ((key.ctrl && key.name === 'c') || key.name === 'q') {
             await Promise.all([
@@ -147,5 +153,6 @@ export async function unifiedProjectDevFlow({ args, targetProjectAccountId, prov
         localDevProcess.stop(!isSIGHUP);
         watcher.stop();
         websocketServer.shutdown();
+        stopPortManagerServer();
     });
 }

package/commands/project/download.js

@@ -1,22 +1,21 @@
 import path from 'path';
 import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { extractZipArchive } from '@hubspot/local-dev-lib/archive';
 import { downloadProject, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { downloadProjectPrompt } from '../../lib/prompts/downloadProjectPrompt.js';
-import { i18n } from '../../lib/lang.js';
-import { uiBetaTag } from '../../lib/ui/index.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'download';
-const describe = uiBetaTag(i18n(`commands.project.subcommands.download.describe`), false);
+const describe = commands.project.download.describe;
 async function handler(args) {
     const { projectConfig } = await getProjectConfig();
     if (projectConfig) {
-        logger.error(i18n(`commands.project.subcommands.download.warnings.cannotDownloadWithinProject`));
+        uiLogger.error(commands.project.download.warnings.cannotDownloadWithinProject);
         process.exit(EXIT_CODES.ERROR);
     }
     const { dest, build, derivedAccountId } = args;
@@ -33,16 +32,16 @@ async function handler(args) {
             }
         }
         if (!buildNumberToDownload) {
-            logger.error(i18n(`commands.project.subcommands.download.errors.noBuildIdToDownload`));
+            uiLogger.error(commands.project.download.errors.noBuildIdToDownload);
             process.exit(EXIT_CODES.ERROR);
         }
-        const absoluteDestPath = dest ? path.resolve(getCwd(), dest) : getCwd();
+        const sanitizedProjectName = sanitizeFileName(projectName);
+        const absoluteDestPath = dest
+            ? path.resolve(getCwd(), dest, sanitizedProjectName)
+            : path.resolve(getCwd(), sanitizedProjectName);
         const { data: zippedProject } = await downloadProject(derivedAccountId, projectName, buildNumberToDownload);
-        await extractZipArchive(zippedProject, sanitizeFileName(projectName), path.resolve(absoluteDestPath), { includesRootDir: false });
-        logger.log(i18n(`commands.project.subcommands.download.logs.downloadSucceeded`, {
-            buildId: buildNumberToDownload,
-            projectName,
-        }));
+        await extractZipArchive(zippedProject, sanitizeFileName(projectName), path.resolve(absoluteDestPath));
+        uiLogger.log(commands.project.download.logs.downloadSucceeded(buildNumberToDownload, projectName));
         process.exit(EXIT_CODES.SUCCESS);
     }
     catch (e) {
@@ -56,15 +55,15 @@ async function handler(args) {
 function projectDownloadBuilder(yargs) {
     yargs.options({
         project: {
-            describe: i18n(`commands.project.subcommands.download.options.project.describe`),
+            describe: commands.project.download.options.project.describe,
             type: 'string',
         },
         dest: {
-            describe: i18n(`commands.project.subcommands.download.options.dest.describe`),
+            describe: commands.project.download.options.dest.describe,
             type: 'string',
         },
         build: {
-            describe: i18n(`commands.project.subcommands.download.options.build.describe`),
+            describe: commands.project.download.options.build.describe,
             alias: ['build-id'],
             type: 'number',
         },
@@ -72,7 +71,7 @@ function projectDownloadBuilder(yargs) {
     yargs.example([
         [
             '$0 project download --project=myProject --dest=myProjectFolder',
-            i18n(`commands.project.subcommands.download.examples.default`),
+            commands.project.download.examples.default,
         ],
     ]);
     return yargs;

package/commands/project/installDeps.d.ts

@@ -1,5 +1,5 @@
-import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
-export type ProjectInstallDepsArgs = CommonArgs & {
+import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs.js';
+export type ProjectInstallDepsArgs = CommonArgs & ConfigArgs & {
     packages?: string[];
 };
 declare const projectInstallDepsCommand: YargsCommandModule<unknown, ProjectInstallDepsArgs>;

package/commands/project/installDeps.js

@@ -1,23 +1,22 @@
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { installPackages, getProjectPackageJsonLocations, } from '../../lib/dependencyManagement.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { getProjectConfig } from '../../lib/projects/config.js';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import path from 'path';
-import { i18n } from '../../lib/lang.js';
+import { commands } from '../../lang/en.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { uiBetaTag } from '../../lib/ui/index.js';
 import { logError } from '../../lib/errorHandlers/index.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 const command = 'install-deps [packages..]';
-const describe = uiBetaTag(i18n(`commands.project.subcommands.installDeps.help.describe`), false);
+const describe = commands.project.installDeps.help.describe;
 async function handler(args) {
     const { derivedAccountId, packages } = args;
     try {
         trackCommandUsage('project-install-deps', undefined, derivedAccountId);
         const projectConfig = await getProjectConfig();
         if (!projectConfig || !projectConfig.projectDir) {
-            logger.error(i18n(`commands.project.subcommands.installDeps.noProjectConfig`));
+            uiLogger.error(commands.project.installDeps.noProjectConfig);
             return process.exit(EXIT_CODES.ERROR);
         }
         const { projectDir } = projectConfig;
@@ -28,14 +27,14 @@ async function handler(args) {
                     name: 'selectedInstallLocations',
                     type: 'checkbox',
                     when: () => packages && packages.length > 0,
-                    message: i18n(`commands.project.subcommands.installDeps.installLocationPrompt`),
+                    message: commands.project.installDeps.installLocationPrompt,
                     choices: installLocations.map(dir => ({
                         name: path.relative(projectDir, dir),
                         value: dir,
                     })),
                     validate: (choices) => {
                         if (choices === undefined || choices.length === 0) {
-                            return i18n(`commands.project.subcommands.installDeps.installLocationPromptRequired`);
+                            return commands.project.installDeps.installLocationPromptRequired;
                         }
                         return true;
                     },
@@ -59,17 +58,18 @@ function projectInstallDepsBuilder(yargs) {
     yargs.example([
         [
             '$0 project install-deps',
-            i18n(`commands.project.subcommands.installDeps.help.installAppDepsExample`),
+            commands.project.installDeps.help.installAppDepsExample,
         ],
         [
             '$0 project install-deps dependency1 dependency2',
-            i18n(`commands.project.subcommands.installDeps.help.addDepToSubComponentExample`),
+            commands.project.installDeps.help.addDepToSubComponentExample,
         ],
     ]);
     return yargs;
 }
 const builder = makeYargsBuilder(projectInstallDepsBuilder, command, describe, {
     useGlobalOptions: true,
+    useConfigOptions: true,
 });
 const projectInstallDepsCommand = {
     command,

package/commands/project/list.d.ts

@@ -0,0 +1,4 @@
+import { AccountArgs, CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs.js';
+type ProjectListArgs = CommonArgs & ConfigArgs & AccountArgs;
+declare const projectListCommand: YargsCommandModule<unknown, ProjectListArgs>;
+export default projectListCommand;

package/commands/project/list.js

@@ -0,0 +1,62 @@
+import { trackCommandUsage } from '../../lib/usageTracking.js';
+import { makeYargsBuilder } from '../../lib/yargsUtils.js';
+import { fetchProjects } from '@hubspot/local-dev-lib/api/projects';
+import { logError } from '../../lib/errorHandlers/index.js';
+import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
+import { getTableContents, getTableHeader } from '../../lib/ui/table.js';
+import { uiLogger } from '../../lib/ui/logger.js';
+import { commands } from '../../lang/en.js';
+const command = ['list', 'ls'];
+const describe = commands.project.list.describe;
+async function getProjectData(accountId) {
+    try {
+        const { data: projects } = await fetchProjects(accountId);
+        return projects.results;
+    }
+    catch (e) {
+        logError(e);
+        process.exit(EXIT_CODES.ERROR);
+    }
+}
+function formatProjectsAsTableRows(projects) {
+    const projectListData = [];
+    projects.forEach(project => {
+        projectListData.push([
+            project.name,
+            project.latestBuild ? project.latestBuild.platformVersion : '',
+        ]);
+    });
+    return projectListData;
+}
+async function handler(args) {
+    const { derivedAccountId } = args;
+    trackCommandUsage('projects-list', undefined, derivedAccountId);
+    const projectData = await getProjectData(derivedAccountId);
+    if (projectData.length === 0) {
+        uiLogger.error(commands.project.list.errors.noProjectsFound(derivedAccountId));
+        process.exit(EXIT_CODES.ERROR);
+    }
+    const projectListData = formatProjectsAsTableRows(projectData);
+    projectListData.unshift(getTableHeader([
+        commands.project.list.labels.name,
+        commands.project.list.labels.platformVersion,
+    ]));
+    uiLogger.log(commands.project.list.projects);
+    uiLogger.log(getTableContents(projectListData, { border: { bodyLeft: '  ' } }));
+}
+function projectListBuilder(yargs) {
+    yargs.example([['$0 project list']]);
+    return yargs;
+}
+const builder = makeYargsBuilder(projectListBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+});
+const projectListCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+export default projectListCommand;

package/commands/project/listBuilds.js

@@ -1,34 +1,30 @@
 import { isHubSpotHttpError } from '@hubspot/local-dev-lib/errors/index';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { fetchProject, fetchProjectBuilds, } from '@hubspot/local-dev-lib/api/projects';
 import { getTableContents, getTableHeader } from '../../lib/ui/table.js';
-import { uiBetaTag, uiLink } from '../../lib/ui/index.js';
+import { uiLink } from '../../lib/ui/index.js';
 import { getProjectConfig, validateProjectConfig, } from '../../lib/projects/config.js';
 import { getProjectDetailUrl } from '../../lib/projects/urls.js';
 import moment from 'moment';
 import { promptUser } from '../../lib/prompts/promptUtils.js';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
-import { i18n } from '../../lib/lang.js';
+import { uiLogger } from '../../lib/ui/logger.js';
 import { logError, ApiErrorContext } from '../../lib/errorHandlers/index.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 const command = 'list-builds';
-const describe = uiBetaTag(i18n(`commands.project.subcommands.listBuilds.describe`), false);
+const describe = commands.project.listBuilds.describe;
 async function fetchAndDisplayBuilds(accountId, project, options) {
     const { data: { results, paging }, } = await fetchProjectBuilds(accountId, project.name, options);
     const currentDeploy = project.deployedBuildId;
     if (options && options.after) {
-        logger.log(i18n(`commands.project.subcommands.listBuilds.logs.showingNextBuilds`, {
-            count: results.length,
-            projectName: project.name,
-        }));
+        uiLogger.log(commands.project.listBuilds.showingNextBuilds(results.length, project.name));
     }
     else {
-        logger.log(commands.project.listBuilds.showingRecentBuilds(results.length, project.name, uiLink(commands.project.listBuilds.viewAllBuildsLink, getProjectDetailUrl(project.name, accountId))));
+        uiLogger.log(commands.project.listBuilds.showingRecentBuilds(results.length, project.name, uiLink(commands.project.listBuilds.viewAllBuildsLink, getProjectDetailUrl(project.name, accountId))));
     }
     if (results.length === 0) {
-        logger.log(i18n(`commands.project.subcommands.listBuilds.errors.noBuilds`));
+        uiLogger.log(commands.project.listBuilds.errors.noBuilds);
     }
     else {
         const builds = results.map(build => {
@@ -49,7 +45,7 @@ async function fetchAndDisplayBuilds(accountId, project, options) {
             ];
         });
         builds.unshift(getTableHeader(['Build ID', 'Status', 'Completed', 'Duration', 'Details']));
-        logger.log(getTableContents(builds, {
+        uiLogger.log(getTableContents(builds, {
             columnDefault: {
                 paddingLeft: 3,
             },
@@ -58,7 +54,7 @@ async function fetchAndDisplayBuilds(accountId, project, options) {
     if (paging && paging.next) {
         await promptUser({
             name: 'more',
-            message: i18n(`commands.project.subcommands.listBuilds.continueOrExitPrompt`),
+            message: commands.project.listBuilds.continueOrExitPrompt,
         });
         await fetchAndDisplayBuilds(accountId, project, {
             limit: options.limit,
@@ -81,9 +77,7 @@ async function handler(args) {
     }
     catch (e) {
         if (isHubSpotHttpError(e) && e.status === 404) {
-            logger.error(i18n(`commands.project.subcommands.listBuilds.errors.projectNotFound`, {
-                projectName,
-            }));
+            uiLogger.error(commands.project.listBuilds.errors.projectNotFound(projectName));
         }
         else {
             logError(e, new ApiErrorContext({
@@ -97,19 +91,16 @@ async function handler(args) {
 function projectListBuildsBuilder(yargs) {
     yargs.options({
         project: {
-            describe: i18n(`commands.project.subcommands.listBuilds.options.project.describe`),
+            describe: commands.project.listBuilds.options.project.describe,
             type: 'string',
         },
         limit: {
-            describe: i18n(`commands.project.subcommands.listBuilds.options.limit.describe`),
+            describe: commands.project.listBuilds.options.limit.describe,
             type: 'string',
         },
     });
     yargs.example([
-        [
-            '$0 project list-builds',
-            i18n(`commands.project.subcommands.listBuilds.examples.default`),
-        ],
+        ['$0 project list-builds', commands.project.listBuilds.examples.default],
     ]);
     return yargs;
 }