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

package/bin/cli.js

@@ -40,6 +40,7 @@ const accountsCommand = require('../commands/accounts');
 const sandboxesCommand = require('../commands/sandbox');
 const processCommand = require('../commands/process');
 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' } });
@@ -159,6 +160,7 @@ const argv = yargs
   .command(accountsCommand)
   .command(sandboxesCommand)
   .command(processCommand, false)
+  .command(feedbackCommand)
   .help()
   .recommendCommands()
   .demandCommand(1, '')

package/commands/accounts/list.js

@@ -72,7 +72,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('accounts-list', {}, accountId);
+  trackCommandUsage('accounts-list', null, accountId);
 
   const config = getConfig();
   const configPath = getConfigPath();

package/commands/accounts/rename.js

@@ -21,7 +21,7 @@ exports.handler = async options => {
   const { accountName, newName } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('accounts-rename', {}, accountId);
+  trackCommandUsage('accounts-rename', null, accountId);
 
   await renameAccount(accountName, newName);
 

package/commands/accounts/use.js

@@ -37,7 +37,7 @@ exports.handler = async options => {
 
   trackCommandUsage(
     'accounts-use',
-    {},
+    null,
     getAccountIdFromConfig(newDefaultAccount)
   );
 

package/commands/config/set/allowUsageTracking.js

@@ -33,7 +33,7 @@ const enableOrDisableUsageTracking = async () => {
 };
 
 const setAllowUsageTracking = async ({ accountId, allowUsageTracking }) => {
-  trackCommandUsage('config-set-allow-usage-tracking', {}, accountId);
+  trackCommandUsage('config-set-allow-usage-tracking', null, accountId);
 
   let isEnabled;
 

package/commands/config/set/defaultMode.js

@@ -27,7 +27,7 @@ const selectMode = async () => {
 };
 
 const setDefaultMode = async ({ accountId, defaultMode }) => {
-  trackCommandUsage('config-set-default-mode', {}, accountId);
+  trackCommandUsage('config-set-default-mode', null, accountId);
 
   let newDefault;
 

package/commands/config/set/httpTimeout.js

@@ -20,7 +20,7 @@ const enterTimeout = async () => {
 };
 
 const setHttpTimeout = async ({ accountId, httpTimeout }) => {
-  trackCommandUsage('config-set-http-timeout', {}, accountId);
+  trackCommandUsage('config-set-http-timeout', null, accountId);
 
   let newHttpTimeout;
 

package/commands/config/set.js

@@ -54,7 +54,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('config-set', {}, accountId);
+  trackCommandUsage('config-set', null, accountId);
 
   const configUpdated = await handleConfigUpdate(accountId, options);
 

package/commands/create.js

@@ -93,13 +93,9 @@ exports.handler = async options => {
 
   if (asset.validate && !asset.validate(argsToPass)) return;
 
-  const additionalTracking = (await asset.execute(argsToPass)) || {};
+  await asset.execute(argsToPass);
 
-  trackCommandUsage(
-    'create',
-    { assetType, ...additionalTracking },
-    getAccountId(options)
-  );
+  trackCommandUsage('create', { assetType }, getAccountId(options));
 };
 
 exports.builder = yargs => {

package/commands/feedback.js

@@ -0,0 +1,48 @@
+const open = require('open');
+
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const {
+  FEEDBACK_OPTIONS,
+  FEEDBACK_URLS,
+} = require('@hubspot/cli-lib/lib/constants');
+const { logger } = require('@hubspot/cli-lib/logger');
+
+const {
+  feedbackTypePrompt,
+  shouldOpenBrowserPrompt,
+} = require('../lib/prompts/feedbackPrompt');
+
+const i18nKey = 'cli.commands.project.subcommands.feedback';
+
+exports.command = 'feedback';
+exports.describe = i18n(`${i18nKey}.describe`);
+
+exports.handler = async options => {
+  const { bug: bugFlag, general: generalFlag } = options;
+  const usedTypeFlag = bugFlag !== generalFlag;
+
+  const { type } = await feedbackTypePrompt(usedTypeFlag);
+  const { shouldOpen } = await shouldOpenBrowserPrompt(type, usedTypeFlag);
+
+  if (shouldOpen || usedTypeFlag) {
+    const url =
+      type === FEEDBACK_OPTIONS.BUG || bugFlag
+        ? FEEDBACK_URLS.BUG
+        : FEEDBACK_URLS.GENERAL;
+    open(url, { url: true });
+    logger.success(i18n(`${i18nKey}.success`, { url }));
+  }
+};
+
+exports.builder = yargs => {
+  yargs.options({
+    bug: {
+      describe: i18n(`${i18nKey}.options.bug.describe`),
+      type: 'boolean',
+    },
+    general: {
+      describe: i18n(`${i18nKey}.options.general.describe`),
+      type: 'boolean',
+    },
+  });
+};

package/commands/filemanager/fetch.js

@@ -32,7 +32,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('filemanager-fetch', {}, accountId);
+  trackCommandUsage('filemanager-fetch', null, accountId);
 
   // Fetch and write file/folder.
   await downloadFileOrFolder(accountId, src, dest, options);

package/commands/functions/deploy.js

@@ -50,7 +50,7 @@ exports.handler = async options => {
   const splitFunctionPath = functionPath.split('.');
   let spinner;
 
-  trackCommandUsage('functions-deploy', { functionPath }, accountId);
+  trackCommandUsage('functions-deploy', null, accountId);
 
   if (
     !splitFunctionPath.length ||

package/commands/functions/list.js

@@ -29,10 +29,9 @@ exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async options => {
   loadAndValidateOptions(options);
 
-  const { json, compact } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('functions-list', { json, compact }, accountId);
+  trackCommandUsage('functions-list', null, accountId);
 
   logger.debug(i18n(`${i18nKey}.debug.gettingFunctions`));
 

package/commands/functions/server.js

@@ -21,7 +21,7 @@ exports.handler = async options => {
   const { path: functionPath } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('functions-server', { functionPath }, accountId);
+  trackCommandUsage('functions-server', null, accountId);
 
   logger.debug(
     i18n(`${i18nKey}.debug.startingServer`, {

package/commands/hubdb/clear.js

@@ -26,7 +26,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('hubdb-clear', {}, accountId);
+  trackCommandUsage('hubdb-clear', null, accountId);
 
   try {
     const { deletedRowCount } = await clearHubDbTableRows(accountId, tableId);

package/commands/hubdb/create.js

@@ -31,7 +31,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('hubdb-create', {}, accountId);
+  trackCommandUsage('hubdb-create', null, accountId);
 
   try {
     const filePath = path.resolve(getCwd(), src);

package/commands/hubdb/delete.js

@@ -24,7 +24,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('hubdb-delete', {}, accountId);
+  trackCommandUsage('hubdb-delete', null, accountId);
 
   try {
     await deleteTable(accountId, tableId);

package/commands/hubdb/fetch.js

@@ -25,7 +25,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('hubdb-fetch', {}, accountId);
+  trackCommandUsage('hubdb-fetch', null, accountId);
 
   try {
     const { filePath } = await downloadHubDbTable(accountId, tableId, dest);

package/commands/lint.js

@@ -33,7 +33,7 @@ exports.handler = async options => {
     path: localPath,
   });
 
-  trackCommandUsage('lint', {}, accountId);
+  trackCommandUsage('lint', null, accountId);
 
   logger.group(groupName);
   let count = 0;

package/commands/list.js

@@ -37,7 +37,7 @@ exports.handler = async options => {
   const accountId = getAccountId(options);
   let contentsResp;
 
-  trackCommandUsage('list', {}, accountId);
+  trackCommandUsage('list', null, accountId);
 
   logger.debug(
     i18n(`${i18nKey}.gettingPathContents`, {

package/commands/module/marketplace-validate.js

@@ -38,7 +38,7 @@ exports.handler = async options => {
       })
     );
   }
-  trackCommandUsage('validate', {}, accountId);
+  trackCommandUsage('validate', null, accountId);
 
   applyRelativeValidators(
     MARKETPLACE_VALIDATORS.module,

package/commands/mv.js

@@ -36,7 +36,7 @@ exports.handler = async options => {
   const { srcPath, destPath } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('mv', {}, accountId);
+  trackCommandUsage('mv', null, accountId);
 
   try {
     await moveFile(accountId, srcPath, getCorrectedDestPath(srcPath, destPath));

package/commands/open.js

@@ -34,7 +34,7 @@ exports.handler = async options => {
   const { shortcut, list } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('open', { shortcut }, accountId);
+  trackCommandUsage('open', null, accountId);
 
   if (shortcut === undefined && !list) {
     const choice = await createListPrompt(accountId);

package/commands/project/create.js

@@ -30,7 +30,7 @@ exports.handler = async options => {
 
   const { name, template, location } = await createProjectPrompt(options);
 
-  trackCommandUsage('project-create', { projectName: name }, accountId);
+  trackCommandUsage('project-create', null, accountId);
 
   await createProjectConfig(
     path.resolve(getCwd(), options.location || location),
@@ -45,6 +45,7 @@ exports.handler = async options => {
     'projectUploadCommand',
     'projectDeployCommand',
     'projectHelpCommand',
+    'feedbackCommand',
   ]);
 };
 

package/commands/project/deploy.js

@@ -15,6 +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 i18nKey = 'cli.commands.project.subcommands.deploy';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
@@ -26,9 +27,11 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
+  // const accountConfig = getAccountConfig(accountId);
   const { project, buildId } = options;
+  // const sandboxType = accountConfig && accountConfig.sandboxAccountType;
 
-  trackCommandUsage('project-deploy', { project }, accountId);
+  trackCommandUsage('project-deploy', null, accountId);
 
   const { projectConfig } = await getProjectConfig();
 

package/commands/project/download.js

@@ -36,7 +36,7 @@ exports.handler = async options => {
   const { name: projectName, dest, buildNumber } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('project-download', { projectName }, accountId);
+  trackCommandUsage('project-download', null, accountId);
 
   const projectExists = await ensureProjectExists(accountId, projectName, {
     allowCreate: false,

package/commands/project/listBuilds.js

@@ -40,7 +40,7 @@ exports.handler = async options => {
   const { path: projectPath, limit } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('project-list-builds', { projectPath }, accountId);
+  trackCommandUsage('project-list-builds', null, accountId);
 
   const cwd = projectPath ? path.resolve(getCwd(), projectPath) : getCwd();
   const { projectConfig, projectDir } = await getProjectConfig(cwd);

package/commands/project/logs.js

@@ -188,7 +188,7 @@ exports.handler = async options => {
     }
   }
 
-  trackCommandUsage('project-logs', { latest: options.latest }, accountId);
+  trackCommandUsage('project-logs', null, accountId);
 
   const logsInfo = [accountId, `"${projectName}"`];
   let tableHeader;

package/commands/project/open.js

@@ -29,7 +29,7 @@ exports.handler = async options => {
   const accountId = getAccountId(options);
   const { project } = options;
 
-  trackCommandUsage('project-open', { project }, accountId);
+  trackCommandUsage('project-open', null, accountId);
 
   const { projectConfig } = await getProjectConfig();
 

package/commands/project/upload.js

@@ -13,11 +13,13 @@ const {
   ensureProjectExists,
   getProjectConfig,
   handleProjectUpload,
+  logFeedbackMessage,
   pollBuildStatus,
   pollDeployStatus,
   validateProjectConfig,
 } = require('../../lib/projects');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+// const { getAccountConfig } = require('@hubspot/cli-lib');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.upload';
@@ -30,8 +32,10 @@ exports.handler = async options => {
 
   const { forceCreate, path: projectPath } = options;
   const accountId = getAccountId(options);
+  // const accountConfig = getAccountConfig(accountId);
+  // const sandboxType = accountConfig && accountConfig.sandboxAccountType;
 
-  trackCommandUsage('project-upload', { projectPath }, accountId);
+  trackCommandUsage('project-upload', null, accountId);
 
   const { projectConfig, projectDir } = await getProjectConfig(projectPath);
 
@@ -43,17 +47,21 @@ exports.handler = async options => {
     let exitCode = EXIT_CODES.SUCCESS;
 
     const {
+      autoDeployId,
       isAutoDeployEnabled,
       deployStatusTaskLocator,
       status,
     } = await pollBuildStatus(accountId, projectConfig.name, buildId);
+    // autoDeployId of 0 indicates a skipped deploy
+    const isDeploying =
+      isAutoDeployEnabled && autoDeployId > 0 && deployStatusTaskLocator;
 
     uiLine();
 
     if (status === 'FAILURE') {
       exitCode = EXIT_CODES.ERROR;
       return;
-    } else if (isAutoDeployEnabled && deployStatusTaskLocator) {
+    } else if (isDeploying) {
       logger.log(
         i18n(`${i18nKey}.logs.buildSucceededAutomaticallyDeploying`, {
           accountIdentifier: uiAccountDescription(accountId),
@@ -98,6 +106,8 @@ exports.handler = async options => {
       logger.error(e);
     }
 
+    logFeedbackMessage(buildId);
+
     process.exit(exitCode);
   };
 

package/commands/project/watch.js

@@ -19,6 +19,7 @@ const {
   pollBuildStatus,
   pollDeployStatus,
   validateProjectConfig,
+  logFeedbackMessage,
 } = require('../../lib/projects');
 const {
   cancelStagedBuild,
@@ -47,6 +48,8 @@ const handleBuildStatus = async (accountId, projectName, buildId) => {
       buildId
     );
   }
+
+  logFeedbackMessage(buildId);
 };
 
 const handleUserInput = (accountId, projectName, currentBuildId) => {
@@ -83,7 +86,7 @@ exports.handler = async options => {
   const { initialUpload, path: projectPath } = options;
   const accountId = getAccountId(options);
 
-  trackCommandUsage('project-watch', { projectPath }, accountId);
+  trackCommandUsage('project-watch', null, accountId);
 
   const { projectConfig, projectDir } = await getProjectConfig(projectPath);
 

package/commands/remove.js

@@ -27,7 +27,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  trackCommandUsage('remove', {}, accountId);
+  trackCommandUsage('remove', null, accountId);
 
   try {
     await deleteFile(accountId, hsPath);

package/commands/sandbox/create.js

@@ -120,7 +120,7 @@ exports.handler = async options => {
     succeedColor: 'white',
   });
 
-  trackCommandUsage('sandbox-create', {}, accountId);
+  trackCommandUsage('sandbox-create', null, accountId);
 
   let namePrompt;
 
@@ -151,8 +151,6 @@ exports.handler = async options => {
   } catch (err) {
     debugErrorAndContext(err);
 
-    trackCommandUsage('sandbox-create', { success: false }, accountId);
-
     spinnies.fail('sandboxCreate', {
       text: i18n(`${i18nKey}.loading.fail`, {
         sandboxName,

package/commands/sandbox/delete.js

@@ -49,7 +49,7 @@ exports.handler = async options => {
     account: account || accountPrompt.account,
   });
 
-  trackCommandUsage('sandbox-delete', {}, sandboxAccountId);
+  trackCommandUsage('sandbox-delete', null, sandboxAccountId);
 
   let parentAccountId;
   for (const portal of config.portals) {
@@ -126,8 +126,6 @@ exports.handler = async options => {
   } catch (err) {
     debugErrorAndContext(err);
 
-    trackCommandUsage('sandbox-delete', { success: false }, sandboxAccountId);
-
     if (
       err.error &&
       err.error.category === OBJECT_NOT_FOUND &&

package/commands/secrets/addSecret.js

@@ -28,7 +28,7 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
-  trackCommandUsage('secrets-add', {}, accountId);
+  trackCommandUsage('secrets-add', null, accountId);
 
   try {
     const { secretValue } = await secretValuePrompt();

package/commands/secrets/deleteSecret.js

@@ -27,7 +27,7 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
-  trackCommandUsage('secrets-delete', {}, accountId);
+  trackCommandUsage('secrets-delete', null, accountId);
 
   try {
     await deleteSecret(accountId, secretName);

package/commands/secrets/listSecrets.js

@@ -25,7 +25,7 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
-  trackCommandUsage('secrets-list', {}, accountId);
+  trackCommandUsage('secrets-list', null, accountId);
 
   try {
     const { results } = await fetchSecrets(accountId);

package/commands/secrets/updateSecret.js

@@ -28,7 +28,7 @@ exports.handler = async options => {
   await loadAndValidateOptions(options);
 
   const accountId = getAccountId(options);
-  trackCommandUsage('secrets-update', {}, accountId);
+  trackCommandUsage('secrets-update', null, accountId);
 
   try {
     const { secretValue } = await secretValuePrompt();

package/commands/theme/marketplace-validate.js

@@ -63,7 +63,7 @@ exports.handler = async options => {
       })
     );
   }
-  trackCommandUsage('validate', {}, accountId);
+  trackCommandUsage('validate', null, accountId);
 
   const themeFiles = await walk(absoluteSrcPath);
 

package/lib/projects.js

@@ -11,6 +11,8 @@ const { cloneGitHubRepo } = require('@hubspot/cli-lib/github');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const {
   ENVIRONMENTS,
+  FEEDBACK_INTERVAL,
+  ERROR_TYPES,
   POLLING_DELAY,
   PROJECT_TEMPLATES,
   PROJECT_BUILD_TEXT,
@@ -280,6 +282,9 @@ const uploadProjectFiles = async (accountId, projectName, filePath) => {
         projectName,
       })
     );
+    if (err.error.subCategory === ERROR_TYPES.PROJECT_LOCKED) {
+      logger.log(i18n(`${i18nKey}.logs.projectLockedError`));
+    }
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -517,6 +522,16 @@ const pollDeployStatus = makePollTaskStatusFunc({
   },
 });
 
+const logFeedbackMessage = buildId => {
+  const i18nKey = 'cli.commands.project.subcommands.upload';
+  if (buildId > 0 && buildId % FEEDBACK_INTERVAL === 0) {
+    uiLine();
+    logger.log(i18n(`${i18nKey}.logs.feedbackHeader`));
+    uiLine();
+    logger.log(i18n(`${i18nKey}.logs.feedbackMessage`));
+  }
+};
+
 module.exports = {
   writeProjectConfig,
   getProjectConfig,
@@ -529,4 +544,5 @@ module.exports = {
   pollBuildStatus,
   pollDeployStatus,
   ensureProjectExists,
+  logFeedbackMessage,
 };

package/lib/prompts/feedbackPrompt.js

@@ -0,0 +1,40 @@
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { FEEDBACK_OPTIONS } = require('@hubspot/cli-lib/lib/constants');
+
+const i18nKey = 'cli.lib.prompts.feedbackPrompt';
+
+const feedbackTypePrompt = bypassPrompt => {
+  return promptUser([
+    {
+      name: 'type',
+      message: i18n(`${i18nKey}.feedbackType.message`),
+      type: 'list',
+      when: !bypassPrompt,
+      choices: Object.values(FEEDBACK_OPTIONS).map(option => ({
+        name: i18n(`${i18nKey}.feedbackType.${option}`),
+        value: option,
+      })),
+    },
+  ]);
+};
+
+const shouldOpenBrowserPrompt = (type, bypassPrompt) => {
+  return promptUser([
+    {
+      name: 'shouldOpen',
+      message: () => {
+        return type === FEEDBACK_OPTIONS.BUG
+          ? i18n(`${i18nKey}.bugPrompt`)
+          : i18n(`${i18nKey}.generalPrompt`);
+      },
+      type: 'confirm',
+      when: !bypassPrompt,
+    },
+  ]);
+};
+
+module.exports = {
+  feedbackTypePrompt,
+  shouldOpenBrowserPrompt,
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.0.2-beta.3",
+  "version": "4.0.2-beta.5",
   "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.3",
-    "@hubspot/serverless-dev-runtime": "4.0.2-beta.3",
+    "@hubspot/cli-lib": "4.0.2-beta.5",
+    "@hubspot/serverless-dev-runtime": "4.0.2-beta.5",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "8d7d59214871eb34d2e9061e253c8d5d39ae0d9a"
+  "gitHead": "3c4cd0095cfd6b115da0c91def008240386b52a5"
 }