@hubspot/cli 5.1.3 → 5.1.4-beta.1

package/commands/accounts/list.js

@@ -12,8 +12,15 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { getSandboxTypeAsString } = require('../../lib/sandboxes');
+const { isSandbox, getSandboxName } = require('../../lib/sandboxes');
+const {
+  isDeveloperTestAccount,
+  DEV_TEST_ACCOUNT_STRING,
+} = require('../../lib/developerTestAccounts');
 const { i18n } = require('../../lib/lang');
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const i18nKey = 'cli.commands.accounts.subcommands.list';
 
@@ -22,29 +29,32 @@ exports.describe = i18n(`${i18nKey}.describe`);
 
 const sortAndMapPortals = portals => {
   const mappedPortalData = {};
+  // Standard and app developer portals
   portals
-    .sort((a, b) => {
-      if (a.sandboxAccountType === null && b.sandboxAccountType !== null) {
-        return -1;
-      }
-      if (a.sandboxAccountType !== null && b.sandboxAccountType === null) {
-        return 1;
-      }
-      return 0;
-    })
+    .filter(p =>
+      p.accountType
+        ? p.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD ||
+          p.accountType === HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER
+        : p.sandboxAccountType === null
+    )
     .forEach(portal => {
-      if (
-        portal.sandboxAccountType !== undefined &&
-        portal.sandboxAccountType === null
-      ) {
-        mappedPortalData[portal.portalId] = [portal];
-      } else if (portal.sandboxAccountType && portal.parentAccountId) {
-        mappedPortalData[portal.parentAccountId] = [
-          ...(mappedPortalData[portal.parentAccountId] || []),
-          portal,
+      mappedPortalData[portal.portalId] = [portal];
+    });
+  // Non-standard portals (sandbox, developer test account)
+  portals
+    .filter(p =>
+      p.accountType
+        ? isSandbox(p) || isDeveloperTestAccount(p)
+        : p.sandboxAccountType !== null
+    )
+    .forEach(p => {
+      if (p.parentAccountId) {
+        mappedPortalData[p.parentAccountId] = [
+          ...(mappedPortalData[p.parentAccountId] || []),
+          p,
         ];
       } else {
-        mappedPortalData[portal.portalId] = [portal];
+        mappedPortalData[p.portalId] = [p];
       }
     });
   return mappedPortalData;
@@ -53,18 +63,20 @@ const sortAndMapPortals = portals => {
 const getPortalData = mappedPortalData => {
   const portalData = [];
   Object.values(mappedPortalData).forEach(set => {
-    set.forEach((portal, i) => {
-      if (i === 0) {
-        portalData.push([portal.name, portal.portalId, portal.authType]);
-      } else {
-        portalData.push([
-          `↳ ${portal.name} [${getSandboxTypeAsString(
-            portal.sandboxAccountType
-          )} sandbox]`,
-          portal.portalId,
-          portal.authType,
-        ]);
+    set.forEach(portal => {
+      let name = portal.name;
+      if (isSandbox(portal)) {
+        name = `${portal.name} ${getSandboxName(portal)}`;
+        if (set.length > 1) {
+          name = `↳ ${name}`;
+        }
+      } else if (isDeveloperTestAccount(portal)) {
+        name = `${portal.name} [${DEV_TEST_ACCOUNT_STRING}]`;
+        if (set.length > 1) {
+          name = `↳ ${name}`;
+        }
       }
+      portalData.push([name, portal.portalId, portal.authType]);
     });
   });
   return portalData;

package/commands/customObject/create.js

@@ -1,13 +1,15 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { logApiErrorInstance } = require('../../lib/errorHandlers/apiErrors');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const {
-  isFileValidJSON,
+  checkAndConvertToJson,
   loadAndValidateOptions,
 } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { getAccountId } = require('../../lib/commonOpts');
-const { batchCreateObjects } = require('@hubspot/cli-lib/api/customObject');
+const {
+  batchCreateObjects,
+} = require('@hubspot/local-dev-lib/api/customObjects');
 const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.customObject.subcommands.create';
@@ -26,15 +28,17 @@ exports.handler = async options => {
   trackCommandUsage('custom-object-batch-create', null, accountId);
 
   const filePath = getAbsoluteFilePath(definition);
-  if (!isFileValidJSON(filePath)) {
+  const objectJson = checkAndConvertToJson(filePath);
+
+  if (!objectJson) {
     process.exit(EXIT_CODES.ERROR);
   }
 
   try {
-    await batchCreateObjects(accountId, name, filePath);
+    await batchCreateObjects(accountId, name, objectJson);
     logger.success(i18n(`${i18nKey}.success.objectsCreated`));
   } catch (e) {
-    logErrorInstance(e, { accountId });
+    logApiErrorInstance(e, { accountId });
     logger.error(
       i18n(`${i18nKey}.errors.creationFailed`, {
         definition,

package/commands/customObject/schema/create.js

@@ -1,10 +1,8 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const {
-  logErrorInstance,
-} = require('../../../lib/errorHandlers/standardErrors');
+const { logApiErrorInstance } = require('../../../lib/errorHandlers/apiErrors');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const {
-  isFileValidJSON,
+  checkAndConvertToJson,
   loadAndValidateOptions,
 } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
@@ -14,10 +12,12 @@ const {
   isConfigFlagEnabled,
 } = require('@hubspot/local-dev-lib/config');
 const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
-const { createSchema } = require('@hubspot/cli-lib/api/schema');
+const {
+  createObjectSchema,
+} = require('@hubspot/local-dev-lib/api/customObjects');
 const {
   createSchema: createSchemaFromHubFile,
-} = require('@hubspot/cli-lib/api/fileTransport');
+} = require('@hubspot/local-dev-lib/api/fileTransport');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { i18n } = require('../../../lib/lang');
 
@@ -38,7 +38,8 @@ exports.handler = async options => {
   trackCommandUsage('custom-object-schema-create', null, accountId);
 
   const filePath = getAbsoluteFilePath(definition);
-  if (!isFileValidJSON(filePath)) {
+  const schemaJson = checkAndConvertToJson(filePath);
+  if (!schemaJson) {
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -51,7 +52,7 @@ exports.handler = async options => {
         })
       );
     } else {
-      const res = await createSchema(accountId, filePath);
+      const res = await createObjectSchema(accountId, schemaJson);
       logger.success(
         i18n(`${i18nKey}.success.schemaViewable`, {
           url: `${getHubSpotWebsiteOrigin(
@@ -61,7 +62,7 @@ exports.handler = async options => {
       );
     }
   } catch (e) {
-    logErrorInstance(e, { accountId });
+    logApiErrorInstance(e, { accountId });
     logger.error(
       i18n(`${i18nKey}.errors.creationFailed`, {
         definition,

package/commands/customObject/schema/delete.js

@@ -1,12 +1,12 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const {
-  logErrorInstance,
-} = require('../../../lib/errorHandlers/standardErrors');
+const { logApiErrorInstance } = require('../../../lib/errorHandlers/apiErrors');
 
 const { loadAndValidateOptions } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { getAccountId } = require('../../../lib/commonOpts');
-const { deleteSchema } = require('@hubspot/cli-lib/api/schema');
+const {
+  deleteObjectSchema,
+} = require('@hubspot/local-dev-lib/api/customObjects');
 const { i18n } = require('../../../lib/lang');
 
 const i18nKey =
@@ -25,14 +25,14 @@ exports.handler = async options => {
   trackCommandUsage('custom-object-schema-delete', null, accountId);
 
   try {
-    await deleteSchema(accountId, name);
+    await deleteObjectSchema(accountId, name);
     logger.success(
       i18n(`${i18nKey}.success.delete`, {
         name,
       })
     );
   } catch (e) {
-    logErrorInstance(e);
+    logApiErrorInstance(e);
     logger.error(
       i18n(`${i18nKey}.errors.delete`, {
         name,

package/commands/customObject/schema/fetch.js

@@ -9,7 +9,7 @@ const {
   downloadSchema,
   getResolvedPath,
 } = require('@hubspot/local-dev-lib/customObjects');
-const { fetchSchema } = require('@hubspot/cli-lib/api/fileTransport');
+const { fetchSchema } = require('@hubspot/local-dev-lib/api/fileTransport');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 
 const { loadAndValidateOptions } = require('../../../lib/validation');

package/commands/customObject/schema/update.js

@@ -1,10 +1,8 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const {
-  logErrorInstance,
-} = require('../../../lib/errorHandlers/standardErrors');
+const { logApiErrorInstance } = require('../../../lib/errorHandlers/apiErrors');
 const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const {
-  isFileValidJSON,
+  checkAndConvertToJson,
   loadAndValidateOptions,
 } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
@@ -14,10 +12,12 @@ const {
   getEnv,
   isConfigFlagEnabled,
 } = require('@hubspot/local-dev-lib/config');
-const { updateSchema } = require('@hubspot/cli-lib/api/schema');
+const {
+  updateObjectSchema,
+} = require('@hubspot/local-dev-lib/api/customObjects');
 const {
   updateSchema: updateSchemaFromHubFile,
-} = require('@hubspot/cli-lib/api/fileTransport');
+} = require('@hubspot/local-dev-lib/api/fileTransport');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { i18n } = require('../../../lib/lang');
 
@@ -38,7 +38,8 @@ exports.handler = async options => {
   trackCommandUsage('custom-object-schema-update', null, accountId);
 
   const filePath = getAbsoluteFilePath(definition);
-  if (!isFileValidJSON(filePath)) {
+  const schemaJson = checkAndConvertToJson(filePath);
+  if (!schemaJson) {
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -51,7 +52,7 @@ exports.handler = async options => {
         })
       );
     } else {
-      const res = await updateSchema(accountId, name, filePath);
+      const res = await updateObjectSchema(accountId, name, schemaJson);
       logger.success(
         i18n(`${i18nKey}.success.viewAtUrl`, {
           url: `${getHubSpotWebsiteOrigin(
@@ -61,7 +62,7 @@ exports.handler = async options => {
       );
     }
   } catch (e) {
-    logErrorInstance(e, { accountId });
+    logApiErrorInstance(e, { accountId });
     logger.error(
       i18n(`${i18nKey}.errors.update`, {
         definition,

package/commands/functions/deploy.js

@@ -15,7 +15,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const {
   buildPackage,
   getBuildStatus,
-} = require('@hubspot/cli-lib/api/functions');
+} = require('@hubspot/local-dev-lib/api/functions');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { outputBuildLog } = require('../../lib/serverlessLogs');
 const { i18n } = require('../../lib/lang');

package/commands/functions/list.js

@@ -1,4 +1,4 @@
-const { getRoutes } = require('@hubspot/cli-lib/api/functions');
+const { getRoutes } = require('@hubspot/local-dev-lib/api/functions');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
   logApiErrorInstance,

package/commands/hubdb/clear.js

@@ -1,7 +1,7 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
-const { clearHubDbTableRows } = require('@hubspot/cli-lib/hubdb');
-const { publishTable } = require('@hubspot/cli-lib/api/hubdb');
+const { logApiErrorInstance } = require('../../lib/errorHandlers/apiErrors');
+const { clearHubDbTableRows } = require('@hubspot/local-dev-lib/hubdb');
+const { publishTable } = require('@hubspot/local-dev-lib/api/hubdb');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -52,7 +52,7 @@ exports.handler = async options => {
       );
     }
   } catch (e) {
-    logErrorInstance(e);
+    logApiErrorInstance(e);
   }
 };
 

package/commands/hubdb/create.js

@@ -1,12 +1,12 @@
 const path = require('path');
 
 const { logger } = require('@hubspot/cli-lib/logger');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { logApiErrorInstance } = require('../../lib/errorHandlers/apiErrors');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
-const { createHubDbTable } = require('@hubspot/cli-lib/hubdb');
+const { createHubDbTable } = require('@hubspot/local-dev-lib/hubdb');
 
 const {
-  isFileValidJSON,
+  checkAndConvertToJson,
   loadAndValidateOptions,
 } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -35,7 +35,7 @@ exports.handler = async options => {
 
   try {
     const filePath = path.resolve(getCwd(), src);
-    if (!isFileValidJSON(filePath)) {
+    if (!checkAndConvertToJson(filePath)) {
       process.exit(EXIT_CODES.ERROR);
     }
 
@@ -56,7 +56,7 @@ exports.handler = async options => {
         src,
       })
     );
-    logErrorInstance(e);
+    logApiErrorInstance(e);
   }
 };
 

package/commands/hubdb/delete.js

@@ -1,6 +1,6 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
-const { deleteTable } = require('@hubspot/cli-lib/api/hubdb');
+const { logApiErrorInstance } = require('../../lib/errorHandlers/apiErrors');
+const { deleteTable } = require('@hubspot/local-dev-lib/api/hubdb');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 
@@ -40,7 +40,7 @@ exports.handler = async options => {
         tableId,
       })
     );
-    logErrorInstance(e);
+    logApiErrorInstance(e);
   }
 };
 

package/commands/hubdb/fetch.js

@@ -1,6 +1,6 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
-const { downloadHubDbTable } = require('@hubspot/cli-lib/hubdb');
+const { logApiErrorInstance } = require('../../lib/errorHandlers/apiErrors');
+const { downloadHubDbTable } = require('@hubspot/local-dev-lib/hubdb');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -37,7 +37,7 @@ exports.handler = async options => {
       })
     );
   } catch (e) {
-    logErrorInstance(e);
+    logApiErrorInstance(e);
   }
 };
 

package/commands/mv.js

@@ -1,5 +1,6 @@
-const { moveFile } = require('@hubspot/local-dev-lib/api/fileMapper');
 const { logger } = require('@hubspot/cli-lib/logger');
+const { moveFile } = require('@hubspot/local-dev-lib/api/fileMapper');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const {
   logApiErrorInstance,
   ApiErrorContext,
@@ -55,7 +56,7 @@ exports.handler = async options => {
         srcPath,
       })
     );
-    if (error.statusCode === 409) {
+    if (isSpecifiedError(error, { statusCode: 409 })) {
       logger.error(
         i18n(`${i18nKey}.errors.sourcePathExists`, {
           destPath,

package/commands/project/deploy.js

@@ -11,7 +11,10 @@ const {
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { deployProject, fetchProject } = require('@hubspot/cli-lib/api/dfs');
+const {
+  deployProject,
+  fetchProject,
+} = require('@hubspot/local-dev-lib/api/projects');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { getProjectConfig, pollDeployStatus } = require('../../lib/projects');
 const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');

package/commands/project/dev.js

@@ -18,7 +18,10 @@ const {
   getAccountConfig,
   getEnv,
 } = require('@hubspot/local-dev-lib/config');
-const { createProject, fetchProject } = require('@hubspot/cli-lib/api/dfs');
+const {
+  createProject,
+  fetchProject,
+} = require('@hubspot/local-dev-lib/api/projects');
 const {
   getProjectConfig,
   ensureProjectExists,
@@ -37,15 +40,14 @@ const {
 const { confirmPrompt } = require('../../lib/prompts/promptUtils');
 const {
   selectTargetAccountPrompt,
-  confirmDefaultSandboxAccountPrompt,
+  confirmDefaultAccountPrompt,
 } = require('../../lib/prompts/projectDevTargetAccountPrompt');
 const SpinniesManager = require('../../lib/SpinniesManager');
 const LocalDevManager = require('../../lib/LocalDevManager');
-const { isSandbox } = require('../../lib/sandboxes');
+const { isSandbox, getSandboxTypeAsString } = require('../../lib/sandboxes');
 const { sandboxNamePrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
   validateSandboxUsageLimits,
-  DEVELOPER_SANDBOX,
   getAvailableSyncTypes,
 } = require('../../lib/sandboxes');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
@@ -55,8 +57,8 @@ const {
   ERROR_TYPES,
 } = require('@hubspot/cli-lib/lib/constants');
 
-const { buildSandbox } = require('../../lib/sandbox-create');
-const { syncSandbox } = require('../../lib/sandbox-sync');
+const { buildSandbox } = require('../../lib/sandboxCreate');
+const { syncSandbox } = require('../../lib/sandboxSync');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
   logApiErrorInstance,
@@ -67,6 +69,11 @@ const {
   isMissingScopeError,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const {
+  isDeveloperTestAccount,
+  DEV_TEST_ACCOUNT_STRING,
+} = require('../../lib/developerTestAccounts');
+const { DEVELOPER_SANDBOX_TYPE } = require('../../lib/constants');
 
 const i18nKey = 'cli.commands.project.subcommands.dev';
 
@@ -96,19 +103,27 @@ exports.handler = async options => {
   let targetAccountId = options.account ? accountId : null;
   let createNewSandbox = false;
   const defaultAccountIsSandbox = isSandbox(accountConfig);
+  const defaultAccountIsDeveloperTestAccount = isDeveloperTestAccount(
+    accountConfig
+  );
 
-  if (!targetAccountId && defaultAccountIsSandbox) {
+  if (
+    !targetAccountId &&
+    (defaultAccountIsSandbox || defaultAccountIsDeveloperTestAccount)
+  ) {
     logger.log();
-    const useDefaultSandboxAccount = await confirmDefaultSandboxAccountPrompt(
+    const useDefaultAccount = await confirmDefaultAccountPrompt(
       accountConfig.name,
-      accountConfig.sandboxAccountType
+      defaultAccountIsSandbox
+        ? `${getSandboxTypeAsString(accountConfig.accountType)} sandbox`
+        : DEV_TEST_ACCOUNT_STRING
     );
 
-    if (useDefaultSandboxAccount) {
+    if (useDefaultAccount) {
       targetAccountId = accountId;
     } else {
       logger.log(
-        i18n(`${i18nKey}.logs.declineDefaultSandboxExplanation`, {
+        i18n(`${i18nKey}.logs.declineDefaultAccountExplanation`, {
           useCommand: uiCommandReference('hs accounts use'),
           devCommand: uiCommandReference('hs project dev'),
         })
@@ -135,7 +150,11 @@ exports.handler = async options => {
 
   if (createNewSandbox) {
     try {
-      await validateSandboxUsageLimits(accountConfig, DEVELOPER_SANDBOX, env);
+      await validateSandboxUsageLimits(
+        accountConfig,
+        DEVELOPER_SANDBOX_TYPE,
+        env
+      );
     } catch (err) {
       if (isMissingScopeError(err)) {
         logger.error(
@@ -157,7 +176,7 @@ exports.handler = async options => {
       process.exit(EXIT_CODES.ERROR);
     }
     try {
-      const { name } = await sandboxNamePrompt(DEVELOPER_SANDBOX);
+      const { name } = await sandboxNamePrompt(DEVELOPER_SANDBOX_TYPE);
 
       trackCommandMetadataUsage(
         'sandbox-create',
@@ -167,7 +186,7 @@ exports.handler = async options => {
 
       const { result } = await buildSandbox({
         name,
-        type: DEVELOPER_SANDBOX,
+        type: DEVELOPER_SANDBOX_TYPE,
         accountConfig,
         env,
       });

package/commands/project/download.js

@@ -16,7 +16,7 @@ const { extractZipArchive } = require('@hubspot/local-dev-lib/archive');
 const {
   downloadProject,
   fetchProjectBuilds,
-} = require('@hubspot/cli-lib/api/dfs');
+} = require('@hubspot/local-dev-lib/api/projects');
 const { ensureProjectExists, getProjectConfig } = require('../../lib/projects');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const {

package/commands/project/listBuilds.js

@@ -16,7 +16,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const {
   fetchProject,
   fetchProjectBuilds,
-} = require('@hubspot/cli-lib/api/dfs');
+} = require('@hubspot/local-dev-lib/api/projects');
 const {
   getTableContents,
   getTableHeader,

package/commands/project/logs.js

@@ -13,21 +13,21 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const {
   fetchProject,
   fetchDeployComponentsMetadata,
-} = require('@hubspot/cli-lib/api/dfs');
+} = require('@hubspot/local-dev-lib/api/projects');
 const {
   getTableContents,
   getTableHeader,
 } = require('@hubspot/local-dev-lib/logging/table');
 // const {
-//   getProjectAppFunctionLogs,
-//   getLatestProjectAppFunctionLog,
-//   getFunctionLogs,
-//   getLatestFunctionLog,
-// } = require('@hubspot/cli-lib/api/functions');
-// const {
 //   logApiErrorInstance,
 //   ApiErrorContext,
 // } = require('../../lib/errorHandlers/apiErrors');
+// const {
+//   getFunctionLogs,
+//   getLatestFunctionLog,
+//   getProjectAppFunctionLogs,
+//   getLatestProjectAppFunctionLog,
+// } = require('@hubspot/local-dev-lib/api/functions');
 
 const { ensureProjectExists } = require('../../lib/projects');
 const { loadAndValidateOptions } = require('../../lib/validation');

package/commands/project/upload.js

@@ -30,7 +30,7 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.upload';
 
-exports.command = 'upload [path]';
+exports.command = 'upload [path] [--forceCreate] [--message]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
@@ -49,7 +49,10 @@ exports.handler = async options => {
 
   await showPlatformVersionWarning(accountId, projectConfig);
 
-  await ensureProjectExists(accountId, projectConfig.name, { forceCreate });
+  await ensureProjectExists(accountId, projectConfig.name, {
+    forceCreate,
+    uploadCommand: true,
+  });
 
   try {
     const result = await handleProjectUpload(

package/commands/project/watch.js

@@ -27,7 +27,8 @@ const {
 const {
   cancelStagedBuild,
   fetchProjectBuilds,
-} = require('@hubspot/cli-lib/api/dfs');
+} = require('@hubspot/local-dev-lib/api/projects');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { handleKeypress, handleExit } = require('../../lib/process');
@@ -64,7 +65,11 @@ const handleUserInput = (accountId, projectName, currentBuildId) => {
         await cancelStagedBuild(accountId, projectName);
         process.exit(EXIT_CODES.SUCCESS);
       } catch (err) {
-        if (err.error.subCategory === ERROR_TYPES.BUILD_NOT_IN_PROGRESS) {
+        if (
+          isSpecifiedError(err, {
+            subCategory: ERROR_TYPES.BUILD_NOT_IN_PROGRESS,
+          })
+        ) {
           process.exit(EXIT_CODES.SUCCESS);
         } else {
           logApiErrorInstance(