@hubspot/cli 4.0.2-beta.5 → 4.0.2-beta.7

package/commands/accounts/list.js

@@ -12,6 +12,7 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
+const { getSandboxType } = require('../../lib/prompts/sandboxesPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.commands.accounts.subcommands.list';
@@ -57,7 +58,9 @@ const getPortalData = mappedPortalData => {
         portalData.push([portal.name, portal.portalId, portal.authType]);
       } else {
         portalData.push([
-          `↳ ${portal.name} [sandbox]`,
+          `↳ ${portal.name} [${getSandboxType(
+            portal.sandboxAccountType
+          )} sandbox]`,
           portal.portalId,
           portal.authType,
         ]);

package/commands/project/deploy.js

@@ -15,7 +15,7 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const { getProjectConfig, pollDeployStatus } = require('../../lib/projects');
 const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
-// const { getAccountConfig } = require('@hubspot/cli-lib');
+const { getAccountConfig } = require('@hubspot/cli-lib');
 
 const i18nKey = 'cli.commands.project.subcommands.deploy';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
@@ -27,11 +27,11 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
-  // const accountConfig = getAccountConfig(accountId);
+  const accountConfig = getAccountConfig(accountId);
   const { project, buildId } = options;
-  // const sandboxType = accountConfig && accountConfig.sandboxAccountType;
+  const sandboxType = accountConfig && accountConfig.sandboxAccountType;
 
-  trackCommandUsage('project-deploy', null, accountId);
+  trackCommandUsage('project-deploy', { type: sandboxType }, accountId);
 
   const { projectConfig } = await getProjectConfig();
 

package/commands/project/upload.js

@@ -19,7 +19,7 @@ const {
   validateProjectConfig,
 } = require('../../lib/projects');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
-// const { getAccountConfig } = require('@hubspot/cli-lib');
+const { getAccountConfig } = require('@hubspot/cli-lib');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.upload';
@@ -32,10 +32,10 @@ exports.handler = async options => {
 
   const { forceCreate, path: projectPath } = options;
   const accountId = getAccountId(options);
-  // const accountConfig = getAccountConfig(accountId);
-  // const sandboxType = accountConfig && accountConfig.sandboxAccountType;
+  const accountConfig = getAccountConfig(accountId);
+  const sandboxType = accountConfig && accountConfig.sandboxAccountType;
 
-  trackCommandUsage('project-upload', null, accountId);
+  trackCommandUsage('project-upload', { type: sandboxType }, accountId);
 
   const { projectConfig, projectDir } = await getProjectConfig(projectPath);
 

package/commands/project/watch.js

@@ -5,6 +5,7 @@ const {
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
 const { logger } = require('@hubspot/cli-lib/logger');
+const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -61,11 +62,15 @@ const handleUserInput = (accountId, projectName, currentBuildId) => {
         await cancelStagedBuild(accountId, projectName);
         process.exit(EXIT_CODES.SUCCESS);
       } catch (err) {
-        logApiErrorInstance(
-          err,
-          new ApiErrorContext({ accountId, projectName: projectName })
-        );
-        process.exit(EXIT_CODES.ERROR);
+        if (err.error.subCategory === ERROR_TYPES.BUILD_NOT_IN_PROGRESS) {
+          process.exit(EXIT_CODES.SUCCESS);
+        } else {
+          logApiErrorInstance(
+            err,
+            new ApiErrorContext({ accountId, projectName: projectName })
+          );
+          process.exit(EXIT_CODES.ERROR);
+        }
       }
     } else {
       process.exit(EXIT_CODES.SUCCESS);

package/commands/sandbox/create.js

@@ -124,6 +124,9 @@ exports.handler = async options => {
 
   let namePrompt;
 
+  logger.log(i18n(`${i18nKey}.sandboxLimitation`));
+  logger.log('');
+
   if (!name) {
     namePrompt = await createSandboxPrompt();
   }
@@ -151,6 +154,8 @@ exports.handler = async options => {
   } catch (err) {
     debugErrorAndContext(err);
 
+    trackCommandUsage('sandbox-create', { successful: false }, accountId);
+
     spinnies.fail('sandboxCreate', {
       text: i18n(`${i18nKey}.loading.fail`, {
         sandboxName,

package/commands/sandbox/delete.js

@@ -49,6 +49,9 @@ exports.handler = async options => {
     account: account || accountPrompt.account,
   });
 
+  const isDefaultAccount =
+    sandboxAccountId === getAccountId(config.defaultPortal);
+
   trackCommandUsage('sandbox-delete', null, sandboxAccountId);
 
   let parentAccountId;
@@ -91,6 +94,14 @@ exports.handler = async options => {
     })
   );
 
+  if (isDefaultAccount) {
+    logger.log(
+      i18n(`${i18nKey}.defaultAccountWarning`, {
+        account: account || accountPrompt.account,
+      })
+    );
+  }
+
   try {
     const { confirmSandboxDeletePrompt: confirmed } = await promptUser([
       {
@@ -107,9 +118,12 @@ exports.handler = async options => {
 
     await deleteSandbox(parentAccountId, sandboxAccountId);
 
+    const deleteKey = isDefaultAccount
+      ? `${i18nKey}.success.deleteDefault`
+      : `${i18nKey}.success.delete`;
     logger.log('');
     logger.success(
-      i18n(`${i18nKey}.success.delete`, {
+      i18n(deleteKey, {
         account: account || accountPrompt.account,
         sandboxHubId: sandboxAccountId,
       })
@@ -120,12 +134,18 @@ exports.handler = async options => {
       sandboxAccountId
     );
     if (promptDefaultAccount) {
-      await selectAndSetAsDefaultAccountPrompt(config);
+      await selectAndSetAsDefaultAccountPrompt(getConfig());
     }
     process.exit(EXIT_CODES.SUCCESS);
   } catch (err) {
     debugErrorAndContext(err);
 
+    trackCommandUsage(
+      'sandbox-delete',
+      { successful: false },
+      sandboxAccountId
+    );
+
     if (
       err.error &&
       err.error.category === OBJECT_NOT_FOUND &&
@@ -143,7 +163,7 @@ exports.handler = async options => {
         sandboxAccountId
       );
       if (promptDefaultAccount) {
-        await selectAndSetAsDefaultAccountPrompt(config);
+        await selectAndSetAsDefaultAccountPrompt(getConfig());
       }
       process.exit(EXIT_CODES.SUCCESS);
     } else {

package/commands/secrets/addSecret.js

@@ -14,6 +14,7 @@ const {
   addUseEnvironmentOptions,
   getAccountId,
 } = require('../../lib/commonOpts');
+const { uiAccountDescription } = require('../../lib/ui');
 const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
@@ -36,7 +37,7 @@ exports.handler = async options => {
     await addSecret(accountId, secretName, secretValue);
     logger.success(
       i18n(`${i18nKey}.success.add`, {
-        accountId,
+        accountIdentifier: uiAccountDescription(accountId),
         secretName,
       })
     );

package/commands/secrets/deleteSecret.js

@@ -7,6 +7,7 @@ const { deleteSecret } = require('@hubspot/cli-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
+const { uiAccountDescription } = require('../../lib/ui');
 
 const {
   addConfigOptions,
@@ -33,7 +34,7 @@ exports.handler = async options => {
     await deleteSecret(accountId, secretName);
     logger.success(
       i18n(`${i18nKey}.success.delete`, {
-        accountId,
+        accountIdentifier: uiAccountDescription(accountId),
         secretName,
       })
     );

package/commands/secrets/listSecrets.js

@@ -7,6 +7,7 @@ const { fetchSecrets } = require('@hubspot/cli-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
+const { uiAccountDescription } = require('../../lib/ui');
 
 const {
   addConfigOptions,
@@ -30,7 +31,7 @@ exports.handler = async options => {
   try {
     const { results } = await fetchSecrets(accountId);
     const groupLabel = i18n(`${i18nKey}.groupLabel`, {
-      accountId,
+      accountIdentifier: uiAccountDescription(accountId),
     });
     logger.group(groupLabel);
     results.forEach(secret => logger.log(secret));

package/commands/secrets/updateSecret.js

@@ -7,6 +7,7 @@ const { updateSecret } = require('@hubspot/cli-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
+const { uiAccountDescription } = require('../../lib/ui');
 
 const {
   addConfigOptions,
@@ -36,10 +37,11 @@ exports.handler = async options => {
     await updateSecret(accountId, secretName, secretValue);
     logger.success(
       i18n(`${i18nKey}.success.update`, {
-        accountId,
+        accountIdentifier: uiAccountDescription(accountId),
         secretName,
       })
     );
+    logger.log(i18n(`${i18nKey}.success.updateReupload`));
   } catch (e) {
     logger.error(
       i18n(`${i18nKey}.errors.update`, {

package/commands/upload.js

@@ -78,13 +78,16 @@ exports.handler = async options => {
     logger.error(i18n(`${i18nKey}.errors.destinationRequired`));
     return;
   }
-  // The theme.json file must always be at the root of the project - so we look for that and determine the root path based on it.
-  const projectRoot = path.dirname(getThemeJSONPath(absoluteSrcPath));
-  const processFieldsJs = isProcessableFieldsJs(
-    projectRoot,
-    absoluteSrcPath,
-    options.processFieldsJs
-  );
+  // Check for theme.json file and determine the root path for the project based on it if it exists
+  const themeJsonPath = getThemeJSONPath(absoluteSrcPath);
+  const projectRoot = themeJsonPath && path.dirname(themeJsonPath);
+  const processFieldsJs =
+    projectRoot &&
+    isProcessableFieldsJs(
+      projectRoot,
+      absoluteSrcPath,
+      options.processFieldsJs
+    );
   let fieldsJs;
   if (processFieldsJs) {
     fieldsJs = await new FieldsJs(

package/lib/projects.js

@@ -387,7 +387,7 @@ const makePollTaskStatusFunc = ({
       const subTaskName = subTask[statusText.SUBTASK_NAME_KEY];
 
       spinnies.add(subTaskName, {
-        text: `${chalk.bold(subTaskName)} #${displayId} ${
+        text: `${chalk.bold(subTaskName)} ${
           statusText.STATUS_TEXT[statusText.STATES.ENQUEUED]
         }\n`,
         indent: 2,
@@ -410,7 +410,7 @@ const makePollTaskStatusFunc = ({
               return;
             }
 
-            const updatedText = `${chalk.bold(subTaskName)} #${displayId} ${
+            const updatedText = `${chalk.bold(subTaskName)} ${
               statusText.STATUS_TEXT[subTask.status]
             }\n`;
 

package/lib/prompts/accountsPrompt.js

@@ -1,6 +1,7 @@
 const { updateDefaultAccount } = require('@hubspot/cli-lib/lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { mapAccountChoices } = require('./sandboxesPrompt');
 
 const i18nKey = 'cli.commands.accounts.subcommands.use';
 
@@ -12,10 +13,7 @@ const selectAccountFromConfig = async config => {
       name: 'default',
       pageSize: 20,
       message: i18n(`${i18nKey}.promptMessage`),
-      choices: config.portals.map(p => ({
-        name: `${p.name} (${p.portalId})`,
-        value: p.name || p.portalId,
-      })),
+      choices: mapAccountChoices(config.portals),
       default: config.defaultPortal,
     },
   ]);
@@ -31,10 +29,7 @@ const selectAndSetAsDefaultAccountPrompt = async config => {
       name: 'default',
       pageSize: 20,
       message: i18n(`${i18nKey}.promptMessage`),
-      choices: config.portals.map(p => ({
-        name: `${p.name} (${p.portalId})`,
-        value: p.name || p.portalId,
-      })),
+      choices: mapAccountChoices(config.portals),
       default: config.defaultPortal,
     },
   ]);

package/lib/prompts/sandboxesPrompt.js

@@ -3,6 +3,19 @@ const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 
+const getSandboxType = type =>
+  type === 'DEVELOPER' ? 'development' : 'standard';
+
+const mapAccountChoices = portals =>
+  portals.map(p => {
+    const isSandbox = p.sandboxAccountType !== null;
+    const sandboxName = `[${getSandboxType(p.sandboxAccountType)} sandbox] `;
+    return {
+      name: `${p.name} ${isSandbox ? sandboxName : ''}(${p.portalId})`,
+      value: p.name || p.portalId,
+    };
+  });
+
 const createSandboxPrompt = () => {
   return promptUser([
     {
@@ -31,7 +44,7 @@ const deleteSandboxPrompt = (config, promptParentAccount = false) => {
       type: 'list',
       look: false,
       pageSize: 20,
-      choices: config.portals.map(p => p.name || p.portalId),
+      choices: mapAccountChoices(config.portals),
       default: config.defaultPortal,
     },
   ]);
@@ -40,4 +53,6 @@ const deleteSandboxPrompt = (config, promptParentAccount = false) => {
 module.exports = {
   createSandboxPrompt,
   deleteSandboxPrompt,
+  getSandboxType,
+  mapAccountChoices,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.0.2-beta.5",
+  "version": "4.0.2-beta.7",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "4.0.2-beta.5",
-    "@hubspot/serverless-dev-runtime": "4.0.2-beta.5",
+    "@hubspot/cli-lib": "4.0.2-beta.7",
+    "@hubspot/serverless-dev-runtime": "4.0.2-beta.7",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "3c4cd0095cfd6b115da0c91def008240386b52a5"
+  "gitHead": "0fe48550b57c3f8326262ed19decaeb4930f8c3a"
 }