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

package/commands/cms/lighthouseScore.js

@@ -49,7 +49,10 @@ const selectTheme = async accountId => {
       message: i18n(`${i18nKey}.info.promptMessage`),
       choices: async () => {
         try {
-          const result = await fetchThemes(accountId);
+          const result = await fetchThemes(accountId, {
+            limit: 500,
+            sorting: 'MOST_USED',
+          });
           if (result && result.objects) {
             return result.objects
               .map(({ theme }) => theme.path)

package/commands/init.js

@@ -8,6 +8,7 @@ const {
 } = require('@hubspot/cli-lib/lib/config');
 const { addConfigOptions } = require('../lib/commonOpts');
 const { handleExit } = require('@hubspot/cli-lib/lib/process');
+const { checkAndUpdateGitignore } = require('@hubspot/cli-lib/lib/git');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
 const {
   DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
@@ -116,6 +117,8 @@ exports.handler = async options => {
     );
     const configPath = getConfigPath();
 
+    checkAndUpdateGitignore(configPath);
+
     logger.log('');
     logger.success(
       i18n(`${i18nKey}.success.configFileCreated`, {

package/commands/sandbox/create.js

@@ -13,6 +13,9 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const { createSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
+const {
+  debugErrorAndContext,
+} = require('@hubspot/cli-lib/errorHandlers/standardErrors');
 const {
   ENVIRONMENTS,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
@@ -103,7 +106,7 @@ const personalAccessKeyFlow = async (env, account, name) => {
   ]);
 };
 
-exports.command = 'create [name]';
+exports.command = 'create [--name]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
@@ -146,11 +149,14 @@ exports.handler = async options => {
       }),
     });
   } catch (err) {
+    debugErrorAndContext(err);
+
     spinnies.fail('sandboxCreate', {
       text: i18n(`${i18nKey}.loading.fail`, {
         sandboxName,
       }),
     });
+
     if (isMissingScopeError(err)) {
       logger.error(
         i18n(`${i18nKey}.failure.scopes.message`, {
@@ -180,13 +186,16 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  yargs.positional('name', {
-    describe: i18n(`${i18nKey}.positionals.name.describe`),
+  yargs.option('name', {
+    describe: i18n(`${i18nKey}.options.name.describe`),
     type: 'string',
   });
 
   yargs.example([
-    ['$0 sandbox create MySandboxAccount', i18n(`${i18nKey}.examples.default`)],
+    [
+      '$0 sandbox create --name=MySandboxAccount',
+      i18n(`${i18nKey}.examples.default`),
+    ],
   ]);
 
   addConfigOptions(yargs, true);

package/commands/sandbox/delete.js

@@ -8,6 +8,9 @@ const {
 const { logger } = require('@hubspot/cli-lib/logger');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
+const {
+  debugErrorAndContext,
+} = require('@hubspot/cli-lib/errorHandlers/standardErrors');
 
 const { deleteSandbox } = require('@hubspot/cli-lib/sandboxes');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
@@ -117,6 +120,8 @@ exports.handler = async options => {
     }
     process.exit(EXIT_CODES.SUCCESS);
   } catch (err) {
+    debugErrorAndContext(err);
+
     if (
       err.error &&
       err.error.category === OBJECT_NOT_FOUND &&

package/lib/projects.js

@@ -343,8 +343,9 @@ const makePollTaskStatusFunc = ({
     }
   };
 
-  return async (accountId, taskName, taskId) => {
-    let hubspotLinkText = '';
+  return async (accountId, taskName, taskId, deployedBuildId = null) => {
+    const displayId = deployedBuildId || taskId;
+
     if (linkToHubSpot) {
       logger.log(`\n${linkToHubSpot(taskName, taskId, accountId)}\n`);
     }
@@ -372,7 +373,7 @@ const makePollTaskStatusFunc = ({
       const subTaskName = subTask[statusText.SUBTASK_NAME_KEY];
 
       spinnies.add(subTaskName, {
-        text: `${chalk.bold(subTaskName)} #${taskId} ${
+        text: `${chalk.bold(subTaskName)} #${displayId} ${
           statusText.STATUS_TEXT[statusText.STATES.ENQUEUED]
         }\n`,
         indent: 2,
@@ -395,7 +396,7 @@ const makePollTaskStatusFunc = ({
               return;
             }
 
-            const updatedText = `${chalk.bold(subTaskName)} #${taskId} ${
+            const updatedText = `${chalk.bold(subTaskName)} #${displayId} ${
               statusText.STATUS_TEXT[subTask.status]
             }\n`;
 
@@ -413,17 +414,17 @@ const makePollTaskStatusFunc = ({
           });
 
           if (isTaskComplete(taskStatus)) {
-            subTaskStatus.forEach(subTask => {
-              spinnies.remove(subTask[statusText.SUBTASK_NAME_KEY]);
-            });
+            // subTaskStatus.forEach(subTask => {
+            //   spinnies.remove(subTask[statusText.SUBTASK_NAME_KEY]);
+            // });
 
             if (status === statusText.STATES.SUCCESS) {
               spinnies.succeed('overallTaskStatus', {
-                text: `${statusStrings.SUCCESS(taskName)}${hubspotLinkText}`,
+                text: statusStrings.SUCCESS(taskName),
               });
             } else if (status === statusText.STATES.FAILURE) {
               spinnies.fail('overallTaskStatus', {
-                text: `${statusStrings.FAIL(taskName)}${hubspotLinkText}`,
+                text: statusStrings.FAIL(taskName),
               });
 
               const failedSubtask = subTaskStatus.filter(
@@ -433,7 +434,7 @@ const makePollTaskStatusFunc = ({
               uiLine();
               logger.log(
                 `${statusStrings.SUBTASK_FAIL(
-                  taskId,
+                  displayId,
                   failedSubtask.length === 1
                     ? failedSubtask[0][statusText.SUBTASK_NAME_KEY]
                     : failedSubtask.length + ' components'
@@ -481,8 +482,8 @@ const pollBuildStatus = makePollTaskStatusFunc({
     INITIALIZE: name => `Building ${chalk.bold(name)}`,
     SUCCESS: name => `Built ${chalk.bold(name)}`,
     FAIL: name => `Failed to build ${chalk.bold(name)}`,
-    SUBTASK_FAIL: (taskId, name) =>
-      `Build #${taskId} failed because there was a problem\nbuilding ${chalk.bold(
+    SUBTASK_FAIL: (buildId, name) =>
+      `Build #${buildId} failed because there was a problem\nbuilding ${chalk.bold(
         name
       )}`,
   },
@@ -495,8 +496,8 @@ const pollDeployStatus = makePollTaskStatusFunc({
     INITIALIZE: name => `Deploying ${chalk.bold(name)}`,
     SUCCESS: name => `Deployed ${chalk.bold(name)}`,
     FAIL: name => `Failed to deploy ${chalk.bold(name)}`,
-    SUBTASK_FAIL: (taskId, name) =>
-      `Deploy for build #${taskId} failed because there was a\nproblem deploying ${chalk.bold(
+    SUBTASK_FAIL: (deployedBuildId, name) =>
+      `Deploy for build #${deployedBuildId} failed because there was a\nproblem deploying ${chalk.bold(
         name
       )}`,
   },

package/package.json

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