@hubspot/cli 5.1.4-beta.0 → 5.1.4-beta.2

package/commands/upload.js

@@ -10,7 +10,7 @@ const {
   convertToUnixPath,
   isAllowedExtension,
 } = require('@hubspot/local-dev-lib/path');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   ApiErrorContext,
   logApiUploadErrorInstance,

package/commands/watch.js

@@ -3,7 +3,7 @@ const path = require('path');
 
 const { watch } = require('@hubspot/cli-lib');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 
 const {
   addConfigOptions,

package/lang/en.lyaml

@@ -147,6 +147,19 @@ en:
                 describe: "Medium to test against"
               verbose:
                 describe: "View a detailed output of the lighthouse sores"
+          reactModule:
+            describe: "Get a specified default React module"
+            options:
+              name:
+                describe: "Name of the react modules to be fetched"
+              dest:
+                describe: "Destination to download the react module to"
+            success:
+              moduleDownloaded: "\"{{ moduleName }}\" succesfully downloaded to \"{{ path }}\""
+            errors:
+              pathExists: "Folder already exists at \"{{ path }}\""
+              invalidName: "Module not found with that name, please check the spelling of the module you are trying to download."
+            groupLabel: "React modules available to download:"
       create:
         describe: "Create HubSpot sample apps and CMS assets. Supported assets are {{ supportedAssetTypes }}."
         errors:
@@ -467,7 +480,7 @@ en:
               projectMustExistExplanation: "The project {{ projectName }} does not exist in the target account {{ accountIdentifier}}. This command requires the project to exist in the target account."
               choseNotToCreateProject: "Exiting because this command requires the project to exist in the target account."
               initialUploadMessage: "HubSpot Local Dev Server Startup"
-              declineDefaultSandboxExplanation: "To develop on a different account, run {{ useCommand }} to change your default account, then re-run {{ devCommand }}."
+              declineDefaultAccountExplanation: "To develop on a different account, run {{ useCommand }} to change your default account, then re-run {{ devCommand }}."
             status:
               creatingProject: "Creating project {{ projectName }} in {{ accountIdentifier }}"
               createdProject: "Created project {{ projectName }} in {{ accountIdentifier }}"
@@ -876,6 +889,25 @@ en:
           disableInitial: "Passing the \"--disable-initial\" option is no longer necessary. Running \"hs watch\" no longer uploads the watched directory by default."
           initialUpload: "To upload the directory run \"hs upload\" beforehand or add the \"--initial-upload\" option when running \"hs watch\"."
           notUploaded: "The \"hs watch\" command no longer uploads the watched directory when started. The directory \"{{ path }}\" was not uploaded."
+      preview:
+        describe: "Upload and watch a theme directory on your computer for changes and start a local development server to preview theme changes on a site"
+        errors:
+          invalidPath: "The path \"{{ path }}\" is not a path to a directory"
+        options:
+          src:
+            describe: "Path to the local directory your theme is in, relative to your current working directory"
+          dest:
+            describe: "Path in HubSpot Design Tools. Can be a net new path. If you wish to preview a site page using your theme changes it must match the path of the theme used by the site."
+          notify:
+            describe: "Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file"
+          noSsl:
+            describe: "Disable HTTPS"
+          port:
+            describe: "The port on which to start the local server"
+        initialUploadProgressBar:
+          start: "Starting..."
+          uploading: "Uploading..."
+          finish: "Complete!"
       convertFields:
         describe: "Converts a specific JavaScript fields file of a module or theme to JSON"
         positionals:
@@ -1029,7 +1061,7 @@ en:
           promptMessage: "[--account] Choose a sandbox under {{ accountIdentifier }} to test with:"
           sandboxLimit: "Your account reached the limit of {{ limit }} development sandboxes"
           sandboxLimitWithSuggestion: "Your account reached the limit of {{ limit }} development sandboxes. Run {{ authCommand }} to add an existing one to the config."
-          confirmDefaultSandboxAccount: "Continue testing on {{#bold}}{{ accountName }} ({{ accountType }}){{/bold}}? (Y/n)"
+          confirmDefaultAccount: "Continue testing on {{#bold}}{{ accountName }} ({{ accountType }}){{/bold}}? (Y/n)"
         projectLogsPrompt:
           projectName:
             message: "[--project] Enter the project name:"
@@ -1078,6 +1110,7 @@ en:
           selectTemplate: "Select the type of template to create"
         createModulePrompt:
           enterLabel: "What should the module label be?"
+          selectReactType: "Is this a React module?"
           selectContentType: "What types of content will this module be used in?"
           confirmGlobal: "Is this a global module?"
           errors:
@@ -1161,6 +1194,12 @@ en:
           errors:
             buildIdDoesNotExist: "Build {{ buildId }} does not exist for project {{ projectName }}."
             buildAlreadyDeployed: "Build {{ buildId }} is already deployed."
+        previewPrompt:
+          enterSrc: "[--src] Enter a local theme directory to preview."
+          enterDest: "[--dest] Enter the destination path for the src theme in HubSpot Design Tools."
+          errors:
+            srcRequired: "You must specify a source directory."
+            destRequired: "You must specify a destination directory."
         cleanUploadPrompt:
           message: "You are about to remove any remote files in \"{{ filePath }}\" on HubSpot account {{ accountId }} that don't exist locally. Are you sure you want to do this?"
       convertFields:

package/lib/DevServerManager.js

@@ -1,4 +1,4 @@
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { COMPONENT_TYPES } = require('./projectStructure');
 const { i18n } = require('./lang');
 const { promptUser } = require('./prompts/promptUtils');
@@ -9,6 +9,11 @@ const {
   stopPortManagerServer,
   requestPorts,
 } = require('@hubspot/local-dev-lib/portManager');
+const {
+  getHubSpotApiOrigin,
+  getHubSpotWebsiteOrigin,
+} = require('@hubspot/local-dev-lib/urls');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 
 const i18nKey = 'cli.lib.DevServerManager';
 
@@ -29,7 +34,6 @@ class DevServerManager {
         serverInterface: DevModeInterface,
       },
     };
