@hubspot/cli 7.7.0-experimental.3 → 7.7.2-experimental.0

package/commands/project/dev/index.js

@@ -2,8 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.builder = void 0;
 const usageTracking_1 = require("../../../lib/usageTracking");
-const lang_1 = require("../../../lib/lang");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const config_2 = require("../../../lib/projects/config");
 const exitCodes_1 = require("../../../lib/enums/exitCodes");
@@ -13,22 +11,35 @@ const unifiedFlow_1 = require("./unifiedFlow");
 const buildAndDeploy_1 = require("../../../lib/projects/buildAndDeploy");
 const yargsUtils_1 = require("../../../lib/yargsUtils");
 const projectProfiles_1 = require("../../../lib/projectProfiles");
+const en_1 = require("../../../lang/en");
+const logger_1 = require("../../../lib/ui/logger");
 const command = 'dev';
-const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.dev.describe`), false);
+const describe = (0, ui_1.uiBetaTag)(en_1.commands.project.dev.describe, false);
+function validateAccountFlags(testingAccount, projectAccount, providedAccountId, useV3) {
+    // Legacy projects do not support targetTestingAccount and targetProjectAccount
+    if (testingAccount && projectAccount && !useV3) {
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.unsupportedAccountFlagLegacy);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    if (providedAccountId && useV3) {
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.unsupportedAccountFlagV3);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+}
 async function handler(args) {
-    const { derivedAccountId, providedAccountId } = args;
+    const { derivedAccountId, providedAccountId, testingAccount, projectAccount, } = args;
     const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
     (0, config_2.validateProjectConfig)(projectConfig, projectDir);
+    const useV3 = (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion);
     if (!projectDir) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noProjectConfig`, {
-            accountId: derivedAccountId,
-            authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-        }));
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.noProjectConfig);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    let targetAccountId = providedAccountId;
+    validateAccountFlags(testingAccount, projectAccount, providedAccountId, useV3);
+    let targetProjectAccountId = (projectAccount && (0, config_1.getAccountId)(projectAccount)) ||
+        (providedAccountId && derivedAccountId);
     let profile;
