@hubspot/cli 4.2.1-beta.4 → 5.0.1-beta.0

package/commands/auth.js

@@ -31,16 +31,23 @@ const {
 const {
   addConfigOptions,
   setLogLevel,
+  getAccountId,
   addTestingOptions,
 } = require('../lib/commonOpts');
 const { logDebugInfo } = require('../lib/debugInfo');
-const { trackCommandUsage } = require('../lib/usageTracking');
+const { trackAuthAction, trackCommandUsage } = require('../lib/usageTracking');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { uiFeatureHighlight } = require('../lib/ui');
 
 const i18nKey = 'cli.commands.auth';
 
+const TRACKING_STATUS = {
+  STARTED: 'started',
+  ERROR: 'error',
+  COMPLETE: 'complete',
+};
+
 const ALLOWED_AUTH_METHODS = [
   OAUTH_AUTH_METHOD.value,
   PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
@@ -71,6 +78,7 @@ exports.handler = async options => {
   checkAndWarnGitInclusion(getConfigPath());
 
   trackCommandUsage('auth');
+  trackAuthAction('auth', authType, TRACKING_STATUS.STARTED);
 
   let configData;
   let updatedConfig;
@@ -122,6 +130,7 @@ exports.handler = async options => {
   }
 
   if (!successAuthMethod) {
+    await trackAuthAction('auth', authType, TRACKING_STATUS.ERROR);
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -157,6 +166,9 @@ exports.handler = async options => {
     'accountsListCommand',
   ]);
 
+  const accountId = getAccountId({ account: accountName });
+  await trackAuthAction('auth', authType, TRACKING_STATUS.COMPLETE, accountId);
+
   process.exit(EXIT_CODES.SUCCESS);
 };
 

package/commands/create.js

@@ -76,6 +76,8 @@ exports.handler = async options => {
   const argsToPass = { assetType, name, dest, options };
   dest = argsToPass.dest = resolveLocalPath(asset.dest(argsToPass));
 
+  trackCommandUsage('create', { assetType }, getAccountId(options));
+
   try {
     await fs.ensureDir(dest);
   } catch (e) {
@@ -94,8 +96,6 @@ exports.handler = async options => {
   if (asset.validate && !asset.validate(argsToPass)) return;
 
   await asset.execute(argsToPass);
-
-  trackCommandUsage('create', { assetType }, getAccountId(options));
 };
 
 exports.builder = yargs => {

package/commands/customObject.js

@@ -1,28 +1,24 @@
-const chalk = require('chalk');
 const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
 const schemaCommand = require('./customObject/schema');
 const createCommand = require('./customObject/create');
 const { i18n } = require('../lib/lang');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { uiBetaWarning } = require('../lib/ui');
+const { uiBetaTag, uiLink } = require('../lib/ui');
 
 const i18nKey = 'cli.commands.customObject';
 
 exports.command = ['custom-object', 'custom', 'co'];
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 const logBetaMessage = () => {
-  uiBetaWarning(() => {
-    logger.log(chalk.reset.yellow(i18n(`${i18nKey}.betaMessage`)));
-    logger.log(
-      chalk.reset.yellow(
-        i18n(`${i18nKey}.seeMoreLink`, {
-          link:
-            'https://developers.hubspot.com/docs/api/crm/crm-custom-objects',
-        })
-      )
-    );
-  });
+  uiBetaTag(i18n(`${i18nKey}.betaMessage`));
+  logger.log(
+    uiLink(
+      i18n(`${i18nKey}.seeMoreLink`),
+      'https://developers.hubspot.com/docs/api/crm/crm-custom-objects'
+    )
+  );
+  logger.log();
 };
 
 exports.builder = yargs => {

package/commands/init.js

@@ -133,11 +133,17 @@ exports.handler = async options => {
     );
     uiFeatureHighlight(['helpCommand', 'authCommand', 'accountsListCommand']);
 
-    trackAuthAction('init', authType, TRACKING_STATUS.COMPLETE, accountId);
+    await trackAuthAction(
+      'init',
+      authType,
+      TRACKING_STATUS.COMPLETE,
+      accountId
+    );
     process.exit(EXIT_CODES.SUCCESS);
   } catch (err) {
     logErrorInstance(err);
-    trackAuthAction('init', authType, TRACKING_STATUS.ERROR);
+    await trackAuthAction('init', authType, TRACKING_STATUS.ERROR);
+    process.exit(EXIT_CODES.ERROR);
   }
 };
 

package/commands/mv.js

@@ -15,6 +15,7 @@ const { trackCommandUsage } = require('../lib/usageTracking');
 const { isPathFolder } = require('../lib/filesystem');
 const { loadAndValidateOptions } = require('../lib/validation');
 const { i18n } = require('../lib/lang');
+const { uiBetaTag } = require('../lib/ui');
 
 const i18nKey = 'cli.commands.mv';
 
@@ -28,7 +29,7 @@ const getCorrectedDestPath = (srcPath, destPath) => {
 };
 
 exports.command = 'mv <srcPath> <destPath>';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);

package/commands/project/add.js

@@ -7,11 +7,12 @@ const { i18n } = require('../../lib/lang');
 const { projectAddPrompt } = require('../../lib/prompts/projectAddPrompt');
 const { createProjectComponent } = require('../../lib/projects');
 const { loadAndValidateOptions } = require('../../lib/validation');
+const { uiBetaTag } = require('../../lib/ui');
 
 const i18nKey = 'cli.commands.project.subcommands.add';
 
 exports.command = 'add';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);

package/commands/project/create.js

@@ -14,13 +14,13 @@ const {
 } = require('../../lib/prompts/createProjectPrompt');
 const { createProjectConfig } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
-const { uiFeatureHighlight } = require('../../lib/ui');
+const { uiBetaTag, uiFeatureHighlight } = require('../../lib/ui');
 const { logger } = require('@hubspot/cli-lib/logger');
 
 const i18nKey = 'cli.commands.project.subcommands.create';
 
 exports.command = 'create';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);
@@ -45,8 +45,7 @@ exports.handler = async options => {
   logger.log('');
   logger.log(chalk.bold(i18n(`${i18nKey}.logs.welcomeMessage`)));
   uiFeatureHighlight([
-    'projectUploadCommand',
-    'projectDeployCommand',
+    'projectDevCommand',
     'projectHelpCommand',
     'feedbackCommand',
   ]);

package/commands/project/deploy.js

@@ -1,3 +1,4 @@
+const chalk = require('chalk');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -16,13 +17,15 @@ const { getProjectConfig, pollDeployStatus } = require('../../lib/projects');
 const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
 const { buildIdPrompt } = require('../../lib/prompts/buildIdPrompt');
 const { i18n } = require('../../lib/lang');
+const { uiBetaTag } = require('../../lib/ui');
 const { getAccountConfig } = require('@hubspot/cli-lib');
 
 const i18nKey = 'cli.commands.project.subcommands.deploy';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const { uiCommandReference, uiAccountDescription } = require('../../lib/ui');
 
 exports.command = 'deploy [--project] [--buildId]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);
@@ -98,6 +101,15 @@ exports.handler = async options => {
       buildIdToDeploy
     );
   } catch (e) {
+    if (e.statusCode === 404) {
+      logger.error(
+        i18n(`${i18nKey}.errors.projectNotFound`, {
+          projectName: chalk.bold(projectName),
+          accountIdentifier: uiAccountDescription(accountId),
+          command: uiCommandReference('hs project upload'),
+        })
+      );
+    }
     if (e.statusCode === 400) {
       logger.error(e.error.message);
     } else {

package/commands/project/dev.js

@@ -25,7 +25,7 @@ const {
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const {
   uiAccountDescription,
-  uiBetaMessage,
+  uiBetaTag,
   uiCommandReference,
   uiLine,
 } = require('../../lib/ui');
@@ -66,7 +66,7 @@ const {
 const i18nKey = 'cli.commands.project.subcommands.dev';
 
 exports.command = 'dev [--account]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);
@@ -78,7 +78,7 @@ exports.handler = async options => {
 
   const { projectConfig, projectDir } = await getProjectConfig();
 
-  uiBetaMessage(i18n(`${i18nKey}.logs.betaMessage`));
+  uiBetaTag(i18n(`${i18nKey}.logs.betaMessage`));
 
   if (!projectConfig) {
     logger.error(i18n(`${i18nKey}.errors.noProjectConfig`));
@@ -200,10 +200,14 @@ exports.handler = async options => {
   );
 
   let deployedBuild;
+  let isGithubLinked;
 
   if (projectExists) {
     const project = await fetchProject(targetAccountId, projectConfig.name);
     deployedBuild = project.deployedBuild;
+    isGithubLinked =
+      project.sourceIntegration &&
+      project.sourceIntegration.source === 'GITHUB';
   }
 
   SpinniesManager.init();
@@ -327,6 +331,7 @@ exports.handler = async options => {
     projectConfig,
     projectDir,
     targetAccountId,
+    isGithubLinked,
   });
 
   await LocalDev.start();

package/commands/project/download.js

@@ -23,12 +23,13 @@ const {
   downloadProjectPrompt,
 } = require('../../lib/prompts/downloadProjectPrompt');
 const { i18n } = require('../../lib/lang');
+const { uiBetaTag } = require('../../lib/ui');
 
 const i18nKey = 'cli.commands.project.subcommands.download';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 exports.command = 'download [--project]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);

package/commands/project/listBuilds.js

@@ -22,7 +22,7 @@ const {
   getTableHeader,
 } = require('@hubspot/cli-lib/lib/table');
 const { getCwd } = require('@hubspot/cli-lib/path');
-const { uiLink } = require('../../lib/ui');
+const { uiBetaTag, uiLink } = require('../../lib/ui');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const {
   getProjectConfig,
@@ -35,7 +35,7 @@ const { promptUser } = require('../../lib/prompts/promptUtils');
 const i18nKey = 'cli.commands.project.subcommands.listBuilds';
 
 exports.command = 'list-builds [path]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);

package/commands/project/logs.js

@@ -32,7 +32,7 @@ const {
 // } = require('@hubspot/cli-lib/api/results');
 const { ensureProjectExists } = require('../../lib/projects');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { uiLine, uiLink } = require('../../lib/ui');
+const { uiBetaTag, uiLine, uiLink } = require('../../lib/ui');
 const { projectLogsPrompt } = require('../../lib/prompts/projectsLogsPrompt');
 // const { tailLogs } = require('../../lib/serverlessLogs');
 const { i18n } = require('../../lib/lang');
@@ -136,7 +136,7 @@ const getPrivateAppsUrl = accountId => {
 // };
 
 exports.command = 'logs [--project] [--app] [--function] [--endpoint]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);

package/commands/project/open.js

@@ -16,12 +16,13 @@ const {
   ensureProjectExists,
 } = require('../../lib/projects');
 const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
+const { uiBetaTag } = require('../../lib/ui');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.open';
 
 exports.command = 'open [--project]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);

package/commands/project/upload.js

@@ -6,7 +6,7 @@ const {
 } = require('../../lib/commonOpts');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { uiLine } = require('../../lib/ui');
+const { uiBetaTag, uiLine } = require('../../lib/ui');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const {
@@ -33,7 +33,7 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const i18nKey = 'cli.commands.project.subcommands.upload';
 
 exports.command = 'upload [path]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);

package/commands/project/watch.js

@@ -13,6 +13,7 @@ const {
   addUseEnvironmentOptions,
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
+const { uiBetaTag } = require('../../lib/ui');
 const {
   ensureProjectExists,
   getProjectConfig,
@@ -34,7 +35,7 @@ const { handleKeypress, handleExit } = require('@hubspot/cli-lib/lib/process');
 const i18nKey = 'cli.commands.project.subcommands.watch';
 
 exports.command = 'watch [path]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 const handleBuildStatus = async (accountId, projectName, buildId) => {
   const {

package/commands/project.js

@@ -1,5 +1,6 @@
 const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
 const { i18n } = require('../lib/lang');
+const { uiBetaTag } = require('../lib/ui');
 const deploy = require('./project/deploy');
 const create = require('./project/create');
 const upload = require('./project/upload');
@@ -14,7 +15,7 @@ const add = require('./project/add');
 const i18nKey = 'cli.commands.project';
 
 exports.command = 'project';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.builder = yargs => {
   addConfigOptions(yargs, true);

package/commands/secrets/updateSecret.js

@@ -41,7 +41,7 @@ exports.handler = async options => {
         secretName,
       })
     );
-    logger.log(i18n(`${i18nKey}.success.updateReupload`));
+    logger.log(i18n(`${i18nKey}.success.updateExplanation`));
   } catch (e) {
     logger.error(
       i18n(`${i18nKey}.errors.update`, {

package/commands/upload.js

@@ -2,7 +2,7 @@ const fs = require('fs');
 const path = require('path');
 const { uploadFolder, hasUploadErrors } = require('@hubspot/cli-lib');
 const { getFileMapperQueryValues } = require('@hubspot/cli-lib/fileMapper');
-const { upload } = require('@hubspot/cli-lib/api/fileMapper');
+const { upload, deleteFile } = require('@hubspot/cli-lib/api/fileMapper');
 const {
   getCwd,
   convertToUnixPath,
@@ -26,6 +26,7 @@ const {
   getMode,
 } = require('../lib/commonOpts');
 const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
+const { cleanUploadPrompt } = require('../lib/prompts/cleanUploadPrompt');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { getUploadableFileList } = require('../lib/upload');
@@ -204,6 +205,29 @@ exports.handler = async options => {
       absoluteSrcPath,
       options.convertFields
     );
+
+    if (options.clean) {
+      //  If clean is true, will first delete the dest folder and then upload src. Cleans up files that only exist on HS.
+      let cleanUpload = options.force;
+      if (!options.force) {
+        cleanUpload = await cleanUploadPrompt(accountId, dest);
+      }
+      if (cleanUpload) {
+        try {
+          await deleteFile(accountId, dest);
+          logger.log(
+            i18n(`${i18nKey}.cleaning`, { accountId, filePath: dest })
+          );
+        } catch (error) {
+          logger.error(
+            i18n(`${i18nKey}.errors.deleteFailed`, {
+              accountId,
+              path: dest,
+            })
+          );
+        }
+      }
+    }
     uploadFolder(
       accountId,
       absoluteSrcPath,
@@ -276,5 +300,15 @@ exports.builder = yargs => {
     type: 'boolean',
     default: false,
   });
+  yargs.option('clean', {
+    describe: i18n(`${i18nKey}.options.clean.describe`),
+    type: 'boolean',
+    default: false,
+  });
+  yargs.option('force', {
+    describe: i18n(`${i18nKey}.options.force.describe`),
+    type: 'boolean',
+    default: false,
+  });
   return yargs;
 };

package/lang/en.lyaml

@@ -180,7 +180,7 @@ en:
       customObject:
         betaMessage: "The Custom Object CLI is currently in beta and is subject to change."
         describe: "Manage Custom Objects. This feature is currently in beta and the CLI contract is subject to change."
-        seeMoreLink: "See {{ link }} to find out more."
+        seeMoreLink: "View our docs to find out more."
         subcommands:
           create:
             describe: "Create custom object instances"
@@ -456,10 +456,10 @@ en:
             describe: "Shortcut of the link you'd like to open"
         selectLink: "Select a link to open"
       project:
-        describe: "{{#bold}}[beta]{{/bold}} Commands for working with projects. For more information, visit our documentation: https://developers.hubspot.com/docs/platform/build-and-deploy-using-hubspot-projects"
+        describe: "Commands for working with projects. For more information, visit our documentation: https://developers.hubspot.com/docs/platform/build-and-deploy-using-hubspot-projects"
         subcommands:
           dev:
-            describe: "{{#bold}}[beta]{{/bold}} Start local dev for the current project"
+            describe: "Start local dev for the current project"
             logs:
               betaMessage: "HubSpot projects local development"
               nonSandboxWarning: "Testing in a sandbox is strongly recommended. To switch the target account, select an option below or run {{#bold}}`hs accounts use`{{/bold}} before running the command again."
@@ -480,7 +480,7 @@ en:
             examples:
               default: "Start local dev for the current project"
           create:
-            describe: "{{#bold}}[beta]{{/bold}} Create a new project"
+            describe: "Create a new project"
             logs:
               welcomeMessage: "Welcome to HubSpot Developer Projects!"
             examples:
@@ -495,7 +495,7 @@ en:
               templateSource:
                 describe: "Path to custom GitHub repository from which to create project template"
           add:
-            describe: "{{#bold}}[beta]{{/bold}} Create a new component within a project"
+            describe: "Create a new component within a project"
             options:
               name:
                 describe: "Component name"
@@ -510,13 +510,14 @@ en:
             examples:
               default: "Create a component within your project"
           deploy:
-            describe: "{{#bold}}[beta]{{/bold}} Deploy a project build"
+            describe: "Deploy a project build"
             debug:
               deploying: "Deploying project at path: {{ path }}"
             errors:
               deploy: "Deploy error: {{ details }}"
               noBuilds: "Deploy error: no builds for this project were found."
               noBuildId: "You must specify a build to deploy"
+              projectNotFound: "{{ projectName }} does not exist in account {{ accountIdentifier }}. Run {{ command }} to upload your project files to HubSpot."
             examples:
               default: "Deploy the latest build of the current project"
               withOptions: "Deploy build 5 of the project my-project"
@@ -526,9 +527,9 @@ en:
               project:
                 describe: "Project name"
           listBuilds:
-            describe: "{{#bold}}[beta]{{/bold}} List the project's builds"
+            describe: "List the project's builds"
           logs:
-            describe: "{{#bold}}[beta]{{/bold}} Get execution logs for a serverless function within a project"
+            describe: "Get execution logs for a serverless function within a project"
             errors:
               invalidAppName: "Could not find app with name \"{{ appName }}\" in project \"{{ projectName }}\""
             logs:
@@ -563,7 +564,7 @@ en:
               endpoint:
                 describe: "Public endpoint path"
           upload:
-            describe: "{{#bold}}[beta]{{/bold}} Upload your project files and create a new build"
+            describe: "Upload your project files and create a new build"
             examples:
               default: "Upload a project"
             logs:
@@ -581,7 +582,7 @@ en:
               path:
                 describe: "Path to a project folder"
           watch:
-            describe: "{{#bold}}[beta]{{/bold}} Watch your local project for changes and automatically upload changed files to a new build in HubSpot"
+            describe: "Watch your local project for changes and automatically upload changed files to a new build in HubSpot"
             examples:
               default: "Watch a project within the myProjectFolder folder"
             logs:
@@ -593,7 +594,7 @@ en:
               initialUpload:
                 describe: "Upload directory before watching for updates"
           download:
-            describe: "{{#bold}}[beta]{{/bold}} Download your project files from HubSpot and write to a path on your computer"
+            describe: "Download your project files from HubSpot and write to a path on your computer"
             examples:
               default: "Download the project myProject into myProjectFolder folder"
             logs:
@@ -612,7 +613,7 @@ en:
               dest:
                 describe: "Destination folder for the project"
           open:
-            describe: "{{#bold}}[beta]{{/bold}} Open the specified project's details page in the browser"
+            describe: "Open the specified project's details page in the browser"
             options:
               project:
                 describe: "Name of project to open"
@@ -743,7 +744,7 @@ en:
                 describe: "Name of the secret to be updated"
             success:
               update: "The secret \"{{ secretName }}\" was updated in the HubSpot account: {{ accountIdentifier }}"
-              updateReupload: "Make sure to `{{#yellow}}upload{{/yellow}}` all serverless functions using this secret to access its new value."
+              updateExplanation: "Existing serverless functions will start using this new value within 10 seconds."
       theme:
         describe: "Commands for working with themes, including marketplace validation with the marketplace-validate subcommand."
         subcommands:
@@ -803,6 +804,7 @@ en:
           invalidPath: "The path \"{{ path }}\" is not a path to a file or folder"
           uploadFailed: "Uploading file \"{{ src }}\" to \"{{ dest }}\" failed"
           someFilesFailed: "One or more files failed to upload to \"{{ dest }}\" in the Design Manager"
+          deleteFailed: "Deleting \"{{ path }}\" from account {{ accountId }} failed"
         options:
           options:
             describe: "Options to pass to javascript fields files"
@@ -810,6 +812,10 @@ en:
             describe: "If true, saves all output from javascript fields files as 'fields.output.json'."
           convertFields:
             describe: "If true, converts any javascript fields files contained in module folder or project root."
+          clean:
+            describe: "Will cause upload to delete files in your HubSpot account that are not found locally."
+          force:
+            describe: "Skips confirmation prompts when doing a clean upload."
         previewUrl: "To preview this theme, visit: {{ previewUrl }}"
         positionals:
           src:
@@ -821,6 +827,7 @@ en:
           uploadComplete: "Uploading files to \"{{ dest }}\" in the Design Manager is complete"
         uploading: "Uploading files from \"{{ src }}\" to \"{{ dest }}\" in the Design Manager of account {{ accountId }}"
         notUploaded: "There was an error processing \"{{ src }}\". The file has not been uploaded."
+        cleaning: "Removing \"{{ filePath }}\" from account {{ accountId }} and uploading local..."
       watch:
         describe: "Watch a directory on your computer for changes and upload the changed files to the HubSpot CMS."
         errors:
@@ -884,6 +891,7 @@ en:
           stopDev: "  * Stop {{ command }}"
           runUpload: "  * Run {{ command }}"
           restartDev: "  * Re-run {{ command }}"
+          pushToGithub: "  * Commit and push your changes to GitHub"
         devServer:
           cleanupError: "Failed to cleanup local dev server: {{ message }}"
           setupError: "Failed to setup local dev server: {{ message }}"
@@ -959,7 +967,7 @@ en:
               message: "Run {{ command }} to upload your project to HubSpot and trigger builds"
             projectDevCommand:
               command: "hs project dev"
-              message: "Run {{ command }} to start testing your project locally"
+              message: "Run {{ command }} to set up your test environment and start local development"
             sandboxSyncDevelopmentCommand:
               command: "hs sandbox sync"
               message: "Run {{ command }} to to update CRM object definitions in your sandbox"
@@ -988,7 +996,8 @@ en:
           createNewSandboxOption: "<Test on a new development sandbox>"
           chooseDefaultAccountOption: "<{{#bold}}\U00002757{{/bold}} Test on this production account {{#bold}}\U00002757{{/bold}}>"
           promptMessage: "[--account] Choose a sandbox under {{ accountIdentifier }} to test with:"
-          sandboxLimit: "You’ve reached the limit of {{ limit }} development sandboxes"
+          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)"
         projectLogsPrompt:
           projectName:
@@ -1062,7 +1071,7 @@ en:
         createProjectPrompt:
           enterName: "[--name] Give your project a name: "
           enterLocation: "[--location] Where should the project be created?"
-          selectTemplate: "[--template] Start from a template?"
+          selectTemplate: "[--template] Choose a project template: "
           errors:
             nameRequired: "A project name is required"
             locationRequired: "A project location is required"
@@ -1108,7 +1117,7 @@ en:
           enterName: "[--project] Enter project name:"
           errors:
             invalidName: "You entered an invalid name. Please try again."
-            projectDoesNotExist: "Project \"{{ projectName }}\" could not be found in \"{{ accountId }}\""
+            projectDoesNotExist: "Project {{#bold}}{{ projectName }}{{/bold}} could not be found in \"{{ accountIdentifier }}\""
         feedbackPrompt:
           feedbackType:
             message: "What type of feedback would you like to leave?"
@@ -1121,6 +1130,8 @@ en:
           errors:
             buildIdDoesNotExist: "Build {{ buildId }} does not exist for project {{ projectName }}."
             buildAlreadyDeployed: "Build {{ buildId }} is already deployed."
+        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:
         positionals:
           src:

package/lib/LocalDevManager.js

@@ -23,7 +23,7 @@ const {
   UI_COLORS,
   uiCommandReference,
   uiAccountDescription,
-  uiBetaMessage,
+  uiBetaTag,
   uiLink,
   uiLine,
 } = require('./ui');
@@ -44,6 +44,7 @@ class LocalDevManager {
     this.projectDir = options.projectDir;
     this.debug = options.debug || false;
     this.deployedBuild = options.deployedBuild;
+    this.isGithubLinked = options.isGithubLinked;
     this.watcher = null;
     this.uploadWarnings = {};
 
@@ -100,7 +101,7 @@ class LocalDevManager {
       console.clear();
     }
 
-    uiBetaMessage(i18n(`${i18nKey}.betaMessage`));
+    uiBetaTag(i18n(`${i18nKey}.betaMessage`));
     logger.log();
     logger.log(
       chalk.hex(UI_COLORS.SORBET)(
@@ -188,11 +189,15 @@ class LocalDevManager {
           command: uiCommandReference('hs project dev'),
         })
       );
-      logger.log(
-        i18n(`${i18nKey}.uploadWarning.runUpload`, {
-          command: this.getUploadCommand(),
-        })
-      );
+      if (this.isGithubLinked) {
+        logger.log(i18n(`${i18nKey}.uploadWarning.pushToGithub`));
+      } else {
+        logger.log(
+          i18n(`${i18nKey}.uploadWarning.runUpload`, {
+            command: this.getUploadCommand(),
+          })
+        );
+      }
       logger.log(
         i18n(`${i18nKey}.uploadWarning.restartDev`, {
           command: uiCommandReference('hs project dev'),

package/lib/prompts/cleanUploadPrompt.js

@@ -0,0 +1,20 @@
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('../lang');
+
+const i18nKey = 'cli.lib.prompts.cleanUploadPrompt';
+
+const cleanUploadPrompt = async (accountId, filePath) => {
+  const promptAnswer = await promptUser([
+    {
+      name: 'cleanUpload',
+      message: i18n(`${i18nKey}.message`, { accountId, filePath }),
+      type: 'confirm',
+      default: false,
+    },
+  ]);
+  return promptAnswer.cleanUpload;
+};
+
+module.exports = {
+  cleanUploadPrompt,
+};

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -1,6 +1,6 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
-const { uiAccountDescription } = require('../ui');
+const { uiAccountDescription, uiCommandReference } = require('../ui');
 const { isSandbox, getAccountName } = require('../sandboxes');
 const { getAccountId } = require('@hubspot/cli-lib');
 const { getSandboxUsageLimits } = require('@hubspot/cli-lib/sandboxes');
@@ -34,9 +34,16 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
   let disabledMessage = false;
 
   if (sandboxUsage['DEVELOPER'] && sandboxUsage['DEVELOPER'].available === 0) {
-    disabledMessage = i18n(`${i18nKey}.sandboxLimit`, {
-      limit: sandboxUsage['DEVELOPER'].limit,
-    });
+    if (sandboxAccounts.length < sandboxUsage['DEVELOPER'].limit) {
+      disabledMessage = i18n(`${i18nKey}.sandboxLimitWithSuggestion`, {
+        authCommand: uiCommandReference('hs auth'),
+        limit: sandboxUsage['DEVELOPER'].limit,
+      });
+    } else {
+      disabledMessage = i18n(`${i18nKey}.sandboxLimit`, {
+        limit: sandboxUsage['DEVELOPER'].limit,
+      });
+    }
   }
 
   // Order choices by Developer Sandbox -> Standard Sandbox

package/lib/prompts/projectNamePrompt.js

@@ -1,6 +1,7 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { ensureProjectExists } = require('../projects');
+const { uiAccountDescription } = require('../ui');
 
 const i18nKey = 'cli.lib.prompts.projectNamePrompt';
 
@@ -20,7 +21,7 @@ const projectNamePrompt = (accountId, options = {}) => {
       if (!projectExists) {
         return i18n(`${i18nKey}.errors.projectDoesNotExist`, {
           projectName: val,
-          accountId,
+          accountIdentifier: uiAccountDescription(accountId),
         });
       }
       return true;

package/lib/ui.js

@@ -1,4 +1,3 @@
-const process = require('process');
 const chalk = require('chalk');
 const supportsHyperlinks = require('../lib/supportHyperlinks');
 const supportsColor = require('../lib/supportsColor');
@@ -42,11 +41,13 @@ const getTerminalUISupport = () => {
  * @param {object} options
  * @returns {string}
  */
-const uiLink = (linkText, url, { inSpinnies = false } = {}) => {
+const uiLink = (linkText, url) => {
   const terminalUISupport = getTerminalUISupport();
   const encodedUrl = encodeURI(url);
+
   if (terminalUISupport.hyperlinks) {
     const CLOSE_SEQUENCE = '\u001B]8;;\u0007';
+
     const result = [
       '\u001B]8;;',
       encodedUrl,
@@ -55,16 +56,7 @@ const uiLink = (linkText, url, { inSpinnies = false } = {}) => {
       CLOSE_SEQUENCE,
     ].join('');
 
-    // Required b/c spinnies will automatically line-break long lines. "indent" is added to account for indented spinnies
-    // See https://github.com/jbcarpanelli/spinnies/blob/d672dedcab8c8ce0f6de0bb26ca5582bf602afd7/utils.js#L68-L74
-    const indent = 5;
-    const columns =
-      (process.stderr.columns || 95) - CLOSE_SEQUENCE.length - indent;
-    const validLength = !inSpinnies || result.length < columns;
-
-    if (validLength) {
-      return terminalUISupport.color ? chalk.cyan(result) : result;
-    }
+    return terminalUISupport.color ? chalk.cyan(result) : result;
   }
 
   return terminalUISupport.color
@@ -95,7 +87,15 @@ const uiInfoSection = (title, logContent) => {
 };
 
 const uiCommandReference = command => {
-  return chalk.bold(chalk.hex(UI_COLORS.MARIGOLD_DARK)(`\`${command}\``));
+  const terminalUISupport = getTerminalUISupport();
+
+  const commandReference = `\`${command}\``;
+
+  return chalk.bold(
+    terminalUISupport.color
+      ? chalk.hex(UI_COLORS.MARIGOLD_DARK)(commandReference)
+      : commandReference
+  );
 };
 
 const uiFeatureHighlight = (commands, title) => {
@@ -105,7 +105,7 @@ const uiFeatureHighlight = (commands, title) => {
     commands.forEach((c, i) => {
       const commandKey = `${i18nKey}.commandKeys.${c}`;
       const message = i18n(`${commandKey}.message`, {
-        command: chalk.bold(i18n(`${commandKey}.command`)),
+        command: uiCommandReference(i18n(`${commandKey}.command`)),
       });
       if (i !== 0) {
         logger.log('');
@@ -115,26 +115,28 @@ const uiFeatureHighlight = (commands, title) => {
   });
 };
 
-const uiBetaMessage = message => {
+const uiBetaTag = (message, log = true) => {
   const i18nKey = 'cli.lib.ui';
 
-  logger.log(chalk.hex(UI_COLORS.SORBET)(i18n(`${i18nKey}.betaTag`)), message);
-};
+  const terminalUISupport = getTerminalUISupport();
+  const tag = i18n(`${i18nKey}.betaTag`);
 
-const uiBetaWarning = logMessage => {
-  const i18nKey = 'cli.lib.ui.betaWarning';
+  const result = `${
+    terminalUISupport.color ? chalk.hex(UI_COLORS.SORBET)(tag) : tag
+  } ${message}`;
 
-  logger.log(i18n(`${i18nKey}.header`));
-  logMessage();
-  logger.log(i18n(`${i18nKey}.footer`));
+  if (log) {
+    logger.log(result);
+  } else {
+    return result;
+  }
 };
 
 module.exports = {
   UI_COLORS,
   uiAccountDescription,
   uiCommandReference,
-  uiBetaMessage,
-  uiBetaWarning,
+  uiBetaTag,
   uiFeatureHighlight,
   uiInfoSection,
   uiLine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.2.1-beta.4",
+  "version": "5.0.1-beta.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "24d48c93e04bacc5db761cc15489b5bc82e17847"
+  "gitHead": "50781b4dba44aef14d5357a25692e46689141aa3"
 }