@hubspot/cli 5.1.4-beta.2 → 5.1.4-beta.4

package/lib/filesystem.js

@@ -1,6 +1,8 @@
 const path = require('path');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
-const { FOLDER_DOT_EXTENSIONS } = require('@hubspot/cli-lib/lib/constants');
+const {
+  FOLDER_DOT_EXTENSIONS,
+} = require('@hubspot/local-dev-lib/constants/extensions');
 
 function resolveLocalPath(filepath) {
   return filepath && typeof filepath === 'string'

package/lib/links.js

@@ -1,11 +1,10 @@
 const { getEnv } = require('@hubspot/local-dev-lib/config');
-const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
+const {
+  ENVIRONMENTS,
+} = require('@hubspot/local-dev-lib/constants/environments');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const {
-  getTableContents,
-  getTableHeader,
-} = require('@hubspot/local-dev-lib/logging/table');
+const { getTableContents, getTableHeader } = require('./ui/table');
 
 const open = require('open');
 

package/lib/oauth.js

@@ -8,7 +8,9 @@ const { addOauthToAccountConfig } = require('@hubspot/local-dev-lib/oauth');
 const { handleExit } = require('./process');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
+const {
+  ENVIRONMENTS,
+} = require('@hubspot/local-dev-lib/constants/environments');
 
 const PORT = 3000;
 const redirectUri = `http://localhost:${PORT}/oauth-callback`;

package/lib/process.js

@@ -4,9 +4,7 @@ const {
   setLogLevel,
   LOG_LEVEL,
 } = require('@hubspot/local-dev-lib/logger');
-const {
-  setLogLevel: setLocalDevLibLogLevel,
-} = require('@hubspot/local-dev-lib/logger');
+const { setLogLevel: setCliLibLogLevel } = require('@hubspot/cli-lib/logger');
 const { i18n } = require('./lang');
 
 const i18nKey = 'cli.lib.process';
@@ -36,9 +34,9 @@ const handleExit = callback => {
         if (isSIGHUP) {
           setLogLevel(LOG_LEVEL.NONE);
 
-          // Update the log level in local-dev-lib's instance of the logger
-          // This will evenutally replace cli-lib's version of it
-          setLocalDevLibLogLevel(LOG_LEVEL.LOG);
+          // Update the log level in cli-lib's instance of the logger
+          // We can remove this when we remove cli-lib as a dep
+          setCliLibLogLevel(LOG_LEVEL.NONE);
         }
 
         logger.debug(i18n(`${i18nKey}.exitDebug`, { signal }));

package/lib/projectStructure.js

@@ -5,10 +5,23 @@ const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logErrorInstance } = require('./errorHandlers/standardErrors');
 
 const COMPONENT_TYPES = Object.freeze({
-  app: 'app',
+  privateApp: 'private-app',
+  publicApp: 'public-app',
 });
 
-const APP_COMPONENT_CONFIG = 'app.json';
+const CONFIG_FILES = {
+  [COMPONENT_TYPES.privateApp]: 'app.json',
+  [COMPONENT_TYPES.publicApp]: 'public-app.json',
+};
+
+function getTypeFromConfigFile(configFile) {
+  for (let key in CONFIG_FILES) {
+    if (CONFIG_FILES[key] === configFile) {
+      return key;
+    }
+  }
+  return null;
+}
 
 function loadConfigFile(configPath) {
   if (configPath) {
@@ -84,24 +97,20 @@ async function findProjectComponents(projectSourceDir) {
 
   projectFiles.forEach(projectFile => {
     // Find app components
-    if (projectFile.endsWith(APP_COMPONENT_CONFIG)) {
+    const { base, dir } = path.parse(projectFile);
+
+    if (Object.values(CONFIG_FILES).includes(base)) {
       const parsedAppConfig = loadConfigFile(projectFile);
 
       if (parsedAppConfig && parsedAppConfig.name) {
-        const appPath = projectFile.substring(
-          0,
-          projectFile.indexOf(APP_COMPONENT_CONFIG)
-        );
-        if (typeof appPath === 'string') {
-          const isLegacy = getIsLegacyApp(parsedAppConfig, appPath);
-
-          components.push({
-            type: COMPONENT_TYPES.app,
-            config: parsedAppConfig,
-            runnable: !isLegacy,
-            path: appPath,
-          });
-        }
+        const isLegacy = getIsLegacyApp(parsedAppConfig, dir);
+
+        components.push({
+          type: getTypeFromConfigFile(base),
+          config: parsedAppConfig,
+          runnable: !isLegacy,
+          path: dir,
+        });
       }
     }
   });
@@ -110,7 +119,7 @@ async function findProjectComponents(projectSourceDir) {
 }
 
 module.exports = {
-  APP_COMPONENT_CONFIG,
+  CONFIG_FILES,
   COMPONENT_TYPES,
   findProjectComponents,
   getAppCardConfigs,

package/lib/projects.js

@@ -9,17 +9,15 @@ const { getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const {
   ENVIRONMENTS,
+} = require('@hubspot/local-dev-lib/constants/environments');
+const {
   FEEDBACK_INTERVAL,
   POLLING_DELAY,
   PROJECT_BUILD_TEXT,
   PROJECT_DEPLOY_TEXT,
   PROJECT_CONFIG_FILE,
   PROJECT_TASK_TYPES,
-  SPINNER_STATUS,
-} = require('@hubspot/cli-lib/lib/constants');
-const {
-  fetchDefaultVersion,
-} = require('@hubspot/cli-lib/lib/projectPlatformVersion');
+} = require('./constants');
 const {
   createProject,
   getBuildStatus,
@@ -37,7 +35,7 @@ const { promptUser } = require('./prompts/promptUtils');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { uiLine, uiLink, uiAccountDescription } = require('../lib/ui');
 const { i18n } = require('./lang');
-const SpinniesManager = require('./SpinniesManager');
+const SpinniesManager = require('./ui/SpinniesManager');
 const {
   logApiErrorInstance,
   ApiErrorContext,
@@ -47,6 +45,10 @@ const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } = require('./constants');
 
 const i18nKey = 'cli.lib.projects';
 
+const SPINNER_STATUS = {
+  SPINNING: 'spinning',
+};
+
 const writeProjectConfig = (configPath, config) => {
   try {
     fs.ensureFileSync(configPath);
@@ -877,26 +879,13 @@ const showPlatformVersionWarning = async (accountId, projectConfig) => {
   );
 
   if (!platformVersion) {
-    try {
-      const defaultVersion = await fetchDefaultVersion(accountId);
-      logger.log('');
-      logger.warn(
-        i18n(`${i18nKey}.showPlatformVersionWarning.noPlatformVersion`, {
-          defaultVersion,
-          docsLink,
-        })
-      );
-      logger.log('');
-    } catch (e) {
-      logger.log('');
-      logger.warn(
-        i18n(`${i18nKey}.showPlatformVersionWarning.noPlatformVersionAlt`, {
-          docsLink,
-        })
-      );
-      logger.log('');
-      logger.debug(e.error);
-    }
+    logger.log('');
+    logger.warn(
+      i18n(`${i18nKey}.showPlatformVersionWarning.noPlatformVersion`, {
+        docsLink,
+      })
+    );
+    logger.log('');
   } else if (platformVersion === '2023.1') {
     logger.log('');
     logger.warn(

package/lib/projectsWatch.js

@@ -18,7 +18,7 @@ const {
   queueBuild,
 } = 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 { PROJECT_ERROR_TYPES } = require('./constants');
 
 const i18nKey = 'cli.commands.project.subcommands.watch';
 
@@ -79,7 +79,7 @@ const debounceQueueBuild = (accountId, projectName, platformVersion) => {
     } catch (err) {
       if (
         isSpecifiedError(err, {
-          subCategory: ERROR_TYPES.MISSING_PROJECT_PROVISION,
+          subCategory: PROJECT_ERROR_TYPES.MISSING_PROJECT_PROVISION,
         })
       ) {
         logger.log(i18n(`${i18nKey}.logs.watchCancelledFromUi`));
@@ -159,7 +159,9 @@ const createNewBuild = async (accountId, projectName, platformVersion) => {
     return buildId;
   } catch (err) {
     logApiErrorInstance(err, new ApiErrorContext({ accountId, projectName }));
-    if (isSpecifiedError(err, { subCategory: ERROR_TYPES.PROJECT_LOCKED })) {
+    if (
+      isSpecifiedError(err, { subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED })
+    ) {
       await cancelStagedBuild(accountId, projectName);
       logger.log(i18n(`${i18nKey}.logs.previousStagingBuildCancelled`));
     }

package/lib/prompts/createProjectPrompt.js

@@ -1,9 +1,6 @@
 const path = require('path');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
-const {
-  PROJECT_COMPONENT_TYPES,
-  PROJECT_PROPERTIES,
-} = require('@hubspot/cli-lib/lib/constants');
+const { PROJECT_COMPONENT_TYPES } = require('../../lib/constants');
 const { promptUser } = require('./promptUtils');
 const { fetchJsonFromRepository } = require('@hubspot/cli-lib/github');
 const { i18n } = require('../lang');
@@ -16,6 +13,8 @@ const {
 
 const i18nKey = 'cli.lib.prompts.createProjectPrompt';
 
+const PROJECT_PROPERTIES = ['name', 'label', 'path', 'insertPath'];
+
 const hasAllProperties = projectList => {
   return projectList.every(config =>
     PROJECT_PROPERTIES.every(p =>

package/lib/prompts/feedbackPrompt.js

@@ -1,6 +1,6 @@
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
-const { FEEDBACK_OPTIONS } = require('@hubspot/cli-lib/lib/constants');
+const { FEEDBACK_OPTIONS } = require('../constants');
 
 const i18nKey = 'cli.lib.prompts.feedbackPrompt';
 

package/lib/prompts/personalAccessKeyPrompt.js

@@ -2,7 +2,7 @@ const open = require('open');
 const {
   OAUTH_SCOPES,
   DEFAULT_OAUTH_SCOPES,
-} = require('@hubspot/cli-lib/lib/constants');
+} = require('@hubspot/local-dev-lib/constants/auth');
 const { deleteEmptyConfigFile } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logger } = require('@hubspot/local-dev-lib/logger');

package/lib/prompts/projectAddPrompt.js

@@ -2,7 +2,7 @@ const { promptUser } = require('./promptUtils');
 const { fetchJsonFromRepository } = require('@hubspot/cli-lib/github');
 const { i18n } = require('../lang');
 const { HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH } = require('../constants');
-const { PROJECT_COMPONENT_TYPES } = require('@hubspot/cli-lib/lib/constants');
+const { PROJECT_COMPONENT_TYPES } = require('../constants');
 
 const i18nKey = 'cli.lib.prompts.projectAddPrompt';
 

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -4,8 +4,10 @@ const { uiAccountDescription, uiCommandReference } = require('../ui');
 const { isSandbox } = require('../sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { getSandboxUsageLimits } = require('@hubspot/local-dev-lib/sandboxes');
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { DEVELOPER_SANDBOX, STANDARD_SANDBOX } = require('../constants');
 
 const i18nKey = 'cli.lib.prompts.projectDevTargetAccountPrompt';
 
@@ -34,18 +36,15 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
     );
   let disabledMessage = false;
 
-  if (
-    sandboxUsage[DEVELOPER_SANDBOX] &&
-    sandboxUsage[DEVELOPER_SANDBOX].available === 0
-  ) {
-    if (sandboxAccounts.length < sandboxUsage[DEVELOPER_SANDBOX].limit) {
+  if (sandboxUsage['DEVELOPER'] && sandboxUsage['DEVELOPER'].available === 0) {
+    if (sandboxAccounts.length < sandboxUsage['DEVELOPER'].limit) {
       disabledMessage = i18n(`${i18nKey}.sandboxLimitWithSuggestion`, {
         authCommand: uiCommandReference('hs auth'),
-        limit: sandboxUsage[DEVELOPER_SANDBOX].limit,
+        limit: sandboxUsage['DEVELOPER'].limit,
       });
     } else {
       disabledMessage = i18n(`${i18nKey}.sandboxLimit`, {
-        limit: sandboxUsage[DEVELOPER_SANDBOX].limit,
+        limit: sandboxUsage['DEVELOPER'].limit,
       });
     }
   }
@@ -53,10 +52,10 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
   // Order choices by Developer Sandbox -> Standard Sandbox
   const choices = [
     ...sandboxAccounts
-      .filter(a => a.sandboxAccountType === DEVELOPER_SANDBOX)
+      .filter(a => a.accountType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX)
       .map(mapSandboxAccount),
     ...sandboxAccounts
-      .filter(a => a.sandboxAccountType === STANDARD_SANDBOX)
+      .filter(a => a.accountType === HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX)
       .map(mapSandboxAccount),
     {
       name: i18n(`${i18nKey}.createNewSandboxOption`),

package/lib/prompts/sandboxesPrompt.js

@@ -3,17 +3,15 @@ const { i18n } = require('../lang');
 const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('../ui');
 const {
-  DEVELOPER_SANDBOX,
-  STANDARD_SANDBOX,
-  STANDARD_SANDBOX_TYPE,
-  DEVELOPER_SANDBOX_TYPE,
-} = require('../constants');
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
+const { isSandbox } = require('../sandboxes');
 
 const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 
 const mapSandboxAccountChoices = portals =>
   portals
-    .filter(p => p.sandboxAccountType && p.sandboxAccountType !== null)
+    .filter(p => isSandbox(p))
     .map(p => {
       return {
         name: uiAccountDescription(p.portalId, false),
@@ -23,9 +21,7 @@ const mapSandboxAccountChoices = portals =>
 
 const mapNonSandboxAccountChoices = portals =>
   portals
-    .filter(
-      p => p.sandboxAccountType === null || p.sandboxAccountType === undefined
-    )
+    .filter(p => !isSandbox(p))
     .map(p => {
       return {
         name: `${p.name} (${p.portalId})`,
@@ -33,9 +29,10 @@ const mapNonSandboxAccountChoices = portals =>
       };
     });
 
-const sandboxNamePrompt = (type = STANDARD_SANDBOX_TYPE) => {
-  const isDeveloperSandbox = type === DEVELOPER_SANDBOX_TYPE;
-  const namePromptMessage = isDeveloperSandbox
+const sandboxNamePrompt = (type = HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX) => {
+  const isDevelopmentSandbox =
+    type === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX;
+  const namePromptMessage = isDevelopmentSandbox
     ? `${i18nKey}.name.developmentSandboxMessage`
     : `${i18nKey}.name.message`;
   return promptUser([
@@ -52,7 +49,7 @@ const sandboxNamePrompt = (type = STANDARD_SANDBOX_TYPE) => {
           ? i18n(`${i18nKey}.name.errors.accountNameExists`, { name: val })
           : true;
       },
-      default: `New ${isDeveloperSandbox ? 'development ' : ''}sandbox`,
+      default: `New ${isDevelopmentSandbox ? 'development ' : ''}sandbox`,
     },
   ]);
 };
@@ -60,11 +57,11 @@ const sandboxNamePrompt = (type = STANDARD_SANDBOX_TYPE) => {
 const sandboxTypeChoices = [
   {
     name: i18n(`${i18nKey}.type.developer`),
-    value: DEVELOPER_SANDBOX,
+    value: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
   },
   {
     name: i18n(`${i18nKey}.type.standard`),
-    value: STANDARD_SANDBOX,
+    value: HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX,
   },
 ];
 
@@ -76,7 +73,7 @@ const sandboxTypePrompt = () => {
       type: 'list',
       look: false,
       choices: sandboxTypeChoices,
-      default: DEVELOPER_SANDBOX,
+      default: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
     },
   ]);
 };

package/lib/sandboxCreate.js

@@ -1,4 +1,4 @@
-const SpinniesManager = require('./SpinniesManager');
+const SpinniesManager = require('./ui/SpinniesManager');
 const {
   getSandboxLimit,
   getHasSandboxesByType,
@@ -23,10 +23,6 @@ const {
   updateConfigWithAccessToken,
 } = require('@hubspot/local-dev-lib/personalAccessKey');
 const { uiAccountDescription } = require('./ui');
-const {
-  DEVELOPER_SANDBOX_TYPE,
-  STANDARD_SANDBOX_TYPE,
-} = require('./constants');
 const {
   personalAccessKeyPrompt,
 } = require('./prompts/personalAccessKeyPrompt');
@@ -36,6 +32,9 @@ const {
   writeConfig,
   updateAccountConfig,
 } = require('@hubspot/local-dev-lib/config');
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const i18nKey = 'cli.lib.sandbox.create';
 
@@ -113,7 +112,7 @@ const saveSandboxToConfig = async (env, result, force = false) => {
 
 /**
  * @param {String} name - Name of sandbox
- * @param {String} type - Sandbox type to be created (standard/developer)
+ * @param {String} type - Sandbox type to be created (STANDARD_SANDBOX/DEVELOPMENT_SANDBOX)
  * @param {Object} accountConfig - Account config of parent portal
  * @param {String} env - Environment (QA/Prod)
  * @returns {Object} Object containing sandboxConfigName string and sandbox instance from API
@@ -131,7 +130,11 @@ const buildSandbox = async ({
   const accountId = getAccountId(accountConfig.portalId);
 
   let result;
-  const spinniesI18nKey = `${i18nKey}.loading.${type}`;
+  const loadingLangKey =
+    type === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
+      ? 'developer'
+      : 'standard';
+  const spinniesI18nKey = `${i18nKey}.loading.${loadingLangKey}`;
 
   try {
     logger.log('');
@@ -140,7 +143,6 @@ const buildSandbox = async ({
         sandboxName: name,
       }),
     });
-
     const sandboxApiType = sandboxApiTypeMap[type]; // API expects sandbox type as 1 or 2
     result = await createSandbox(accountId, name, sandboxApiType);
 
@@ -219,7 +221,7 @@ const buildSandbox = async ({
       const plural = devSandboxLimit !== 1;
       const hasDevelopmentSandboxes = getHasSandboxesByType(
         accountConfig,
-        DEVELOPER_SANDBOX_TYPE
+        HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
       );
       if (hasDevelopmentSandboxes) {
         logger.error(
@@ -262,7 +264,7 @@ const buildSandbox = async ({
       const plural = standardSandboxLimit !== 1;
       const hasStandardSandboxes = getHasSandboxesByType(
         accountConfig,
-        STANDARD_SANDBOX_TYPE
+        HUBSPOT_ACCOUNT_TYPES.STANDARD_SANDBOX
       );
       if (hasStandardSandboxes) {
         logger.error(

package/lib/sandboxSync.js

@@ -1,12 +1,12 @@
-const SpinniesManager = require('./SpinniesManager');
+const SpinniesManager = require('./ui/SpinniesManager');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { i18n } = require('./lang');
 const {
   getAvailableSyncTypes,
   pollSyncTaskStatus,
-  sandboxTypeMap,
   syncTypes,
+  isDevelopmentSandbox,
 } = require('./sandboxes');
 const { initiateSync } = require('@hubspot/local-dev-lib/sandboxes');
 const {
@@ -20,7 +20,6 @@ const {
 const { getSandboxTypeAsString } = require('./sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('./ui');
-const { DEVELOPER_SANDBOX_TYPE } = require('./constants');
 
 const i18nKey = 'cli.lib.sandbox.sync';
 
@@ -51,7 +50,7 @@ const syncSandbox = async ({
 
   const baseUrl = getHubSpotWebsiteOrigin(env);
   const syncStatusUrl = `${baseUrl}/sandboxes-developer/${parentAccountId}/${getSandboxTypeAsString(
-    accountConfig.sandboxAccountType
+    accountConfig.accountType
   )}`;
 
   try {
@@ -86,11 +85,7 @@ const syncSandbox = async ({
         accountName: uiAccountDescription(accountId),
       }),
     });
-    if (
-      skipPolling &&
-      sandboxTypeMap[accountConfig.sandboxAccountType] ===
-        DEVELOPER_SANDBOX_TYPE
-    ) {
+    if (skipPolling && isDevelopmentSandbox(accountConfig)) {
       if (syncTasks.some(t => t.type === syncTypes.OBJECT_RECORDS)) {
         logger.log(i18n(`${i18nKey}.loading.skipPollingWithContacts`));
       } else {