-    if (!targetAccountId && (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
+    if (!targetProjectAccountId && (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
         if (args.profile) {
             (0, projectProfiles_1.logProfileHeader)(args.profile);
             profile = (0, projectProfiles_1.loadProfile)(projectConfig, projectDir, args.profile);
@@ -36,7 +47,7 @@ async function handler(args) {
                 (0, ui_1.uiLine)();
                 process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
-            targetAccountId = profile.accountId;
+            targetProjectAccountId = profile.accountId;
             (0, projectProfiles_1.logProfileFooter)(profile);
         }
         else {
@@ -44,42 +55,56 @@ async function handler(args) {
             await (0, projectProfiles_1.exitIfUsingProfiles)(projectConfig, projectDir);
         }
     }
-    if (!targetAccountId) {
-        // The user is not using profiles, so we can use the derived accountId
-        targetAccountId = derivedAccountId;
-    }
-    (0, usageTracking_1.trackCommandUsage)('project-dev', {}, targetAccountId);
-    const accountConfig = (0, config_1.getAccountConfig)(targetAccountId);
-    (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.dev.logs.betaMessage`));
-    logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.dev.logs.learnMoreLocalDevServer`), 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'));
-    if (!accountConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noAccount`, {
-            accountId: (0, ui_1.uiAccountDescription)(targetAccountId),
-            authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-        }));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    if (!targetProjectAccountId) {
+        // The user is not using profile or account flags, so we can use the derived accountId
+        targetProjectAccountId = derivedAccountId;
     }
+    (0, usageTracking_1.trackCommandUsage)('project-dev', {}, targetProjectAccountId);
+    (0, ui_1.uiBetaTag)(en_1.commands.project.dev.logs.betaMessage);
+    logger_1.uiLogger.log(en_1.commands.project.dev.logs.learnMoreLocalDevServer);
     if ((0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
-        await (0, unifiedFlow_1.unifiedProjectDevFlow)(args, accountConfig, projectConfig, projectDir, profile);
+        const targetTestingAccountId = (testingAccount && (0, config_1.getAccountId)(testingAccount)) || undefined;
+        await (0, unifiedFlow_1.unifiedProjectDevFlow)({
+            args,
+            targetProjectAccountId,
+            providedTargetTestingAccountId: targetTestingAccountId,
+            projectConfig,
+            projectDir,
+            profileConfig: profile,
+        });
     }
     else {
-        await (0, deprecatedFlow_1.deprecatedProjectDevFlow)(args, accountConfig, projectConfig, projectDir);
+        await (0, deprecatedFlow_1.deprecatedProjectDevFlow)({
+            args,
+            accountId: targetProjectAccountId,
+            projectConfig,
+            projectDir,
+        });
     }
 }
 function projectDevBuilder(yargs) {
     yargs.option('profile', {
         type: 'string',
         alias: 'p',
-        description: (0, lang_1.i18n)(`commands.project.subcommands.dev.options.profile`),
+        description: en_1.commands.project.dev.options.profile,
+        hidden: true,
+    });
+    yargs.options('testingAccount', {
+        type: 'string',
+        description: en_1.commands.project.dev.options.testingAccount,
+        hidden: true,
+        implies: ['projectAccount'],
+    });
+    yargs.options('projectAccount', {
+        type: 'string',
+        description: en_1.commands.project.dev.options.projectAccount,
         hidden: true,
+        implies: ['testingAccount'],
     });
-    yargs.example([
-        [
-            '$0 project dev',
-            (0, lang_1.i18n)(`commands.project.subcommands.dev.examples.default`),
-        ],
-    ]);
+    yargs.example([['$0 project dev', en_1.commands.project.dev.examples.default]]);
     yargs.conflicts('profile', 'account');
+    yargs.conflicts('profile', 'testingAccount');
+    yargs.conflicts('profile', 'projectAccount');
     return yargs;
 }
 exports.builder = (0, yargsUtils_1.makeYargsBuilder)(projectDevBuilder, command, describe, {

package/commands/project/dev/unifiedFlow.d.ts

@@ -1,6 +1,14 @@
 import { ArgumentsCamelCase } from 'yargs';
 import { HsProfileFile } from '@hubspot/project-parsing-lib/src/lib/types';
-import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { ProjectDevArgs } from '../../../types/Yargs';
 import { ProjectConfig } from '../../../types/Projects';
-export declare function unifiedProjectDevFlow(args: ArgumentsCamelCase<ProjectDevArgs>, accountConfig: CLIAccount, projectConfig: ProjectConfig, projectDir: string, profileConfig?: HsProfileFile): Promise<void>;
+type UnifiedProjectDevFlowArgs = {
+    args: ArgumentsCamelCase<ProjectDevArgs>;
+    targetProjectAccountId: number;
+    providedTargetTestingAccountId?: number;
+    projectConfig: ProjectConfig;
+    projectDir: string;
+    profileConfig?: HsProfileFile;
+};
+export declare function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTargetTestingAccountId, projectConfig, projectDir, profileConfig, }: UnifiedProjectDevFlowArgs): Promise<void>;
+export {};

package/commands/project/dev/unifiedFlow.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.unifiedProjectDevFlow = unifiedProjectDevFlow;
 const path_1 = __importDefault(require("path"));
 const util_1 = __importDefault(require("util"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
 const config_1 = require("@hubspot/local-dev-lib/constants/config");
 const errors_1 = require("@hubspot/project-parsing-lib/src/lib/errors");
 const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
@@ -24,14 +22,10 @@ const LocalDevWatcher_1 = __importDefault(require("../../../lib/projects/localDe
 const process_1 = require("../../../lib/process");
 const accountTypes_1 = require("../../../lib/accountTypes");
 const ui_1 = require("../../../lib/ui");
-const lang_1 = require("../../../lib/lang");
-// import LocalDevWebsocketServer from '../../../lib/projects/localDev/LocalDevWebsocketServer';
-async function unifiedProjectDevFlow(args, accountConfig, projectConfig, projectDir, profileConfig) {
-    const targetProjectAccountId = (0, getAccountIdentifier_1.getAccountIdentifier)(accountConfig);
+const logger_1 = require("../../../lib/ui/logger");
+const en_1 = require("../../../lang/en");
+async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTargetTestingAccountId, projectConfig, projectDir, profileConfig, }) {
     const env = (0, environment_1.getValidEnv)((0, config_2.getEnv)(targetProjectAccountId));
-    if (!targetProjectAccountId) {
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
     let projectNodes;
     // Get IR
     try {
@@ -41,58 +35,49 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
             accountId: targetProjectAccountId,
         }, { profile: args.profile });
         projectNodes = intermediateRepresentation.intermediateNodesIndexedByUid;
-        logger_1.logger.debug(util_1.default.inspect(projectNodes, false, null, true));
+        logger_1.uiLogger.debug(util_1.default.inspect(projectNodes, false, null, true));
     }
     catch (e) {
         if ((0, errors_1.isTranslationError)(e)) {
-            logger_1.logger.error(e.toString());
+            logger_1.uiLogger.error(e.toString());
         }
         else {
             (0, errorHandlers_1.logError)(e);
         }
         return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    // @TODO Do we need to do more than this or leave it to the dev servers?
     if (!Object.keys(projectNodes).length) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noRunnableComponents`, {
-            projectDir,
-            command: (0, ui_1.uiCommandReference)('hs project add'),
-        }));
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.noRunnableComponents);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
-    // @TODO Validate component types (i.e. previously you could not have both private and public apps)
+    const targetProjectAccountConfig = (0, config_2.getAccountConfig)(targetProjectAccountId);
+    if (!targetProjectAccountConfig) {
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.noAccount(targetProjectAccountId));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const accounts = (0, config_2.getConfigAccounts)();
-    const accountIsCombined = await (0, accountTypes_1.isUnifiedAccount)(accountConfig);
+    const accountIsCombined = await (0, accountTypes_1.isUnifiedAccount)(targetProjectAccountConfig);
     if (!accountIsCombined && !profileConfig) {
-        logger_1.logger.log('');
-        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.accountNotCombined`, {
-            accountUseCommand: (0, ui_1.uiCommandReference)('hs account use'),
-        }));
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.accountNotCombined);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    let targetTestingAccountId = null;
+    let targetTestingAccountId = providedTargetTestingAccountId;
     if (profileConfig) {
         // Bypass the prompt for the testing account if the user has a profile configured
         targetTestingAccountId = profileConfig.accountId;
     }
-    else if (args.providedAccountId) {
-        // By pass the prompt if the user explicitly provides an --account flag.
-        targetTestingAccountId = targetProjectAccountId;
-    }
-    else {
-        logger_1.logger.log('');
+    else if (!targetTestingAccountId) {
+        logger_1.uiLogger.log('');
         (0, ui_1.uiLine)();
-        logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.dev.logs.accountTypeInformation`));
-        logger_1.logger.log('');
-        logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.dev.logs.learnMoreMessage`, {
-            learnMoreLink: (0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.dev.logs.learnMoreLink`), 'https://developers.hubspot.com/docs/getting-started/account-types'),
-        }));
+        logger_1.uiLogger.log(en_1.commands.project.dev.logs.accountTypeInformation);
+        logger_1.uiLogger.log(en_1.commands.project.dev.logs.learnMoreMessage);
         (0, ui_1.uiLine)();
