@hubspot/cli 4.2.1-beta.3 → 5.0.0

package/bin/cli.js

@@ -42,7 +42,11 @@ const cmsCommand = require('../commands/cms');
 const feedbackCommand = require('../commands/feedback');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
-const notifier = updateNotifier({ pkg: { ...pkg, name: '@hubspot/cli' } });
+const notifier = updateNotifier({
+  pkg: { ...pkg, name: '@hubspot/cli' },
+  distTag: 'latest',
+  shouldNotifyInNpmScript: true,
+});
 
 const i18nKey = 'cli.commands.generalErrors';
 
@@ -51,7 +55,6 @@ const CLI_UPGRADE_MESSAGE =
   '\n\nTo upgrade, run:\n\nnpm uninstall -g @hubspot/cms-cli\nand npm install -g @hubspot/cli';
 
 notifier.notify({
-  shouldNotifyInNpmScript: true,
   message: pkg.name === '@hubspot/cms-cli' ? CLI_UPGRADE_MESSAGE : null,
 });
 

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/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);
@@ -38,15 +38,14 @@ exports.handler = async options => {
   await createProjectConfig(
     path.resolve(getCwd(), options.location || location),
     options.name || name,
-    options.template || template,
+    template || { path: options.template },
     options.templateSource
   );
 
   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,10 +78,7 @@ exports.handler = async options => {
 
   const { projectConfig, projectDir } = await getProjectConfig();
 
-  if (!options.debug) {
-    console.clear();
-  }
-  uiBetaMessage(i18n(`${i18nKey}.logs.betaMessage`));
+  uiBetaTag(i18n(`${i18nKey}.logs.betaMessage`));
 
   if (!projectConfig) {
     logger.error(i18n(`${i18nKey}.errors.noProjectConfig`));
@@ -203,19 +200,18 @@ 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();
 
-  if (!options.debug) {
-    console.clear();
-  }
-  uiBetaMessage(i18n(`${i18nKey}.logs.betaMessage`));
-
   if (!projectExists) {
     // Create the project without prompting if this is a newly created sandbox
     let shouldCreateProject = createNewSandbox;
@@ -242,13 +238,14 @@ exports.handler = async options => {
     if (shouldCreateProject) {
       await showPlatformVersionWarning(accountId, projectConfig);
 
+      SpinniesManager.add('createProject', {
+        text: i18n(`${i18nKey}.status.creatingProject`, {
+          accountIdentifier: uiAccountDescription(targetAccountId),
+          projectName: projectConfig.name,
+        }),
+      });
+
       try {
-        SpinniesManager.add('createProject', {
-          text: i18n(`${i18nKey}.status.creatingProject`, {
-            accountIdentifier: uiAccountDescription(targetAccountId),
-            projectName: projectConfig.name,
-          }),
-        });
         await createProject(targetAccountId, projectConfig.name);
         SpinniesManager.succeed('createProject', {
           text: i18n(`${i18nKey}.status.createdProject`, {
@@ -258,6 +255,7 @@ exports.handler = async options => {
           succeedColor: 'white',
         });
       } catch (err) {
+        SpinniesManager.fail('createProject');
         logger.log(i18n(`${i18nKey}.status.failedToCreateProject`));
         process.exit(EXIT_CODES.ERROR);
       }
@@ -317,7 +315,7 @@ exports.handler = async options => {
 
       logger.log();
       failedSubTasks.forEach(failedSubTask => {
-        console.log(failedSubTask.errorMessage);
+        console.error(failedSubTask.errorMessage);
       });
       logger.log();
 
@@ -333,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:
@@ -865,8 +872,8 @@ en:
         noCompatibleComponents: "Skipping call to {{ serverKey }} because there are no compatible components in the project."
       LocalDevManager:
         failedToInitialize: "Missing required arguments to initialize Local Dev"
+        noDeployedBuild: "There is no deployed build for this project in {{ accountIdentifier }}. Run {{ uploadCommand }} to upload and deploy your project."
         noComponents: "There are no components in this project."
-        noDeployedBuild: "There is no deployed build for this project in {{ accountIdentifier }}."
         noRunnableComponents: "There are no components in this project that support local development."
         betaMessage: "HubSpot projects local development"
         running: "Running {{#bold}}{{ projectName }}{{/bold}} locally on {{ accountIdentifier }}, waiting for changes ..."
@@ -878,13 +885,13 @@ en:
         uploadWarning:
           appLabel: "[App]"
           uiExtensionLabel: "[UI Extension]"
-          configEdit: "You edited the configuration file {{#bold}}{{ path }}{{/bold}}. Changes to configuration files cannot be handled by the local dev server."
           missingComponents: "The deployed build for this project does not contain {{#bold}}'{{ missingComponents }}'{{/bold}}. This may cause issues in local development."
-          header: "{{ reason }} To reflect these changes:"
+          defaultWarning: "Changing project configuration requires a new project build."
+          header: "{{ warning }} To reflect these changes and continue testing:"
           stopDev: "  * Stop {{ command }}"
           runUpload: "  * Run {{ command }}"
-          runUploadWithAccount: "  * 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 }}"
@@ -960,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"
@@ -989,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:
@@ -1109,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?"
@@ -1122,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 = {};
 
@@ -64,12 +65,13 @@ class LocalDevManager {
 
     // Local dev currently relies on the existence of a deployed build in the target account
     if (!this.deployedBuild) {
-      logger.log();
       logger.error(
         i18n(`${i18nKey}.noDeployedBuild`, {
           accountIdentifier: uiAccountDescription(this.targetAccountId),
+          uploadCommand: this.getUploadCommand(),
         })
       );
+      logger.log();
       process.exit(EXIT_CODES.SUCCESS);
     }
 
@@ -77,7 +79,6 @@ class LocalDevManager {
 
     // The project is empty, there is nothing to run locally
     if (!components.length) {
-      logger.log();
       logger.error(i18n(`${i18nKey}.noComponents`));
       process.exit(EXIT_CODES.SUCCESS);
     }
@@ -88,19 +89,19 @@ class LocalDevManager {
 
     // The project does not contain any components that support local development
     if (!runnableComponents.length) {
-      logger.log();
       logger.error(i18n(`${i18nKey}.noRunnableComponents`));
       process.exit(EXIT_CODES.SUCCESS);
     }
 
-    logger.log();
     const setupSucceeded = await this.devServerSetup(runnableComponents);
 
-    if (setupSucceeded || !this.debug) {
+    if (!setupSucceeded) {
+      process.exit(EXIT_CODES.ERROR);
+    } else if (!this.debug) {
       console.clear();
     }
 
-    uiBetaMessage(i18n(`${i18nKey}.betaMessage`));
+    uiBetaTag(i18n(`${i18nKey}.betaMessage`));
     logger.log();
     logger.log(
       chalk.hex(UI_COLORS.SORBET)(
@@ -165,32 +166,35 @@ class LocalDevManager {
     });
   }
 
+  getUploadCommand() {
+    const currentDefaultAccount = getConfigDefaultAccount();
+
+    return this.targetAccountId !== getAccountId(currentDefaultAccount)
+      ? uiCommandReference(
+          `hs project upload --account=${this.targetAccountId}`
+        )
+      : uiCommandReference('hs project upload');
+  }
+
   logUploadWarning(reason) {
+    const warning = reason || i18n(`${i18nKey}.uploadWarning.defaultWarning`);
+
     // Avoid logging the warning to the console if it is currently the most
     // recently logged warning. We do not want to spam the console with the same message.
-    if (!this.uploadWarnings[reason]) {
-      const currentDefaultAccount = getConfigDefaultAccount();
-      const defaultAccountId = getAccountId(currentDefaultAccount);
-
+    if (!this.uploadWarnings[warning]) {
       logger.log();
-      logger.warn(i18n(`${i18nKey}.uploadWarning.header`, { reason }));
+      logger.warn(i18n(`${i18nKey}.uploadWarning.header`, { warning }));
       logger.log(
         i18n(`${i18nKey}.uploadWarning.stopDev`, {
           command: uiCommandReference('hs project dev'),
         })
       );
-      if (this.targetAccountId !== defaultAccountId) {
-        logger.log(
-          i18n(`${i18nKey}.uploadWarning.runUploadWithAccount`, {
-            command: uiCommandReference(
-              `hs project upload --account=${this.targetAccountId}`
-            ),
-          })
-        );
+      if (this.isGithubLinked) {
+        logger.log(i18n(`${i18nKey}.uploadWarning.pushToGithub`));
       } else {
         logger.log(
           i18n(`${i18nKey}.uploadWarning.runUpload`, {
-            command: uiCommandReference('hs project upload'),
+            command: this.getUploadCommand(),
           })
         );
       }
@@ -200,8 +204,8 @@ class LocalDevManager {
         })
       );
 
-      this.mostRecentUploadWarning = reason;
-      this.uploadWarnings[reason] = true;
+      this.mostRecentUploadWarning = warning;
+      this.uploadWarnings[warning] = true;
     }
   }
 
@@ -245,7 +249,7 @@ class LocalDevManager {
             !deployedComponentNames.includes(cardConfig.data.title)
           ) {
             missingComponents.push(
-              `${i18n(`${i18nKey}.uploadWarning.appLabel`)} ${
+              `${i18n(`${i18nKey}.uploadWarning.uiExtensionLabel`)} ${
                 cardConfig.data.title
               }`
             );
@@ -298,11 +302,7 @@ class LocalDevManager {
 
   handleWatchEvent(filePath, event, configPaths) {
     if (configPaths.includes(filePath)) {
-      this.logUploadWarning(
-        i18n(`${i18nKey}.uploadWarning.configEdit`, {
-          path: path.relative(this.projectDir, filePath),
-        })
-      );
+      this.logUploadWarning();
     } else {
       this.devServerFileChange(filePath, event);
     }

package/lib/projects.js

@@ -133,24 +133,15 @@ const createProjectConfig = async (
     }`
   );
 
+  await downloadGitHubRepoContents(templateSource, template.path, projectPath);
+  const _config = JSON.parse(fs.readFileSync(projectConfigPath));
+  writeProjectConfig(projectConfigPath, {
+    ..._config,
+    name: projectName,
+  });
+
   if (template.name === 'no-template') {
     fs.ensureDirSync(path.join(projectPath, 'src'));
-
-    writeProjectConfig(projectConfigPath, {
-      name: projectName,
-      srcDir: 'src',
-    });
-  } else {
-    await downloadGitHubRepoContents(
-      templateSource,
-      template.path,
-      projectPath
-    );
-    const _config = JSON.parse(fs.readFileSync(projectConfigPath));
-    writeProjectConfig(projectConfigPath, {
-      ..._config,
-      name: projectName,
-    });
   }
 
   return true;

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');
@@ -26,13 +26,24 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
     logger.debug('Unable to fetch sandbox usage limits: ', err);
   }
 
-  const sandboxAccounts = accounts.reverse().filter(isSandbox);
+  const sandboxAccounts = accounts
+    .reverse()
+    .filter(
+      config => isSandbox(config) && config.parentAccountId === defaultAccountId
+    );
   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.3",
+  "version": "5.0.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -10,7 +10,7 @@
   "dependencies": {
     "@hubspot/cli-lib": "^4.2.2",
     "@hubspot/serverless-dev-runtime": "4.2.1-beta.3",
-    "@hubspot/ui-extensions-dev-server": "^0.7.0",
+    "@hubspot/ui-extensions-dev-server": "^0.7.2",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -42,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e3e46fab20a9efb8c4c98f88b2aed1d13e6d0b1d"
+  "gitHead": "c84420be1abb52575cf159de243d41542653d0bb"
 }