@hubspot/cli 4.0.2-beta.4 → 4.0.2-beta.6

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/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/project/create.js

@@ -45,6 +45,7 @@ exports.handler = async options => {
     'projectUploadCommand',
     'projectDeployCommand',
     'projectHelpCommand',
+    'feedbackCommand',
   ]);
 };
 

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

@@ -13,12 +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 { getAccountConfig } = require('@hubspot/cli-lib');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.upload';
@@ -31,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);
 
@@ -46,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),
@@ -101,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) => {

package/commands/sandbox/create.js

@@ -151,6 +151,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

@@ -126,6 +126,12 @@ exports.handler = async options => {
   } catch (err) {
     debugErrorAndContext(err);
 
+    trackCommandUsage(
+      'sandbox-delete',
+      { successful: false },
+      sandboxAccountId
+    );
+
     if (
       err.error &&
       err.error.category === OBJECT_NOT_FOUND &&

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

@@ -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);
   }
 
@@ -382,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,
@@ -405,7 +410,7 @@ const makePollTaskStatusFunc = ({
               return;
             }
 
-            const updatedText = `${chalk.bold(subTaskName)} #${displayId} ${
+            const updatedText = `${chalk.bold(subTaskName)} ${
               statusText.STATUS_TEXT[subTask.status]
             }\n`;
 
@@ -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.4",
+  "version": "4.0.2-beta.6",
   "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.4",
-    "@hubspot/serverless-dev-runtime": "4.0.2-beta.4",
+    "@hubspot/cli-lib": "4.0.2-beta.6",
+    "@hubspot/serverless-dev-runtime": "4.0.2-beta.6",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "56347c4026ac958b9a721ed0057b68c7c4c4918d"
+  "gitHead": "e738be958be36d5ec5aa4957483cd096bef13ef0"
 }