-    this.debug = false;
   }
 
   async iterateDevServers(callback) {
@@ -62,19 +66,22 @@ class DevServerManager {
     }, {});
   }
 
-  async setup({ components, debug, onUploadRequired }) {
-    this.debug = debug;
+  async setup({ components, onUploadRequired, accountId }) {
     this.componentsByType = this.arrangeComponentsByType(components);
-
+    const { env } = getAccountConfig(accountId);
     await startPortManagerServer();
     await this.iterateDevServers(
       async (serverInterface, compatibleComponents) => {
         if (serverInterface.setup) {
           await serverInterface.setup({
             components: compatibleComponents,
-            debug,
             onUploadRequired,
             promptUser,
+            logger,
+            urls: {
+              api: getHubSpotApiOrigin(env),
+              web: getHubSpotWebsiteOrigin(env),
+            },
           });
         }
       }
@@ -89,7 +96,6 @@ class DevServerManager {
         if (serverInterface.start) {
           await serverInterface.start({
             accountId,
-            debug: this.debug,
             projectConfig,
             requestPorts,
           });

package/lib/LocalDevManager.js

@@ -3,7 +3,7 @@ const chokidar = require('chokidar');
 const chalk = require('chalk');
 const { i18n } = require('./lang');
 const { handleKeypress } = require('./process');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   getAccountId,
   getConfigDefaultAccount,
@@ -322,8 +322,8 @@ class LocalDevManager {
     try {
       await DevServerManager.setup({
         components,
-        debug: this.debug,
         onUploadRequired: this.logUploadWarning.bind(this),
+        accountId: this.targetAccountId,
       });
       return true;
     } catch (e) {

package/lib/__tests__/validation.js

@@ -9,7 +9,7 @@ const { validateAccount } = require('../validation');
 
 jest.mock('@hubspot/cli-lib');
 jest.mock('@hubspot/local-dev-lib/config');
-jest.mock('@hubspot/cli-lib/logger');
+jest.mock('@hubspot/local-dev-lib/logger');
 jest.mock('@hubspot/local-dev-lib/oauth');
 jest.mock('@hubspot/local-dev-lib/personalAccessKey');
 jest.mock('../commonOpts');

package/lib/commonOpts.js

@@ -1,6 +1,6 @@
-const Logger = require('@hubspot/cli-lib/logger');
 const {
-  setLogLevel: setLocalDevLibLogLevel,
+  LOG_LEVEL,
+  setLogLevel: setLoggerLogLevel,
 } = require('@hubspot/local-dev-lib/logger');
 const { DEFAULT_MODE, Mode } = require('@hubspot/cli-lib');
 const {
@@ -11,7 +11,6 @@ const {
 const { i18n } = require('./lang');
 
 const i18nKey = 'cli.lib.commonOpts';
-const { LOG_LEVEL } = Logger;
 
 const addAccountOptions = program =>
   program.option('portal', {
@@ -68,17 +67,9 @@ const addUseEnvironmentOptions = yargs =>
 const setLogLevel = (options = {}) => {
   const { debug } = options;
   if (debug) {
-    Logger.setLogLevel(LOG_LEVEL.DEBUG);
-
-    // Update the log level in local-dev-lib's instance of the logger
-    // This will evenutally replace cli-lib's version of it
-    setLocalDevLibLogLevel(LOG_LEVEL.DEBUG);
+    setLoggerLogLevel(LOG_LEVEL.DEBUG);
   } else {
-    Logger.setLogLevel(LOG_LEVEL.LOG);
-
-    // Update the log level in local-dev-lib's instance of the logger
-    // This will evenutally replace cli-lib's version of it
-    setLocalDevLibLogLevel(LOG_LEVEL.LOG);
+    setLoggerLogLevel(LOG_LEVEL.LOG);
   }
 };
 

package/lib/constants.js

@@ -2,7 +2,18 @@ const HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH =
   'HubSpot/hubspot-project-components';
 const DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
 
+// Sandboxes
+const STANDARD_SANDBOX_TYPE = 'standard';
+const DEVELOPER_SANDBOX_TYPE = 'developer';
+
+const STANDARD_SANDBOX = 'STANDARD';
+const DEVELOPER_SANDBOX = 'DEVELOPER';
+
 module.exports = {
   HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
   DEFAULT_PROJECT_TEMPLATE_BRANCH,
+  STANDARD_SANDBOX_TYPE,
+  DEVELOPER_SANDBOX_TYPE,
+  STANDARD_SANDBOX,
+  DEVELOPER_SANDBOX,
 };

package/lib/developerTestAccounts.js

@@ -0,0 +1,14 @@
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
+
+const DEV_TEST_ACCOUNT_STRING = 'developer test account';
+
+const isDeveloperTestAccount = config =>
+  config.accountType &&
+  config.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST;
+
+module.exports = {
+  DEV_TEST_ACCOUNT_STRING,
+  isDeveloperTestAccount,
+};

package/lib/errorHandlers/apiErrors.js

@@ -1,4 +1,4 @@
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const {
   getAxiosErrorWithContext,

package/lib/errorHandlers/fileSystemErrors.js

@@ -1,4 +1,4 @@
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   ErrorContext,
   isSystemError,

package/lib/errorHandlers/standardErrors.js

@@ -2,7 +2,7 @@ const util = require('util');
 const {
   HubSpotAuthError,
 } = require('@hubspot/local-dev-lib/models/HubSpotAuthError');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { i18n } = require('../lang');
 
 const i18nKey = 'cli.lib.errorHandlers.standardErrors';

package/lib/generate-selectors.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const { EXIT_CODES } = require('./enums/exitCodes');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { i18n } = require('../lib/lang');
 
 const CSS_COMMENTS_REGEX = new RegExp(/\/\*.*\*\//, 'g');

package/lib/hublValidate.js

@@ -1,4 +1,4 @@
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 
 const getErrorsFromHublValidationObject = validation =>
   (validation && validation.meta && validation.meta.template_errors) || [];

package/lib/lang.js

@@ -2,7 +2,7 @@ const util = require('util');
 const path = require('path');
 const fs = require('fs-extra');
 const yaml = require('js-yaml');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { interpolate } = require('./interpolation');
 
 const MISSING_LANGUAGE_DATA_PREFIX = '[Missing language data]';

package/lib/links.js

@@ -1,7 +1,7 @@
 const { getEnv } = require('@hubspot/local-dev-lib/config');
 const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   getTableContents,
   getTableHeader,

package/lib/marketplace-validate.js

@@ -1,6 +1,6 @@
 const chalk = require('chalk');
 
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   requestValidation,
   getValidationStatus,

package/lib/oauth.js

@@ -7,7 +7,7 @@ const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { addOauthToAccountConfig } = require('@hubspot/local-dev-lib/oauth');
 const { handleExit } = require('./process');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
 
 const PORT = 3000;

package/lib/process.js

@@ -1,5 +1,9 @@
 const readline = require('readline');
-const { logger, setLogLevel, LOG_LEVEL } = require('@hubspot/cli-lib/logger');
+const {
+  logger,
+  setLogLevel,
+  LOG_LEVEL,
+} = require('@hubspot/local-dev-lib/logger');
 const {
   setLogLevel: setLocalDevLibLogLevel,
 } = require('@hubspot/local-dev-lib/logger');

package/lib/projectStructure.js

@@ -1,7 +1,7 @@
 const fs = require('fs');
 const path = require('path');
 const { walk } = require('@hubspot/local-dev-lib/fs');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logErrorInstance } = require('./errorHandlers/standardErrors');
 
 const COMPONENT_TYPES = Object.freeze({

package/lib/projects.js

@@ -4,7 +4,7 @@ const archiver = require('archiver');
 const tmp = require('tmp');
 const chalk = require('chalk');
 const findup = require('findup-sync');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {

package/lib/projectsWatch.js

@@ -7,7 +7,7 @@ const {
   ApiErrorContext,
 } = require('./errorHandlers/apiErrors');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { isAllowedExtension } = require('@hubspot/local-dev-lib/path');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const {

package/lib/prompts/accountsPrompt.js

@@ -1,15 +1,13 @@
 const { updateDefaultAccount } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
-const { getAccountName } = require('../sandboxes');
+const { uiAccountDescription } = require('../ui');
 
 const mapAccountChoices = portals =>
-  portals.map(p => {
-    return {
-      name: getAccountName(p),
-      value: p.name || p.portalId,
-    };
-  });
+  portals.map(p => ({
+    name: uiAccountDescription(p.portalId, false),
+    value: p.name || p.portalId,
+  }));
 
 const i18nKey = 'cli.commands.accounts.subcommands.use';
 

package/lib/prompts/createModulePrompt.js

@@ -15,6 +15,14 @@ const MODULE_LABEL_PROMPT = {
     return true;
   },
 };
+
+const REACT_TYPE_PROMPT = {
+  type: 'confirm',
+  name: 'reactType',
+  message: i18n(`${i18nKey}.selectReactType`),
+  default: false,
+};
+
 const CONTENT_TYPES_PROMPT = {
   type: 'checkbox',
   name: 'contentTypes',
@@ -44,7 +52,12 @@ const GLOBAL_PROMPT = {
 };
 
 function createModulePrompt() {
-  return promptUser([MODULE_LABEL_PROMPT, CONTENT_TYPES_PROMPT, GLOBAL_PROMPT]);
+  return promptUser([
+    MODULE_LABEL_PROMPT,
+    REACT_TYPE_PROMPT,
+    CONTENT_TYPES_PROMPT,
+    GLOBAL_PROMPT,
+  ]);
 }
 
 module.exports = {

package/lib/prompts/createProjectPrompt.js

@@ -7,7 +7,7 @@ const {
 const { promptUser } = require('./promptUtils');
 const { fetchJsonFromRepository } = require('@hubspot/cli-lib/github');
 const { i18n } = require('../lang');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const {
   HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,

package/lib/prompts/personalAccessKeyPrompt.js

@@ -5,7 +5,7 @@ const {
 } = require('@hubspot/cli-lib/lib/constants');
 const { deleteEmptyConfigFile } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { promptUser } = require('./promptUtils');
 const { accountNamePrompt } = require('./enterAccountNamePrompt');
 const { i18n } = require('../lang');

package/lib/prompts/previewPrompt.js

@@ -0,0 +1,39 @@
+const path = require('path');
+const { getCwd } = require('@hubspot/local-dev-lib/path');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('../lang');
+
+const i18nKey = 'cli.lib.prompts.previewPrompt';
+
+const previewPrompt = (promptOptions = {}) => {
+  return promptUser([
+    {
+      name: 'src',
+      message: i18n(`${i18nKey}.enterSrc`),
+      when: !promptOptions.src,
+      default: '.',
+      validate: input => {
+        if (!input) {
+          return i18n(`${i18nKey}.errors.srcRequired`);
+        }
+        return true;
+      },
+    },
+    {
+      name: 'dest',
+      message: i18n(`${i18nKey}.enterDest`),
+      when: !promptOptions.dest,
+      default: path.basename(getCwd()),
+      validate: input => {
+        if (!input) {
+          return i18n(`${i18nKey}.errors.destRequired`);
+        }
+        return true;
+      },
+    },
+  ]);
+};
+
+module.exports = {
+  previewPrompt,
+};

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -1,15 +1,16 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiAccountDescription, uiCommandReference } = require('../ui');
-const { isSandbox, getAccountName } = require('../sandboxes');
+const { isSandbox } = require('../sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { getSandboxUsageLimits } = require('@hubspot/local-dev-lib/sandboxes');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const { DEVELOPER_SANDBOX, STANDARD_SANDBOX } = require('../constants');
 
 const i18nKey = 'cli.lib.prompts.projectDevTargetAccountPrompt';
 
 const mapSandboxAccount = accountConfig => ({
-  name: getAccountName(accountConfig, false),
+  name: uiAccountDescription(accountConfig.portalId, false),
   value: {
     targetAccountId: getAccountId(accountConfig.name),
     createNewSandbox: false,
@@ -33,15 +34,18 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
     );
   let disabledMessage = false;
 
-  if (sandboxUsage['DEVELOPER'] && sandboxUsage['DEVELOPER'].available === 0) {
-    if (sandboxAccounts.length < sandboxUsage['DEVELOPER'].limit) {
+  if (
+    sandboxUsage[DEVELOPER_SANDBOX] &&
+    sandboxUsage[DEVELOPER_SANDBOX].available === 0
+  ) {
+    if (sandboxAccounts.length < sandboxUsage[DEVELOPER_SANDBOX].limit) {
       disabledMessage = i18n(`${i18nKey}.sandboxLimitWithSuggestion`, {
         authCommand: uiCommandReference('hs auth'),
-        limit: sandboxUsage['DEVELOPER'].limit,
+        limit: sandboxUsage[DEVELOPER_SANDBOX].limit,
       });
     } else {
       disabledMessage = i18n(`${i18nKey}.sandboxLimit`, {
-        limit: sandboxUsage['DEVELOPER'].limit,
+        limit: sandboxUsage[DEVELOPER_SANDBOX].limit,
       });
     }
   }
@@ -49,10 +53,10 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
   // Order choices by Developer Sandbox -> Standard Sandbox
   const choices = [
     ...sandboxAccounts
-      .filter(a => a.sandboxAccountType === 'DEVELOPER')
+      .filter(a => a.sandboxAccountType === DEVELOPER_SANDBOX)
       .map(mapSandboxAccount),
     ...sandboxAccounts
-      .filter(a => a.sandboxAccountType === 'STANDARD')
+      .filter(a => a.sandboxAccountType === STANDARD_SANDBOX)
       .map(mapSandboxAccount),
     {
       name: i18n(`${i18nKey}.createNewSandboxOption`),
@@ -85,12 +89,12 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
   return targetAccountInfo;
 };
 
-const confirmDefaultSandboxAccountPrompt = async (accountName, accountType) => {
+const confirmDefaultAccountPrompt = async (accountName, accountType) => {
   const { useDefaultAccount } = await promptUser([
     {
       name: 'useDefaultAccount',
       type: 'confirm',
-      message: i18n(`${i18nKey}.confirmDefaultSandboxAccount`, {
+      message: i18n(`${i18nKey}.confirmDefaultAccount`, {
         accountName,
         accountType,
       }),
@@ -101,5 +105,5 @@ const confirmDefaultSandboxAccountPrompt = async (accountName, accountType) => {
 
 module.exports = {
   selectTargetAccountPrompt,
-  confirmDefaultSandboxAccountPrompt,
+  confirmDefaultAccountPrompt,
 };

package/lib/prompts/projectsLogsPrompt.js

@@ -7,7 +7,7 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { EXIT_CODES } = require('../enums/exitCodes');
 
 const i18nKey = 'cli.lib.prompts.projectLogsPrompt';

package/lib/prompts/sandboxesPrompt.js

@@ -1,11 +1,13 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
+const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
+const { uiAccountDescription } = require('../ui');
 const {
-  getSandboxTypeAsString,
-  STANDARD_SANDBOX,
   DEVELOPER_SANDBOX,
-} = require('../sandboxes');
-const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
+  STANDARD_SANDBOX,
+  STANDARD_SANDBOX_TYPE,
+  DEVELOPER_SANDBOX_TYPE,
+} = require('../constants');
 
 const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 
@@ -13,11 +15,8 @@ const mapSandboxAccountChoices = portals =>
   portals
     .filter(p => p.sandboxAccountType && p.sandboxAccountType !== null)
     .map(p => {
-      const sandboxName = `[${getSandboxTypeAsString(
-        p.sandboxAccountType
-      )} sandbox] `;
       return {
-        name: `${p.name} ${sandboxName}(${p.portalId})`,
+        name: uiAccountDescription(p.portalId, false),
         value: p.name || p.portalId,
       };
     });
@@ -34,8 +33,8 @@ const mapNonSandboxAccountChoices = portals =>
       };
     });
 
-const sandboxNamePrompt = (type = STANDARD_SANDBOX) => {
-  const isDeveloperSandbox = type === DEVELOPER_SANDBOX;
+const sandboxNamePrompt = (type = STANDARD_SANDBOX_TYPE) => {
+  const isDeveloperSandbox = type === DEVELOPER_SANDBOX_TYPE;
   const namePromptMessage = isDeveloperSandbox
     ? `${i18nKey}.name.developmentSandboxMessage`
     : `${i18nKey}.name.message`;
@@ -61,11 +60,11 @@ const sandboxNamePrompt = (type = STANDARD_SANDBOX) => {
 const sandboxTypeChoices = [
   {
     name: i18n(`${i18nKey}.type.developer`),
-    value: 'DEVELOPER',
+    value: DEVELOPER_SANDBOX,
   },
   {
     name: i18n(`${i18nKey}.type.standard`),
-    value: 'STANDARD',
+    value: STANDARD_SANDBOX,
   },
 ];
 
@@ -77,7 +76,7 @@ const sandboxTypePrompt = () => {
       type: 'list',
       look: false,
       choices: sandboxTypeChoices,
-      default: 'DEVELOPER',
+      default: DEVELOPER_SANDBOX,
     },
   ]);
 };