@hubspot/cli 4.1.8-beta.4 → 4.1.8-beta.5

package/commands/project/dev.js

@@ -29,6 +29,7 @@ const {
   LocalDevManager,
   UPLOAD_PERMISSIONS,
 } = require('../../lib/LocalDevManager');
+const { isSandbox } = require('../../lib/sandboxes');
 const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
 const { sandboxNamePrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
@@ -37,12 +38,18 @@ const {
   getAvailableSyncTypes,
 } = require('../../lib/sandboxes');
 const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
-const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
+const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
+const {
+  logErrorInstance,
+  logApiErrorInstance,
+  ApiErrorContext,
+} = require('@hubspot/cli-lib/errorHandlers');
 const { buildSandbox } = require('../../lib/sandbox-create');
 const { syncSandbox } = require('../../lib/sandbox-sync');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const {
   isMissingScopeError,
+  isSpecifiedError,
 } = require('@hubspot/cli-lib/errorHandlers/apiErrors');
 
 const i18nKey = 'cli.commands.project.subcommands.dev';
@@ -60,13 +67,7 @@ exports.handler = async options => {
 
   const { projectConfig, projectDir } = await getProjectConfig();
 
-  logger.log(i18n(`${i18nKey}.logs.introHeader`));
-  uiLine();
-  logger.log(i18n(`${i18nKey}.logs.introBody1`));
-  logger.log();
-  logger.log(i18n(`${i18nKey}.logs.introBody2`));
-  uiLine();
-  logger.log();
+  logger.log(i18n(`${i18nKey}.logs.betaMessage`));
 
   if (!projectConfig) {
     logger.error(i18n(`${i18nKey}.errors.noProjectConfig`));
@@ -74,47 +75,32 @@ exports.handler = async options => {
   }
 
   const accounts = getConfigAccounts();
-  let targetAccountId = options.accountId;
+  let targetAccountId = options.account ? accountId : null;
   let createNewSandbox = false;
-  let chooseNonSandbox = false;
+  const defaultAccountIsSandbox = isSandbox(accountConfig);
+
+  if (!targetAccountId && defaultAccountIsSandbox) {
+    targetAccountId = accountId;
+  }
 
   if (!targetAccountId) {
+    //logger.log(i18n(`${i18nKey}.logs.learnMoreLink`));
+    logger.log();
+    uiLine();
+    logger.warn(i18n(`${i18nKey}.logs.nonSandboxWarning`));
+    uiLine();
+    logger.log();
+
     const {
       targetAccountId: promptTargetAccountId,
-      chooseNonSandbox: promptChooseNonSandbox,
       createNewSandbox: promptCreateNewSandbox,
-    } = await selectTargetAccountPrompt(accounts, accountConfig, false);
+    } = await selectTargetAccountPrompt(accounts, accountConfig);
 
     targetAccountId = promptTargetAccountId;
-    chooseNonSandbox = promptChooseNonSandbox;
     createNewSandbox = promptCreateNewSandbox;
   }
 
-  logger.log();
-
-  // Show a warning if the user chooses a non-sandbox account (false)
-  let shouldTargetNonSandboxAccount;
-  if (chooseNonSandbox) {
-    uiLine();
-    logger.warn(i18n(`${i18nKey}.logs.prodAccountWarning`));
-    uiLine();
-    logger.log();
-
-    shouldTargetNonSandboxAccount = await confirmPrompt(
-      i18n(`${i18nKey}.prompt.targetNonSandbox`)
-    );
-
-    if (shouldTargetNonSandboxAccount) {
-      const {
-        targetAccountId: promptNonSandboxTargetAccountId,
-      } = await selectTargetAccountPrompt(accounts, accountConfig, true);
-
-      targetAccountId = promptNonSandboxTargetAccountId;
-      logger.log();
-    } else {
-      process.exit(EXIT_CODES.SUCCESS);
-    }
-  } else if (createNewSandbox) {
+  if (createNewSandbox) {
     try {
       await validateSandboxUsageLimits(accountConfig, DEVELOPER_SANDBOX, env);
     } catch (err) {
@@ -179,7 +165,8 @@ exports.handler = async options => {
     }
   );
 
-  const isNonSandboxAccount = shouldTargetNonSandboxAccount;
+  const isNonSandboxAccount =
+    !defaultAccountIsSandbox && targetAccountId === accountId;
 
   let uploadPermission = isNonSandboxAccount
     ? UPLOAD_PERMISSIONS.manual
@@ -198,21 +185,26 @@ exports.handler = async options => {
   const spinnies = SpinniesManager.init();
 
   if (!projectExists) {
-    uiLine();
-    logger.warn(
-      i18n(`${i18nKey}.logs.projectMustExistExplanation`, {
-        accountIdentifier: uiAccountDescription(targetAccountId),
-        projectName: projectConfig.name,
-      })
-    );
-    uiLine();
+    // Create the project without prompting if this is a newly created sandbox
+    let shouldCreateProject = createNewSandbox;
+
+    if (!shouldCreateProject) {
+      uiLine();
+      logger.warn(
+        i18n(`${i18nKey}.logs.projectMustExistExplanation`, {
+          accountIdentifier: uiAccountDescription(targetAccountId),
+          projectName: projectConfig.name,
+        })
+      );
+      uiLine();
 
-    const shouldCreateProject = await confirmPrompt(
-      i18n(`${i18nKey}.prompt.createProject`, {
-        accountIdentifier: uiAccountDescription(targetAccountId),
-        projectName: projectConfig.name,
-      })
-    );
+      shouldCreateProject = await confirmPrompt(
+        i18n(`${i18nKey}.prompt.createProject`, {
+          accountIdentifier: uiAccountDescription(targetAccountId),
+          projectName: projectConfig.name,
+        })
+      );
+    }
 
     if (shouldCreateProject) {
       try {
@@ -228,9 +220,10 @@ exports.handler = async options => {
             accountIdentifier: uiAccountDescription(targetAccountId),
             projectName: projectConfig.name,
           }),
+          succeedColor: 'white',
         });
       } catch (err) {
-        logger.log(i18n(`${i18nKey}.logs.failedToCreateProject`));
+        logger.log(i18n(`${i18nKey}.status.failedToCreateProject`));
         process.exit(EXIT_CODES.ERROR);
       }
     } else {
@@ -260,10 +253,24 @@ exports.handler = async options => {
     );
   }
 
-  if (result && !result.succeeded) {
-    spinnies.fail('devModeSetup', {
-      text: i18n(`${i18nKey}.status.startupFailed`),
-    });
+  if (result && result.error) {
+    if (
+      isSpecifiedError(result.error, {
+        subCategory: ERROR_TYPES.PROJECT_LOCKED,
+      })
+    ) {
+      logger.log();
+      logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
+      logger.log();
+    } else {
+      logApiErrorInstance(
+        result.error,
+        new ApiErrorContext({
+          accountId,
+          projectName: projectConfig.name,
+        })
+      );
+    }
     process.exit(EXIT_CODES.ERROR);
   } else {
     spinnies.remove('devModeSetup');

package/commands/project/upload.js

@@ -19,6 +19,14 @@ const {
 } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
 const { getAccountConfig } = require('@hubspot/cli-lib');
+const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
+const {
+  isSpecifiedError,
+} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
+const {
+  logApiErrorInstance,
+  ApiErrorContext,
+} = require('@hubspot/cli-lib/errorHandlers');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.upload';
@@ -50,6 +58,26 @@ exports.handler = async options => {
     message
   );
 
+  if (result.error) {
+    if (
+      isSpecifiedError(result.error, {
+        subCategory: ERROR_TYPES.PROJECT_LOCKED,
+      })
+    ) {
+      logger.log();
+      logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
+      logger.log();
+    } else {
+      logApiErrorInstance(
+        result.error,
+        new ApiErrorContext({
+          accountId,
+          projectName: projectConfig.name,
+        })
+      );
+    }
+    process.exit(EXIT_CODES.ERROR);
+  }
   if (result.buildSucceeded && !result.autodeployEnabled) {
     uiLine();
     logger.log(

package/lang/en.lyaml

@@ -448,11 +448,10 @@ en:
           dev:
             describe: "Start local dev for the current project"
             logs:
-              introHeader: "{{#bold}}HubSpot projects local development (beta){{/bold}}"
-              introBody1: "This command runs a file watcher that works together with a HubSpot account to allow developers to write code locally and test quickly."
-              introBody2: "All project file changes will be reflected in the target account after a slight delay."
+              betaMessage: "{{#yellow}}{{#bold}}[beta]{{/bold}}{{/yellow}} HubSpot projects local development"
+              learnMoreLink: "Learn more about the projects local dev server"
+              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."
               placeholderAccountSelection: "Using default account as target account (for now)"
-              prodAccountWarning: "Targeting a non-sandbox account is risky because this command will upload changes to the target account. We recommend picking a sandbox account for any work that has not been finalized or is undergoing testing prior to deploying to production."
               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"
@@ -461,7 +460,6 @@ en:
               createdProject: "Created project {{ projectName }} in {{ accountIdentifier }}"
               failedToCreateProject: "Failed to create project in the target account."
               startupMessage: "Starting local dev server for {{#bold}}{{ projectName }}{{/bold}} ..."
-              startupFailed: "Failed to initialize local dev server"
             prompt:
               createProject: "Create new project {{ projectName}} in {{#bold}}[{{ accountIdentifier }}]{{/bold}}?"
               targetNonSandbox: "Continue testing in a non-sandbox account?"
@@ -470,6 +468,7 @@ en:
                 describe: "The port that the running server will listen on"
             errors:
               noProjectConfig: "No project detected. Please run this command again from a project directory."
+              projectLockedError: "Your project is locked. This may mean that another user is running the {{#bold}}`hs project dev`{{/bold}} command for this project. If this is you, unlock the project in Projects UI."
             examples:
               default: "Start local dev for the current project"
           create:
@@ -561,6 +560,8 @@ en:
               buildSucceeded: "Build #{{ buildId }} succeeded\n"
               readyToGoLive: "🚀 Ready to take your project live?"
               runCommand: "Run `{{ command }}`"
+            errors:
+              projectLockedError: "Your project is locked. This may mean that another user is running the {{#bold}}`hs project dev`{{/bold}} command for this project. If this is you, unlock the project in Projects UI."
             options:
               forceCreate:
                 describe: "Automatically create project if it does not exist"
@@ -569,15 +570,6 @@ en:
             positionals:
               path:
                 describe: "Path to a project folder"
-          unlock:
-            describe: "Unlock a locked project"
-            examples:
-              default: "Unlock a locked project in the myProjectsFolder folder"
-            logs:
-              unlockSucceeded: "Successfully unlocked the project"
-            positionals:
-              path:
-                describe: "Path to a project folder"
           watch:
             describe: "Watch your local project for changes and automatically upload changed files to a new build in HubSpot"
             examples:
@@ -844,6 +836,8 @@ en:
           options:
             describe: "Options to pass to javascript fields files"
     lib:
+      DevServerManager:
+        portConflict: "The port {{ port }} is already in use."
       LocalDevManager:
         exitingStart: "Stopping local dev server ..."
         exitingSucceed: "Successfully exited"
@@ -851,6 +845,8 @@ en:
         previousStagingBuildCancelled: "Failed to create a staging build because the project was already locked. It is now unlocked. Run the command again."
         cancelledFromUI: "The dev process has been cancelled from the UI. Any changes made since cancelling have not been uploaded. To resume dev mode, rerun {{#yellow}}`hs project dev`{{/yellow}}."
         header:
+          betaMessage: "{{#yellow}}{{#bold}}[beta]{{/bold}}{{/yellow}} HubSpot projects local development"
+          learnMoreLink: "Learn more about the projects local dev server"
           running: "Running {{ projectName}} locally on {{ accountIdentifier }}, waiting for project file changes ..."
           quitHelper: "Press {{#bold}}'q'{{/bold}} to stop the local dev server"
           viewInHubSpotLink: "View in HubSpot"
@@ -863,20 +859,25 @@ en:
             manualUpload: "{{#bold}}Status:{{/bold}} {{#green}}Manually uploading pending changes{{/green}}"
         upload:
           noUploadsAllowed: "The change to {{ filePath }} requires an upload, but the CLI cannot upload to a project that is using a github integration."
-          manualUploadSkipped: "Manual upload skipped. Some changes may not be visible."
-          manualUploadRequired: "Project files changed, manual upload and deploy is needed ..."
+          manualUploadSkipped: "Manually upload and deploy project: {{#green}}(n){{/green}}"
+          manualUploadConfirmed: "Manually upload and deploy project: {{#green}}(Y){{/green}}"
+          manualUploadRequired: "Project file changes require a manual upload and deploy ..."
           manualUploadExplanation1: "{{#yellow}}> Dev server is running on a {{#bold}}non-sandbox account{{/bold}}.{{/yellow}}"
           manualUploadExplanation2: "{{#yellow}}> Uploading changes may overwrite production data.{{/yellow}}"
           manualUploadPrompt: "? Manually upload and deploy project? {{#green}}Y/n{{/green}}"
-          uploadingChange: "[INFO] Uploading {{ filePath }}"
+          uploadingAddChange: "[INFO] Uploading {{ filePath }}"
+          uploadedAddChange: "[INFO] Uploaded {{ filePath }}"
+          uploadingRemoveChange: "[INFO] Removing {{ filePath }}"
+          uploadedRemoveChange: "[INFO] Removed {{ filePath }}"
           uploadingChanges: "{{#bold}}Building and deploying recent changes on {{ accountIdentifier }}{{/bold}}"
+          uploadedChangesSucceeded: "{{#bold}}Built and deployed recent changes on {{ accountIdentifier }}{{/bold}}"
+          uploadedChangesFailed: "{{#bold}}Failed to build and deploy recent changes on {{ accountIdentifier }}{{/bold}}"
       projects:
         uploadProjectFiles:
           add: "Uploading {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
           fail: "Failed to upload {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
           succeed: "Uploaded {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
           buildCreated: "Project \"{{ projectName }}\" uploaded and build #{{ buildId }} created"
-          projectLockedError: "\nYour project may be locked by an active `{{#yellow}}hs project watch{{/yellow}}`. Try stopping the `{{#yellow}}watch{{/yellow}}` process before uploading.\nIf that doesn't work, you may need to start and stop a new `{{#yellow}}watch{{/yellow}}` process to unlock the project."
         handleProjectUpload:
           emptySource: "Source directory \"{{ srcDir }}\" is empty. Add files to your project and rerun `{{#yellow}}hs project upload{{/yellow}}` to upload them to HubSpot."
           compressed: "Project files compressed: {{ byteCount }} bytes"
@@ -958,12 +959,10 @@ en:
             describe: "Use environment variable config"
       prompts:
         projectDevTargetAccountPrompt:
-          createNewSandboxOption: "<< Create a new development sandbox account >>"
-          chooseNonSandboxOption: "<< Choose a non-sandbox account >>"
-          chooseNonSandboxAccount: "[--account] Choose a non-sandbox account to test with:"
-          chooseSandboxAccount: "[--account] Choose a sandbox account to test with:"
-          defaultAccountNotProd: "Option unavailable because your default account must be a production account."
-          sandboxLimit: "Option unavailable because you’ve reached the limit of {{ limit }} development sandboxes."
+          createNewSandboxOption: "<Test on a new dev sandbox>"
+          chooseDefaultAccountOption: "<{{#bold}}!{{/bold}} Test on this production account {{#bold}}!{{/bold}}>"
+          promptMessage: "[--account] Choose a sandbox under {{ accountIdentifier }} to test with:"
+          sandboxLimit: "You’ve reached the limit of {{ limit }} development sandboxes"
         projectLogsPrompt:
           projectName:
             message: "[--project] Enter the project name:"

package/lib/DevServerManager.js

@@ -1,7 +1,12 @@
 const express = require('express');
 const bodyParser = require('body-parser');
 const cors = require('cors');
+const { i18n } = require('./lang');
 const { getProjectDetailUrl } = require('./projects');
+const { EXIT_CODES } = require('./enums/exitCodes');
+const { logger } = require('@hubspot/cli-lib/logger');
+
+const i18nKey = 'cli.lib.DevServerManager';
 
 const DEFAULT_PORT = 8080;
 
@@ -41,6 +46,10 @@ class DevServerManager {
     app.get('/hs/project', (req, res) => {
       res.redirect(getProjectDetailUrl(projectConfig.name, accountId));
     });
+    app.get('/hs/learnMore', (req, res) => {
+      //TODO link to docs
+      res.redirect(getProjectDetailUrl(projectConfig.name, accountId));
+    });
 
     // Initialize component servers
     await this.iterateDevServers(async (serverInterface, serverKey) => {
@@ -51,9 +60,19 @@ class DevServerManager {
     });
 
     // Start server
-    this.server = app.listen(port || DEFAULT_PORT);
+    this.server = app.listen(port || DEFAULT_PORT).on('error', err => {
+      if (err.code === 'EADDRINUSE') {
+        logger.error(
+          i18n(`${i18nKey}.portConflict`, { port: port || DEFAULT_PORT })
+        );
+        logger.log();
+        process.exit(EXIT_CODES.ERROR);
+      }
+    });
 
-    return `http://localhost:${this.server.address().port}`;
+    return this.server.address()
+      ? `http://localhost:${this.server.address().port}`
+      : null;
   }
 
   async notify() {

package/lib/LocalDevManager.js

@@ -29,7 +29,7 @@ const { uiAccountDescription, uiLink } = require('./ui');
 
 const i18nKey = 'cli.lib.LocalDevManager';
 
-const BUILD_DEBOUNCE_TIME = 2000;
+const BUILD_DEBOUNCE_TIME = 3500;
 
 const WATCH_EVENTS = {
   add: 'add',
@@ -146,6 +146,26 @@ class LocalDevManager {
 
   logConsoleHeader() {
     this.spinnies.removeAll();
+    this.spinnies.add('betaMessage', {
+      text: i18n(`${i18nKey}.header.betaMessage`),
+      category: 'header',
+      status: 'non-spinnable',
+    });
+
+    // this.spinnies.add('learnMoreLink', {
+    //   text: uiLink(
+    //     i18n(`${i18nKey}.header.learnMoreLink`),
+    //     this.generateLocalURL(`/hs/learnMore`),
+    //     { inSpinnies: true }
+    //   ),
+    //   category: 'header',
+    //   status: 'non-spinnable',
+    // });
+    this.spinnies.add('spacer-1', {
+      text: ' ',
+      status: 'non-spinnable',
+      category: 'header',
+    });
     this.spinnies.add('devModeRunning', {
       text: i18n(`${i18nKey}.header.running`, {
         accountIdentifier: uiAccountDescription(this.targetAccountId),
@@ -164,15 +184,13 @@ class LocalDevManager {
       text: uiLink(
         i18n(`${i18nKey}.header.viewInHubSpotLink`),
         this.generateLocalURL(`/hs/project`),
-        {
-          inSpinnies: true,
-        }
+        { inSpinnies: true }
       ),
       status: 'non-spinnable',
       indent: 1,
       category: 'header',
     });
-    this.spinnies.add('spacer-1', {
+    this.spinnies.add('spacer-2', {
       text: ' ',
       status: 'non-spinnable',
       category: 'header',
@@ -199,24 +217,29 @@ class LocalDevManager {
     handleKeypress(async key => {
       if ((key.ctrl && key.name === 'c') || key.name === 'q') {
         this.stop();
-      } else if (key.name === 'y') {
-        if (
-          this.uploadPermission === UPLOAD_PERMISSIONS.manual &&
-          this.hasAnyUnsupportedStandbyChanges()
-        ) {
-          this.clearConsoleContent();
+      } else if (
+        (key.name === 'y' || key.name === 'n') &&
+        this.uploadPermission === UPLOAD_PERMISSIONS.manual &&
+        this.hasAnyUnsupportedStandbyChanges()
+      ) {
+        this.spinnies.remove('manualUploadRequired');
+        this.spinnies.remove('manualUploadExplanation1');
+        this.spinnies.remove('manualUploadExplanation2');
+        this.spinnies.remove('manualUploadPrompt');
+
+        if (key.name === 'y') {
+          this.spinnies.add(null, {
+            text: i18n(`${i18nKey}.upload.manualUploadConfirmed`),
+            status: 'succeed',
+            succeedColor: 'white',
+            noIndent: true,
+          });
           this.updateDevModeStatus('manualUpload');
           await this.createNewStagingBuild();
           await this.flushStandbyChanges();
           await this.queueBuild();
-        }
-      } else if (key.name === 'n') {
-        if (
-          this.uploadPermission === UPLOAD_PERMISSIONS.manual &&
-          this.hasAnyUnsupportedStandbyChanges()
-        ) {
-          this.clearConsoleContent();
-          this.spinnies.add('manualUploadSkipped', {
+        } else if (key.name === 'n') {
+          this.spinnies.add(null, {
             text: i18n(`${i18nKey}.upload.manualUploadSkipped`),
             status: 'fail',
             failColor: 'white',
@@ -240,13 +263,6 @@ class LocalDevManager {
   }
 
   async pauseUploadQueue() {
-    this.spinnies.add('uploading', {
-      text: i18n(`${i18nKey}.upload.uploadingChanges`, {
-        accountIdentifier: uiAccountDescription(this.targetAccountId),
-      }),
-      noIndent: true,
-    });
-
     this.uploadQueue.pause();
     await this.uploadQueue.onIdle();
   }
@@ -314,13 +330,7 @@ class LocalDevManager {
     }
 
     if (this.uploadQueue.isPaused) {
-      if (
-        !this.standbyChanges.find(
-          changeInfo => changeInfo.filePath === filePath
-        )
-      ) {
-        this.addChangeToStandbyQueue({ ...changeInfo, supported: false });
-      }
+      this.addChangeToStandbyQueue({ ...changeInfo, supported: false });
     } else {
       await this.flushStandbyChanges();
 
@@ -337,7 +347,6 @@ class LocalDevManager {
   handlePreventedUpload(changeInfo) {
     const { remotePath } = changeInfo;
 
-    this.clearConsoleContent();
     if (this.uploadPermission === UPLOAD_PERMISSIONS.never) {
       this.updateDevModeStatus('noUploadsAllowed');
 
@@ -391,35 +400,63 @@ class LocalDevManager {
       logger.debug(`File ignored: ${filePath}`);
       return;
     }
-    this.standbyChanges.push(changeInfo);
+
+    const existingIndex = this.standbyChanges.findIndex(
+      standyChangeInfo => standyChangeInfo.filePath === filePath
+    );
+
+    if (existingIndex > -1) {
+      // Make sure the most recent event to this file is the one that gets acted on
+      this.standbyChanges[existingIndex].event = event;
+    } else {
+      this.standbyChanges.push(changeInfo);
+    }
   }
 
   async sendChanges(changeInfo) {
     const { event, filePath, remotePath } = changeInfo;
 
-    this.spinnies.add(filePath, {
-      text: i18n(`${i18nKey}.upload.uploadingChange`, {
-        filePath: remotePath,
-      }),
-      status: 'non-spinnable',
-    });
     try {
       if (event === WATCH_EVENTS.add || event === WATCH_EVENTS.change) {
+        const spinniesKey = this.spinnies.add(null, {
+          text: i18n(`${i18nKey}.upload.uploadingAddChange`, {
+            filePath: remotePath,
+          }),
+          status: 'non-spinnable',
+        });
         await uploadFileToBuild(
           this.targetAccountId,
           this.projectConfig.name,
           filePath,
           remotePath
         );
+        this.spinnies.update(spinniesKey, {
+          text: i18n(`${i18nKey}.upload.uploadedAddChange`, {
+            filePath: remotePath,
+          }),
+          status: 'non-spinnable',
+        });
       } else if (
         event === WATCH_EVENTS.unlink ||
         event === WATCH_EVENTS.unlinkDir
       ) {
+        const spinniesKey = this.spinnies.add(null, {
+          text: i18n(`${i18nKey}.upload.uploadingRemoveChange`, {
+            filePath: remotePath,
+          }),
+          status: 'non-spinnable',
+        });
         await deleteFileFromBuild(
           this.targetAccountId,
           this.projectConfig.name,
           remotePath
         );
+        this.spinnies.update(spinniesKey, {
+          text: i18n(`${i18nKey}.upload.uploadedRemoveChange`, {
+            filePath: remotePath,
+          }),
+          status: 'non-spinnable',
+        });
       }
     } catch (err) {
       logger.debug(err);
@@ -442,6 +479,13 @@ class LocalDevManager {
   }
 
   async queueBuild() {
+    const spinniesKey = this.spinnies.add(null, {
+      text: i18n(`${i18nKey}.upload.uploadingChanges`, {
+        accountIdentifier: uiAccountDescription(this.targetAccountId),
+      }),
+      noIndent: true,
+    });
+
     await this.pauseUploadQueue();
 
     try {
@@ -467,7 +511,7 @@ class LocalDevManager {
       return;
     }
 
-    await pollProjectBuildAndDeploy(
+    const result = await pollProjectBuildAndDeploy(
       this.targetAccountId,
       this.projectConfig,
       null,
@@ -475,12 +519,31 @@ class LocalDevManager {
       true
     );
 
+    if (result && result.succeeded) {
+      this.spinnies.succeed(spinniesKey, {
+        text: i18n(`${i18nKey}.upload.uploadedChangesSucceeded`, {
+          accountIdentifier: uiAccountDescription(this.targetAccountId),
+        }),
+        succeedColor: 'white',
+        noIndent: true,
+      });
+    } else {
+      this.spinnies.fail(spinniesKey, {
+        text: i18n(`${i18nKey}.upload.uploadedChangesFailed`, {
+          accountIdentifier: uiAccountDescription(this.targetAccountId),
+        }),
+        failColor: 'white',
+        noIndent: true,
+      });
+    }
+
+    this.spinnies.removeAll({ targetCategory: 'projectPollStatus' });
+
     if (this.uploadPermission === UPLOAD_PERMISSIONS.always) {
       await this.createNewStagingBuild();
     }
 
     this.uploadQueue.start();
-    this.clearConsoleContent();
 
     if (this.hasAnyUnsupportedStandbyChanges()) {
       this.flushStandbyChanges();

package/lib/SpinniesManager.js

@@ -51,18 +51,23 @@ class SpinniesManager {
     const { category, isParent, noIndent, ...rest } = options;
     const originalIndent = rest.indent || 0;
 
+    // Support adding generic spinnies lines without specifying a key
+    const uniqueKey = key || `${Date.now()}`;
+
     if (category) {
-      this.addKeyToCategory(key, category);
+      this.addKeyToCategory(uniqueKey, category);
     }
 
-    this.spinnies.add(key, {
+    this.spinnies.add(uniqueKey, {
       ...rest,
       indent: this.parentKey && !noIndent ? originalIndent + 1 : originalIndent,
     });
 
     if (isParent) {
-      this.parentKey = key;
+      this.parentKey = uniqueKey;
     }
+
+    return uniqueKey;
   }
 
   remove(key) {
@@ -79,10 +84,14 @@ class SpinniesManager {
    * Removes all spinnies instances
    * @param {string} preserveCategory - do not remove spinnies with a matching category
    */
-  removeAll({ preserveCategory = null } = {}) {
+  removeAll({ preserveCategory = null, targetCategory = null } = {}) {
     if (this.spinnies) {
       Object.keys(this.spinnies.spinners).forEach(key => {
-        if (
+        if (targetCategory) {
+          if (this.getCategoryForKey(key) === targetCategory) {
+            this.remove(key);
+          }
+        } else if (
           !preserveCategory ||
           this.getCategoryForKey(key) !== preserveCategory
         ) {

package/lib/projects.js

@@ -10,7 +10,6 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const {
   ENVIRONMENTS,
   FEEDBACK_INTERVAL,
-  ERROR_TYPES,
   POLLING_DELAY,
   PROJECT_BUILD_TEXT,
   PROJECT_DEPLOY_TEXT,
@@ -320,6 +319,7 @@ const uploadProjectFiles = async (
   });
 
   let buildId;
+  let error;
 
   try {
     const upload = await uploadProject(
@@ -352,20 +352,10 @@ const uploadProjectFiles = async (
       }),
     });
 
-    logApiErrorInstance(
-      err,
-      new ApiErrorContext({
-        accountId,
-        projectName,
-      })
-    );
-    if (err.error.subCategory === ERROR_TYPES.PROJECT_LOCKED) {
-      logger.log(i18n(`${i18nKey}.uploadProjectFiles.projectLockedError`));
-    }
-    process.exit(EXIT_CODES.ERROR);
+    error = err;
   }
 
-  return { buildId };
+  return { buildId, error };
 };
 
 const pollProjectBuildAndDeploy = async (
@@ -478,7 +468,7 @@ const handleProjectUpload = async (
 
   const result = new Promise(resolve =>
     output.on('close', async function() {
-      let result = {};
+      let uploadResult = {};
 
       logger.debug(
         i18n(`${i18nKey}.handleProjectUpload.compressed`, {
@@ -486,22 +476,24 @@ const handleProjectUpload = async (
         })
       );
 
-      const { buildId } = await uploadProjectFiles(
+      const { buildId, error } = await uploadProjectFiles(
         accountId,
         projectConfig.name,
         tempFile.name,
         uploadMessage
       );
 
-      if (callbackFunc) {
-        result = await callbackFunc(
+      if (error) {
+        uploadResult.error = error;
+      } else if (callbackFunc) {
+        uploadResult = await callbackFunc(
           accountId,
           projectConfig,
           tempFile,
           buildId
         );
       }
-      resolve(result);
+      resolve(uploadResult);
     })
   );
 
@@ -558,6 +550,7 @@ const makePollTaskStatusFunc = ({
       succeedColor: 'white',
       failColor: 'white',
       failPrefix: chalk.bold('!'),
+      category: 'projectPollStatus',
     });
 
     const [
@@ -618,6 +611,7 @@ const makePollTaskStatusFunc = ({
           indent,
           succeedColor: 'white',
           failColor: 'white',
+          category: 'projectPollStatus',
         });
       };
 

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -9,90 +9,64 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const i18nKey = 'cli.lib.prompts.projectDevTargetAccountPrompt';
 
 const mapSandboxAccount = accountConfig => ({
-  name: getAccountName(accountConfig),
+  name: getAccountName(accountConfig, false),
   value: {
     targetAccountId: getAccountId(accountConfig.name),
-    chooseNonSandbox: false,
     createNewSandbox: false,
   },
 });
 
-const selectTargetAccountPrompt = async (
-  accounts,
-  defaultAccountConfig,
-  nonSandbox = false
-) => {
-  let choices;
+const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
+  let sandboxUsage = {};
+  const defaultAccountId = getAccountId(defaultAccountConfig.name);
 
-  if (nonSandbox) {
-    choices = accounts
-      .filter(accountConfig => !isSandbox(accountConfig))
-      .map(accountConfig => {
-        const accountId = getAccountId(accountConfig.name);
-        return {
-          name: uiAccountDescription(accountId),
-          value: {
-            targetAccountId: accountId,
-            chooseNonSandbox: false,
-            createNewSandbox: false,
-          },
-        };
-      });
-  } else {
-    let sandboxUsage = {};
-    try {
-      const accountId = getAccountId(defaultAccountConfig.portalId);
-      sandboxUsage = await getSandboxUsageLimits(accountId);
-    } catch (err) {
-      logger.debug('Unable to fetch sandbox usage limits: ', err);
-    }
-    const sandboxAccounts = accounts.reverse().filter(isSandbox);
-    let disabledMessage = false;
-    if (isSandbox(defaultAccountConfig)) {
-      disabledMessage = i18n(`${i18nKey}.defaultAccountNotProd`);
-    }
-    if (
-      sandboxUsage['DEVELOPER'] &&
-      sandboxUsage['DEVELOPER'].available === 0
-    ) {
-      disabledMessage = i18n(`${i18nKey}.sandboxLimit`, {
-        limit: sandboxUsage['DEVELOPER'].limit,
-      });
-    }
-    // Order choices by Create new -> Developer Sandbox -> Standard Sandbox -> Non sandbox
-    choices = [
-      {
-        name: i18n(`${i18nKey}.createNewSandboxOption`),
-        value: {
-          targetAccountId: null,
-          chooseNonSandbox: false,
-          createNewSandbox: true,
-        },
-        disabled: disabledMessage,
+  try {
+    sandboxUsage = await getSandboxUsageLimits(defaultAccountId);
+  } catch (err) {
+    logger.debug('Unable to fetch sandbox usage limits: ', err);
+  }
+
+  const sandboxAccounts = accounts.reverse().filter(isSandbox);
+  let disabledMessage = false;
+
+  if (sandboxUsage['DEVELOPER'] && sandboxUsage['DEVELOPER'].available === 0) {
+    disabledMessage = i18n(`${i18nKey}.sandboxLimit`, {
+      limit: sandboxUsage['DEVELOPER'].limit,
+    });
+  }
+
+  // Order choices by Developer Sandbox -> Standard Sandbox
+  const choices = [
+    ...sandboxAccounts
+      .filter(a => a.sandboxAccountType === 'DEVELOPER')
+      .map(mapSandboxAccount),
+    ...sandboxAccounts
+      .filter(a => a.sandboxAccountType === 'STANDARD')
+      .map(mapSandboxAccount),
+    {
+      name: i18n(`${i18nKey}.createNewSandboxOption`),
+      value: {
+        targetAccountId: null,
+        createNewSandbox: true,
       },
-      ...sandboxAccounts
-        .filter(a => a.sandboxAccountType === 'DEVELOPER')
-        .map(mapSandboxAccount),
-      ...sandboxAccounts
-        .filter(a => a.sandboxAccountType === 'STANDARD')
-        .map(mapSandboxAccount),
-      {
-        name: i18n(`${i18nKey}.chooseNonSandboxOption`),
-        value: {
-          targetAccountId: null,
-          chooseNonSandbox: true,
-          createNewSandbox: false,
-        },
+      disabled: disabledMessage,
+    },
+    {
+      name: i18n(`${i18nKey}.chooseDefaultAccountOption`),
+      value: {
+        targetAccountId: defaultAccountId,
+        createNewSandbox: false,
       },
-    ];
-  }
+    },
+  ];
+
   const { targetAccountInfo } = await promptUser([
     {
       name: 'targetAccountInfo',
       type: 'list',
-      message: nonSandbox
-        ? i18n(`${i18nKey}.chooseNonSandboxAccount`)
-        : i18n(`${i18nKey}.chooseSandboxAccount`),
+      message: i18n(`${i18nKey}.promptMessage`, {
+        accountIdentifier: uiAccountDescription(defaultAccountId),
+      }),
       choices,
     },
   ]);

package/lib/sandboxes.js

@@ -55,13 +55,16 @@ const getSandboxTypeAsString = type =>
 const isSandbox = config =>
   config.sandboxAccountType && config.sandboxAccountType !== null;
 
-function getAccountName(config) {
+function getAccountName(config, bold = true) {
   const sandboxName = `[${getSandboxTypeAsString(
     config.sandboxAccountType
   )} sandbox] `;
-  return chalk.bold(
-    `${config.name} ${isSandbox(config) ? sandboxName : ''}(${config.portalId})`
-  );
+
+  const message = `${config.name} ${isSandbox(config) ? sandboxName : ''}(${
+    config.portalId
+  })`;
+
+  return bold ? chalk.bold(message) : message;
 }
 
 function getHasSandboxesByType(parentAccountConfig, type) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.1.8-beta.4",
+  "version": "4.1.8-beta.5",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -43,5 +43,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "650d373d034efb5736b357200fc496d5da605e37"
+  "gitHead": "5b5d25bf5e3a4d29b516dbc31195f4cd7051b898"
 }