-        logger_1.logger.log('');
-        const accountType = await (0, helpers_1.selectAccountTypePrompt)(accountConfig);
+        logger_1.uiLogger.log('');
+        const accountType = await (0, helpers_1.selectAccountTypePrompt)(targetProjectAccountConfig);
         if (accountType === config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST) {
-            const devAccountPromptResponse = await (0, projectDevTargetAccountPrompt_1.selectDeveloperTestTargetAccountPrompt)(accounts, accountConfig);
-            targetTestingAccountId = devAccountPromptResponse.targetAccountId;
+            const devAccountPromptResponse = await (0, projectDevTargetAccountPrompt_1.selectDeveloperTestTargetAccountPrompt)(accounts, targetProjectAccountConfig);
+            targetTestingAccountId =
+                devAccountPromptResponse.targetAccountId || undefined;
             if (!!devAccountPromptResponse.notInConfigAccount) {
                 // When the developer test account isn't configured in the CLI config yet
                 // Walk the user through adding the account's PAK to the config
@@ -100,12 +85,13 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
             }
             else if (devAccountPromptResponse.createNestedAccount) {
                 // Create a new developer test account and automatically add it to the CLI config
-                targetTestingAccountId = await (0, helpers_1.createDeveloperTestAccountForLocalDev)(targetProjectAccountId, accountConfig, env);
+                targetTestingAccountId = await (0, helpers_1.createDeveloperTestAccountForLocalDev)(targetProjectAccountId, targetProjectAccountConfig, env);
             }
         }
         else if (accountType === config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
-            const sandboxAccountPromptResponse = await (0, projectDevTargetAccountPrompt_1.selectSandboxTargetAccountPrompt)(accounts, accountConfig);
-            targetTestingAccountId = sandboxAccountPromptResponse.targetAccountId;
+            const sandboxAccountPromptResponse = await (0, projectDevTargetAccountPrompt_1.selectSandboxTargetAccountPrompt)(accounts, targetProjectAccountConfig);
+            targetTestingAccountId =
+                sandboxAccountPromptResponse.targetAccountId || undefined;
         }
         else {
             targetTestingAccountId = targetProjectAccountId;
@@ -138,6 +124,7 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
         targetTestingAccountId: targetTestingAccountId,
         projectConfig,
         projectDir,
+        projectName: project.name,
         projectId: project.id,
         env,
     });

