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

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/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

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.0.2-beta.5",
+  "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.5",
-    "@hubspot/serverless-dev-runtime": "4.0.2-beta.5",
+    "@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": "3c4cd0095cfd6b115da0c91def008240386b52a5"
+  "gitHead": "e738be958be36d5ec5aa4957483cd096bef13ef0"
 }