@hubspot/cli 5.1.3-beta.1 → 5.1.4-beta.0

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,

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(

package/commands/secrets/addSecret.js

@@ -1,9 +1,9 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
-  logServerlessFunctionApiErrorInstance,
+  logApiErrorInstance,
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
-const { addSecret } = require('@hubspot/cli-lib/api/secrets');
+const { addSecret } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -41,15 +41,14 @@ exports.handler = async options => {
         secretName,
       })
     );
-  } catch (e) {
+  } catch (err) {
     logger.error(
       i18n(`${i18nKey}.errors.add`, {
         secretName,
       })
     );
-    await logServerlessFunctionApiErrorInstance(
-      accountId,
-      e,
+    logApiErrorInstance(
+      err,
       new ApiErrorContext({
         request: 'add secret',
         accountId,

package/commands/secrets/deleteSecret.js

@@ -1,9 +1,9 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
-  logServerlessFunctionApiErrorInstance,
   ApiErrorContext,
+  logApiErrorInstance,
 } = require('../../lib/errorHandlers/apiErrors');
-const { deleteSecret } = require('@hubspot/cli-lib/api/secrets');
+const { deleteSecret } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -38,15 +38,14 @@ exports.handler = async options => {
         secretName,
       })
     );
-  } catch (e) {
+  } catch (err) {
     logger.error(
       i18n(`${i18nKey}.errors.delete`, {
         secretName,
       })
     );
-    await logServerlessFunctionApiErrorInstance(
-      accountId,
-      e,
+    logApiErrorInstance(
+      err,
       new ApiErrorContext({
         request: 'delete a secret',
         accountId,

package/commands/secrets/listSecrets.js

@@ -1,9 +1,9 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
-  logServerlessFunctionApiErrorInstance,
+  logApiErrorInstance,
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
-const { fetchSecrets } = require('@hubspot/cli-lib/api/secrets');
+const { fetchSecrets } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -36,11 +36,10 @@ exports.handler = async options => {
     logger.group(groupLabel);
     results.forEach(secret => logger.log(secret));
     logger.groupEnd(groupLabel);
-  } catch (e) {
+  } catch (err) {
     logger.error(i18n(`${i18nKey}.errors.list`));
-    await logServerlessFunctionApiErrorInstance(
-      accountId,
-      e,
+    logApiErrorInstance(
+      err,
       new ApiErrorContext({
         request: 'add secret',
         accountId,

package/commands/secrets/updateSecret.js

@@ -1,9 +1,9 @@
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
-  logServerlessFunctionApiErrorInstance,
   ApiErrorContext,
+  logApiErrorInstance,
 } = require('../../lib/errorHandlers/apiErrors');
-const { updateSecret } = require('@hubspot/cli-lib/api/secrets');
+const { updateSecret } = require('@hubspot/local-dev-lib/api/secrets');
 
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
@@ -42,15 +42,14 @@ exports.handler = async options => {
       })
     );
     logger.log(i18n(`${i18nKey}.success.updateExplanation`));
-  } catch (e) {
+  } catch (err) {
     logger.error(
       i18n(`${i18nKey}.errors.update`, {
         secretName,
       })
     );
-    await logServerlessFunctionApiErrorInstance(
-      accountId,
-      e,
+    logApiErrorInstance(
+      err,
       new ApiErrorContext({
         request: 'update secret',
         accountId,

package/lang/en.lyaml

@@ -933,6 +933,7 @@ en:
           fileFiltered: "Ignore rule triggered for \"{{ filename }}\""
         ensureProjectExists:
           createPrompt: "The project {{ projectName }} does not exist in {{ accountIdentifier }}. Would you like to create it?"
+          createPromptUpload: "[--forceCreate] The project {{ projectName }} does not exist in {{ accountIdentifier }}. Would you like to create it?"
           createSuccess: "New project {{#bold}}{{ projectName }}{{/bold}} successfully created in {{#bold}}{{ accountIdentifier }}{{/bold}}."
           notFound: "Your project {{#bold}}{{ projectName }}{{/bold}} could not be found in {{#bold}}{{ accountIdentifier }}{{/bold}}."
         pollFetchProject:

package/lib/lang.js

@@ -52,11 +52,12 @@ const getTextValue = lookupDotNotation => {
       previouslyCheckedProp = prop;
     });
   } catch (e) {
-    logger.error(
+    logger.debug(
       `Unable to access language property: ${lookupProps.join(
         '.'
       )}. Failed to access prop "${previouslyCheckedProp}".`
     );
+    logger.error('Unable to access language property.');
     return missingTextData;
   }
 
@@ -92,4 +93,5 @@ const setLangData = (newLocale, newLangObj) => {
 module.exports = {
   i18n,
   setLangData,
+  MISSING_LANGUAGE_DATA_PREFIX,
 };

package/lib/marketplace-validate.js

@@ -5,7 +5,7 @@ const {
   requestValidation,
   getValidationStatus,
   getValidationResults,
-} = require('@hubspot/cli-lib/api/marketplaceValidation');
+} = require('@hubspot/local-dev-lib/api/marketplaceValidation');
 const { i18n } = require('./lang');
 const { EXIT_CODES } = require('./enums/exitCodes');
 

package/lib/projects.js

@@ -28,7 +28,8 @@ const {
   getDeployStructure,
   fetchProject,
   uploadProject,
-} = require('@hubspot/cli-lib/api/dfs');
+} = require('@hubspot/local-dev-lib/api/projects');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
 const { getCwd, getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
 const { downloadGitHubRepoContents } = require('@hubspot/cli-lib/github');
@@ -40,7 +41,6 @@ const SpinniesManager = require('./SpinniesManager');
 const {
   logApiErrorInstance,
   ApiErrorContext,
-  isSpecifiedError, // Migrate isSpecifiedError to local-dev-lib version only after fetchProject is migrated to local-dev-lib
   isSpecifiedHubSpotAuthError,
 } = require('./errorHandlers/apiErrors');
 const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } = require('./constants');
@@ -238,6 +238,7 @@ const ensureProjectExists = async (
     allowCreate = true,
     noLogs = false,
     withPolling = false,
+    uploadCommand = false,
   } = {}
 ) => {
   const accountIdentifier = uiAccountDescription(accountId);
@@ -247,14 +248,14 @@ const ensureProjectExists = async (
       : await fetchProject(accountId, projectName);
     return !!project;
   } catch (err) {
-    if (err.statusCode === 404) {
+    if (isSpecifiedError(err, { statusCode: 404 })) {
       let shouldCreateProject = forceCreate;
-
       if (allowCreate && !shouldCreateProject) {
+        const promptKey = uploadCommand ? 'createPromptUpload' : 'createPrompt';
         const promptResult = await promptUser([
           {
             name: 'shouldCreateProject',
-            message: i18n(`${i18nKey}.ensureProjectExists.createPrompt`, {
+            message: i18n(`${i18nKey}.ensureProjectExists.${promptKey}`, {
               projectName,
               accountIdentifier,
             }),

package/lib/projectsWatch.js

@@ -16,7 +16,8 @@ const {
   uploadFileToBuild,
   deleteFileFromBuild,
   queueBuild,
-} = require('@hubspot/cli-lib/api/dfs');
+} = require('@hubspot/local-dev-lib/api/projects');
+const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
 
 const i18nKey = 'cli.commands.project.subcommands.watch';
@@ -29,25 +30,40 @@ let currentBuildId = null;
 let handleBuildStatus, handleUserInput;
 let timer;
 
-const processStandByQueue = async (accountId, projectName) => {
+const processStandByQueue = async (accountId, projectName, platformVersion) => {
   queue.addAll(
     standbyeQueue.map(({ filePath, remotePath, action }) => {
       return async () => {
-        queueFileOrFolder(accountId, projectName, filePath, remotePath, action);
+        queueFileOrFolder(
+          accountId,
+          projectName,
+          platformVersion,
+          filePath,
+          remotePath,
+          action
+        );
       };
     })
   );
   standbyeQueue.length = 0;
-  debounceQueueBuild(accountId, projectName);
+  debounceQueueBuild(accountId, projectName, platformVersion);
 };
 
-const createNewStagingBuild = async (accountId, projectName) => {
-  currentBuildId = await createNewBuild(accountId, projectName);
+const createNewStagingBuild = async (
+  accountId,
+  projectName,
+  platformVersion
+) => {
+  currentBuildId = await createNewBuild(
+    accountId,
+    projectName,
+    platformVersion
+  );
 
   handleUserInput(accountId, projectName, currentBuildId);
 };
 
-const debounceQueueBuild = (accountId, projectName) => {
+const debounceQueueBuild = (accountId, projectName, platformVersion) => {
   if (timer) {
     clearTimeout(timer);
   }
@@ -58,12 +74,13 @@ const debounceQueueBuild = (accountId, projectName) => {
     await queue.onIdle();
 
     try {
-      await queueBuild(accountId, projectName);
+      await queueBuild(accountId, projectName, platformVersion);
       logger.debug(i18n(`${i18nKey}.debug.buildStarted`, { projectName }));
     } catch (err) {
       if (
-        err.error &&
-        err.error.subCategory === ERROR_TYPES.MISSING_PROJECT_PROVISION
+        isSpecifiedError(err, {
+          subCategory: ERROR_TYPES.MISSING_PROJECT_PROVISION,
+        })
       ) {
         logger.log(i18n(`${i18nKey}.logs.watchCancelledFromUi`));
         process.exit(0);
@@ -79,10 +96,10 @@ const debounceQueueBuild = (accountId, projectName) => {
 
     await handleBuildStatus(accountId, projectName, currentBuildId);
 
-    await createNewStagingBuild(accountId, projectName);
+    await createNewStagingBuild(accountId, projectName, platformVersion);
 
     if (standbyeQueue.length > 0) {
-      await processStandByQueue(accountId, projectName);
+      await processStandByQueue(accountId, projectName, platformVersion);
     }
 
     queue.start();
@@ -94,6 +111,7 @@ const debounceQueueBuild = (accountId, projectName) => {
 const queueFileOrFolder = async (
   accountId,
   projectName,
+  platformVersion,
   filePath,
   remotePath,
   action
@@ -107,7 +125,7 @@ const queueFileOrFolder = async (
     return;
   }
   if (!queue.isPaused) {
-    debounceQueueBuild(accountId, projectName);
+    debounceQueueBuild(accountId, projectName, platformVersion);
   }
 
   logger.debug(i18n(`${i18nKey}.debug.uploading`, { filePath, remotePath }));
@@ -130,14 +148,18 @@ const queueFileOrFolder = async (
   });
 };
 
-const createNewBuild = async (accountId, projectName) => {
+const createNewBuild = async (accountId, projectName, platformVersion) => {
   try {
     logger.debug(i18n(`${i18nKey}.debug.attemptNewBuild`));
-    const { buildId } = await provisionBuild(accountId, projectName);
+    const { buildId } = await provisionBuild(
+      accountId,
+      projectName,
+      platformVersion
+    );
     return buildId;
   } catch (err) {
     logApiErrorInstance(err, new ApiErrorContext({ accountId, projectName }));
-    if (err.error.subCategory !== ERROR_TYPES.PROJECT_LOCKED) {
+    if (isSpecifiedError(err, { subCategory: ERROR_TYPES.PROJECT_LOCKED })) {
       await cancelStagedBuild(accountId, projectName);
       logger.log(i18n(`${i18nKey}.logs.previousStagingBuildCancelled`));
     }
@@ -148,6 +170,7 @@ const createNewBuild = async (accountId, projectName) => {
 const handleWatchEvent = async (
   accountId,
   projectName,
+  platformVersion,
   projectSourceDir,
   filePath,
   action = 'upload'
@@ -165,6 +188,7 @@ const handleWatchEvent = async (
     await queueFileOrFolder(
       accountId,
       projectName,
+      platformVersion,
       filePath,
       remotePath,
       action
@@ -184,7 +208,11 @@ const createWatcher = async (
   handleBuildStatus = handleBuildStatusFn;
   handleUserInput = handleUserInputFn;
 
-  await createNewStagingBuild(accountId, projectConfig.name);
+  await createNewStagingBuild(
+    accountId,
+    projectConfig.name,
+    projectConfig.platformVersion
+  );
 
   const watcher = chokidar.watch(projectSourceDir, {
     ignoreInitial: true,
@@ -195,15 +223,28 @@ const createWatcher = async (
     logger.log(`\n> Press ${chalk.bold('q')} to quit watching\n`);
   });
   watcher.on('add', async path => {
-    handleWatchEvent(accountId, projectConfig.name, projectSourceDir, path);
+    handleWatchEvent(
+      accountId,
+      projectConfig.name,
+      projectConfig.platformVersion,
+      projectSourceDir,
+      path
+    );
   });
   watcher.on('change', async path => {
-    handleWatchEvent(accountId, projectConfig.name, projectSourceDir, path);
+    handleWatchEvent(
+      accountId,
+      projectConfig.name,
+      projectConfig.platformVersion,
+      projectSourceDir,
+      path
+    );
   });
   watcher.on('unlink', async path => {
     handleWatchEvent(
       accountId,
       projectConfig.name,
+      projectConfig.platformVersion,
       projectSourceDir,
       path,
       'deleteFile'
@@ -213,6 +254,7 @@ const createWatcher = async (
     handleWatchEvent(
       accountId,
       projectConfig.name,
+      projectConfig.platformVersion,
       projectSourceDir,
       path,
       'deleteFolder'

package/lib/prompts/downloadProjectPrompt.js

@@ -1,6 +1,6 @@
 const { promptUser } = require('./promptUtils');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
-const { fetchProjects } = require('@hubspot/cli-lib/api/dfs');
+const { fetchProjects } = require('@hubspot/local-dev-lib/api/projects');
 const {
   logApiErrorInstance,
   ApiErrorContext,

package/lib/prompts/projectsLogsPrompt.js

@@ -1,5 +1,5 @@
 const { i18n } = require('../lang');
-const { fetchProject } = require('@hubspot/cli-lib/api/dfs');
+const { fetchProject } = require('@hubspot/local-dev-lib/api/projects');
 const { promptUser } = require('./promptUtils');
 const { getAccountId } = require('../commonOpts');
 const { getProjectConfig, ensureProjectExists } = require('../projects');

package/lib/sandboxes.js

@@ -1,5 +1,5 @@
 const chalk = require('chalk');
-const { i18n } = require('./lang');
+const { i18n, MISSING_LANGUAGE_DATA_PREFIX } = require('./lang');
 const { handleExit, handleKeypress } = require('./process');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
@@ -332,7 +332,6 @@ function pollSyncTaskStatus(
   const mergeTasks = {
     'lead-flows': 'forms', // lead-flows are a subset of forms. We combine these in the UI as a single item, so we want to merge here for consistency.
   };
-  const ignoreTasks = ['gates'];
   let progressCounter = {};
   let pollInterval;
   // Handle manual exit for return key and ctrl+c
@@ -368,16 +367,16 @@ function pollSyncTaskStatus(
         // Array of sync tasks, eg: workflows, pipelines, object-schemas, etc. with each task containing a status of 'PENDING', 'IN_PROGRESS', 'COMPLETE', and 'FAILURE'
         for (const task of taskResult.tasks) {
           // For each sync task, show a progress bar and increment bar each time we run this interval until status is 'COMPLETE'
-          const taskType = task.type;
-          if (
-            !progressBar.get(taskType) &&
-            !mergeTasks[taskType] &&
-            !ignoreTasks.includes(taskType)
-          ) {
+          let taskType = task.type;
+          const taskTypeLabel = i18n(`${i18nKey}.${taskType}.label`);
+          if (taskTypeLabel.startsWith(MISSING_LANGUAGE_DATA_PREFIX)) {
+            continue;
+          }
+          if (!progressBar.get(taskType) && !mergeTasks[taskType]) {
             // skip creation of lead-flows bar because we're combining lead-flows into the forms bar, otherwise create a bar instance for the type
             progressCounter[taskType] = 0;
             progressBar.create(taskType, 100, 0, {
-              label: i18n(`${i18nKey}.${taskType}.label`),
+              label: taskTypeLabel,
             });
           } else if (mergeTasks[taskType]) {
             // It's a lead-flow here, merge status into the forms progress bar
@@ -408,7 +407,7 @@ function pollSyncTaskStatus(
           }
           if (progressBar.get(taskType) && task.status === 'COMPLETE') {
             progressBar.update(taskType, 100, {
-              label: i18n(`${i18nKey}.${taskType}.label`),
+              label: taskTypeLabel,
             });
           } else if (
             // Do not start incrementing for tasks still in PENDING state
@@ -421,7 +420,7 @@ function pollSyncTaskStatus(
               taskType === syncTypes.OBJECT_RECORDS ? 2 : 3 // slower progress for object-records, sync can take up to a few minutes
             );
             progressBar.update(taskType, progressCounter[taskType], {
-              label: i18n(`${i18nKey}.${taskType}.label`),
+              label: taskTypeLabel,
             });
           }
         }

package/lib/schema.js

@@ -1,7 +1,9 @@
 const chalk = require('chalk');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { table, getBorderCharacters } = require('table');
-const { fetchSchemas } = require('@hubspot/cli-lib/api/schema');
+const {
+  fetchObjectSchemas,
+} = require('@hubspot/local-dev-lib/api/customObjects');
 
 const logSchemas = schemas => {
   const data = schemas
@@ -22,7 +24,7 @@ const logSchemas = schemas => {
 };
 
 const listSchemas = async accountId => {
-  const response = await fetchSchemas(accountId);
+  const response = await fetchObjectSchemas(accountId);
   logSchemas(response.results);
 };
 

package/lib/validation.js

@@ -206,29 +206,31 @@ const fileExists = _path => {
   return true;
 };
 
-const isFileValidJSON = _path => {
+const checkAndConvertToJson = _path => {
   const filePath = getAbsoluteFilePath(_path);
   if (!fileExists(filePath)) return false;
 
   if (getExt(_path) !== 'json') {
     logger.error(`The file "${_path}" must be a valid JSON file`);
-    return false;
+    return null;
   }
 
+  let result;
+
   try {
-    JSON.parse(fs.readFileSync(filePath));
+    result = JSON.parse(fs.readFileSync(filePath, 'utf-8'));
   } catch (e) {
     logger.error(`The file "${_path}" contains invalid JSON`);
-    return false;
+    result = null;
   }
 
-  return true;
+  return result;
 };
 
 module.exports = {
   validateMode,
   validateAccount,
-  isFileValidJSON,
+  checkAndConvertToJson,
   fileExists,
   loadAndValidateOptions,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.1.3-beta.1",
+  "version": "5.1.4-beta.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -9,8 +9,8 @@
   },
   "dependencies": {
     "@hubspot/cli-lib": "^9.0.0",
-    "@hubspot/local-dev-lib": "^0.3.0",
-    "@hubspot/serverless-dev-runtime": "5.1.3-beta.1",
+    "@hubspot/local-dev-lib": "^0.3.3",
+    "@hubspot/serverless-dev-runtime": "5.1.4-beta.0",
     "@hubspot/ui-extensions-dev-server": "0.8.9",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4b53ba30127c3d8c12e5ccd6d4dc3833cc87e7b1"
+  "gitHead": "6c4b965fc42578b79a53bf3eb2e6aa2342802d93"
 }