package/commands/project.js

@@ -51,5 +51,3 @@ const projectCommand = {
     handler: () => { },
 };
 exports.default = projectCommand;
-// TODO Remove this legacy export once we've migrated all commands to TS
-module.exports = projectCommand;

package/commands/remove.js

@@ -1,28 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const fileMapper_1 = require("@hubspot/local-dev-lib/api/fileMapper");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const index_1 = require("../lib/errorHandlers/index");
 const usageTracking_1 = require("../lib/usageTracking");
-const lang_1 = require("../lib/lang");
+const en_1 = require("../lang/en");
 const yargsUtils_1 = require("../lib/yargsUtils");
+const logger_1 = require("../lib/ui/logger");
 const command = 'remove <path>';
-const describe = (0, lang_1.i18n)(`commands.remove.describe`);
+const describe = en_1.commands.remove.describe;
 async function handler(args) {
     const { path: hsPath, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('remove', undefined, derivedAccountId);
     try {
         await (0, fileMapper_1.deleteFile)(derivedAccountId, hsPath);
-        logger_1.logger.log((0, lang_1.i18n)(`commands.remove.deleted`, {
-            accountId: derivedAccountId,
-            path: hsPath,
-        }));
+        logger_1.uiLogger.log(en_1.commands.remove.deleted(hsPath, derivedAccountId));
     }
     catch (error) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.remove.errors.deleteFailed`, {
-            accountId: derivedAccountId,
-            path: hsPath,
-        }));
+        logger_1.uiLogger.error(en_1.commands.remove.errors.deleteFailed(hsPath, derivedAccountId));
         (0, index_1.logError)(error, new index_1.ApiErrorContext({
             accountId: derivedAccountId,
             request: hsPath,
@@ -31,7 +25,7 @@ async function handler(args) {
 }
 function cmsRemoveBuilder(yargs) {
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)(`commands.remove.positionals.path.describe`),
+        describe: en_1.commands.remove.positionals.path,
         type: 'string',
     });
     return yargs;
@@ -49,5 +43,3 @@ const cmsRemoveCommand = {
     builder,
 };
 exports.default = cmsRemoveCommand;
-// TODO Remove this legacy export once we've migrated all commands to TS
-module.exports = cmsRemoveCommand;

package/commands/sandbox.js

@@ -22,5 +22,3 @@ const sandboxCommand = {
     handler: () => { },
 };
 exports.default = sandboxCommand;
-// TODO Remove this legacy export once we've migrated all commands to TS
-module.exports = sandboxCommand;

package/commands/secret.js

@@ -28,5 +28,3 @@ const secretCommand = {
     handler: () => { },
 };
 exports.default = secretCommand;
-// TODO Remove this legacy export once we've migrated all commands to TS
-module.exports = secretCommand;

package/commands/theme/generate-selectors.js

@@ -4,11 +4,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const lang_1 = require("../../lib/lang");
+const en_1 = require("../../lang/en");
 const generateSelectors_1 = require("../../lib/generateSelectors");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
+const logger_1 = require("../../lib/ui/logger");
 const HUBL_EXPRESSION_REGEX = new RegExp(/{%\s*(.*)\s*%}/, 'g');
 const HUBL_VARIABLE_NAME_REGEX = new RegExp(/{%\s*set\s*(\w*)/, 'i');
 const HUBL_STATEMENT_REGEX = new RegExp(/{{\s*[\w.(,\d\-\s)|/~]*.*}}/, 'g');
@@ -19,12 +19,12 @@ const CSS_SELECTORS_REGEX = new RegExp(/([\s\w:.,\0-[\]]*){/, 'i');
 const CSS_EXPRESSION_REGEX = new RegExp(/(?!\s)([^}])*(?![.#\s,>])[^}]*}/, 'g');
 const THEME_PATH_REGEX = new RegExp(/=\s*.*(theme\.(\w|\.)*)/, 'i');
 const command = 'generate-selectors <path>';
-const describe = (0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.describe');
+const describe = en_1.commands.theme.subcommands.generateSelectors.describe;
 async function handler(args) {
     const { path } = args;
     const fieldsJsonPath = (0, generateSelectors_1.findFieldsJsonPath)(path);
     if (!fieldsJsonPath) {
-        logger_1.logger.error((0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.errors.fieldsNotFound'));
+        logger_1.uiLogger.error(en_1.commands.theme.subcommands.generateSelectors.errors.fieldsNotFound);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     let fieldsJson = JSON.parse(fs_1.default.readFileSync(fieldsJsonPath, 'utf-8'));
@@ -134,7 +134,7 @@ async function handler(args) {
         return themeFieldsSelectorMap;
     }, {});
     if (!Object.keys(finalMap).length) {
-        logger_1.logger.error((0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.errors.noSelectorsFound'));
+        logger_1.uiLogger.error(en_1.commands.theme.subcommands.generateSelectors.errors.noSelectorsFound);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     Object.keys(finalMap).forEach(themeFieldKey => {
@@ -151,14 +151,11 @@ async function handler(args) {
     const selectorsMap = (0, generateSelectors_1.generateSelectorsMap)(fieldsJson);
     const selectorsPath = `${path}/editor-preview.json`;
     fs_1.default.writeFileSync(selectorsPath, `${JSON.stringify({ selectors: selectorsMap }, null, 2)}\n`);
-    logger_1.logger.success((0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.success', {
-        themePath: path,
-        selectorsPath,
-    }));
+    logger_1.uiLogger.success(en_1.commands.theme.subcommands.generateSelectors.success(path, selectorsPath));
 }
 function themeSelectorBuilder(yargs) {
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.generateSelectors.positionals.path.describe'),
+        describe: en_1.commands.theme.subcommands.generateSelectors.positionals.path,
         type: 'string',
         required: true,
     });

package/commands/theme/marketplace-validate.js

@@ -6,31 +6,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const usageTracking_1 = require("../../lib/usageTracking");
 const marketplaceValidate_1 = require("../../lib/marketplaceValidate");
-const lang_1 = require("../../lib/lang");
+const en_1 = require("../../lang/en");
 const yargsUtils_1 = require("../../lib/yargsUtils");
 const command = 'marketplace-validate <path>';
-const describe = (0, lang_1.i18n)('commands.theme.subcommands.marketplaceValidate.describe');
+const describe = en_1.commands.theme.subcommands.marketplaceValidate.describe;
 async function handler(args) {
     const { path, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('validate', {}, derivedAccountId);
     SpinniesManager_1.default.init();
     SpinniesManager_1.default.add('marketplaceValidation', {
-        text: (0, lang_1.i18n)('commands.theme.subcommands.marketplaceValidate.logs.validatingTheme', {
-            path,
-        }),
+        text: en_1.commands.theme.subcommands.marketplaceValidate.logs.validatingTheme(path),
     });
     const assetType = 'THEME';
     const validationId = await (0, marketplaceValidate_1.kickOffValidation)(derivedAccountId, assetType, path);
     await (0, marketplaceValidate_1.pollForValidationFinish)(derivedAccountId, validationId);
     SpinniesManager_1.default.remove('marketplaceValidation');
     const validationResults = await (0, marketplaceValidate_1.fetchValidationResults)(derivedAccountId, validationId);
-    (0, marketplaceValidate_1.processValidationErrors)('commands.theme.subcommands.marketplaceValidate', validationResults);
-    (0, marketplaceValidate_1.displayValidationResults)('commands.theme.subcommands.marketplaceValidate', validationResults);
+    (0, marketplaceValidate_1.processValidationErrors)(en_1.commands.theme.subcommands.marketplaceValidate.errors.invalidPath, validationResults);
+    (0, marketplaceValidate_1.displayValidationResults)(en_1.commands.theme.subcommands.marketplaceValidate.results, validationResults);
     process.exit();
 }
 function themeValidateBuilder(yargs) {
     yargs.positional('path', {
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.marketplaceValidate.positionals.path.describe'),
+        describe: en_1.commands.theme.subcommands.marketplaceValidate.positionals.path.describe,
         type: 'string',
         required: true,
     });

package/commands/theme/preview.js

@@ -6,8 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const cli_progress_1 = __importDefault(require("cli-progress"));
-const lang_1 = require("../../lib/lang");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
+const en_1 = require("../../lang/en");
 const path_2 = require("@hubspot/local-dev-lib/path");
 const files_1 = require("@hubspot/local-dev-lib/constants/files");
 const themes_1 = require("@hubspot/local-dev-lib/cms/themes");
@@ -24,13 +23,12 @@ const Projects_1 = require("../../types/Projects");
 const hasFeature_1 = require("../../lib/hasFeature");
 const constants_1 = require("../../lib/constants");
 const yargsUtils_1 = require("../../lib/yargsUtils");
+const logger_1 = require("../../lib/ui/logger");
 const command = 'preview [--src] [--dest]';
-const describe = (0, lang_1.i18n)('commands.theme.subcommands.preview.describe');
+const describe = en_1.commands.theme.subcommands.preview.describe;
 function validateSrcPath(src) {
     const logInvalidPath = () => {
-        logger_1.logger.error((0, lang_1.i18n)('commands.theme.subcommands.preview.errors.invalidPath', {
-            path: src,
-        }));
+        logger_1.uiLogger.error(en_1.commands.theme.subcommands.preview.errors.invalidPath(src));
     };
     try {
         const stats = fs_1.default.statSync(src);
@@ -47,7 +45,7 @@ function validateSrcPath(src) {
 }
 function handleUserInput() {
     const onTerminate = () => {
-        logger_1.logger.log((0, lang_1.i18n)('commands.theme.subcommands.preview.logs.processExited'));
+        logger_1.uiLogger.log(en_1.commands.theme.subcommands.preview.logs.processExited);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     };
     (0, process_1.handleExit)(onTerminate);
@@ -78,7 +76,7 @@ async function determineSrcAndDest(args) {
             const projectComponents = await (0, structure_1.findProjectComponents)(projectDir);
             const themeComponents = projectComponents.filter(c => c.type === Projects_1.ComponentTypes.HublTheme);
             if (themeComponents.length === 0) {
-                logger_1.logger.error((0, lang_1.i18n)('commands.theme.subcommands.preview.errors.noThemeComponents'));
+                logger_1.uiLogger.error(en_1.commands.theme.subcommands.preview.errors.noThemeComponents);
                 process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
             const answer = await (0, previewPrompt_1.previewProjectPrompt)(themeComponents);
@@ -102,7 +100,7 @@ async function handler(args) {
             hideCursor: true,
         }, cli_progress_1.default.Presets.rect);
         initialUploadProgressBar.start(numFiles, 0, {
-            label: (0, lang_1.i18n)('commands.theme.subcommands.preview.initialUploadProgressBar.start'),
+            label: en_1.commands.theme.subcommands.preview.initialUploadProgressBar.start,
         });
         let uploadsHaveStarted = false;
         const uploadOptions = {
@@ -114,7 +112,8 @@ async function handler(args) {
                 if (!uploadsHaveStarted) {
                     uploadsHaveStarted = true;
                     initialUploadProgressBar.update(0, {
-                        label: (0, lang_1.i18n)('commands.theme.subcommands.preview.initialUploadProgressBar.uploading'),
+                        label: en_1.commands.theme.subcommands.preview.initialUploadProgressBar
+                            .uploading,
                     });
                 }
             },
@@ -127,12 +126,12 @@ async function handler(args) {
             onFinalErrorCallback: () => initialUploadProgressBar.increment(),
             onFinishCallback: (results) => {
                 initialUploadProgressBar.update(numFiles, {
-                    label: (0, lang_1.i18n)('commands.theme.subcommands.preview.initialUploadProgressBar.finish'),
+                    label: en_1.commands.theme.subcommands.preview.initialUploadProgressBar.finish,
                 });
                 initialUploadProgressBar.stop();
                 results.forEach(result => {
                     if (result.resultType == files_1.FILE_UPLOAD_RESULT_TYPES.FAILURE) {
-                        logger_1.logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
+                        logger_1.uiLogger.error(en_1.commands.theme.subcommands.preview.errors.uploadFailed(result.file, dest));
                         (0, index_1.logError)(result.error, new index_1.ApiErrorContext({
                             accountId: derivedAccountId,
                             request: dest,
@@ -154,7 +153,7 @@ async function handler(args) {
         createUnifiedDevServer = createDevServer;
     }
     catch (e) {
-        logger_1.logger.warn('Unified dev server requires node 20 to run. Defaulting to legacy preview.');
+        logger_1.uiLogger.warn('Unified dev server requires node 20 to run. Defaulting to legacy preview.');
     }
     const isUngatedForUnified = await (0, hasFeature_1.hasFeature)(derivedAccountId, constants_1.FEATURES.UNIFIED_THEME_PREVIEW);
     if (isUngatedForUnified && createUnifiedDevServer) {
@@ -183,27 +182,27 @@ async function handler(args) {
 function themePreviewBuilder(yargs) {
     yargs
         .option('src', {
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.src.describe'),
+        describe: en_1.commands.theme.subcommands.preview.positionals.src,
         type: 'string',
         requiresArg: true,
     })
         .option('dest', {
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.dest.describe'),
+        describe: en_1.commands.theme.subcommands.preview.positionals.dest,
         type: 'string',
         requiresArg: true,
     })
         .option('notify', {
         alias: 'n',
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.notify.describe'),
+        describe: en_1.commands.theme.subcommands.preview.options.notify,
         type: 'string',
         requiresArg: true,
     })
         .option('no-ssl', {
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.noSsl.describe'),
+        describe: en_1.commands.theme.subcommands.preview.options.noSsl,
         type: 'boolean',
     })
         .option('port', {
-        describe: (0, lang_1.i18n)('commands.theme.subcommands.preview.options.port.describe'),
+        describe: en_1.commands.theme.subcommands.preview.options.port,
         type: 'number',
     })
         .option('resetSession', {

package/commands/theme.js

@@ -6,10 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const marketplace_validate_1 = __importDefault(require("./theme/marketplace-validate"));
 const generate_selectors_1 = __importDefault(require("./theme/generate-selectors"));
 const preview_1 = __importDefault(require("./theme/preview"));
-const lang_1 = require("../lib/lang");
+const en_1 = require("../lang/en");
 const yargsUtils_1 = require("../lib/yargsUtils");
 const command = ['theme', 'themes'];
-const describe = (0, lang_1.i18n)('commands.theme.describe');
+const describe = en_1.commands.theme.describe;
 function themeBuilder(yargs) {
     yargs
         .command(preview_1.default)
@@ -26,5 +26,3 @@ const themeCommand = {
     handler: () => { },
 };
 exports.default = themeCommand;
-// TODO Remove this legacy export once we've migrated all commands to TS
-module.exports = themeCommand;