@hubspot/cli 5.1.4-beta.1 → 5.1.4-beta.3

package/commands/project/dev.js

@@ -12,7 +12,7 @@ const {
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { handleExit } = require('../../lib/process');
 const { i18n } = require('../../lib/lang');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   getConfigAccounts,
   getAccountConfig,
@@ -69,11 +69,11 @@ const {
   isMissingScopeError,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
+const { isDeveloperTestAccount } = require('../../lib/developerTestAccounts');
 const {
-  isDeveloperTestAccount,
-  DEV_TEST_ACCOUNT_STRING,
-} = require('../../lib/developerTestAccounts');
-const { DEVELOPER_SANDBOX_TYPE } = require('../../lib/constants');
+  HUBSPOT_ACCOUNT_TYPES,
+  HUBSPOT_ACCOUNT_TYPE_STRINGS,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const i18nKey = 'cli.commands.project.subcommands.dev';
 
@@ -116,7 +116,7 @@ exports.handler = async options => {
       accountConfig.name,
       defaultAccountIsSandbox
         ? `${getSandboxTypeAsString(accountConfig.accountType)} sandbox`
-        : DEV_TEST_ACCOUNT_STRING
+        : HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
     );
 
     if (useDefaultAccount) {
@@ -152,7 +152,7 @@ exports.handler = async options => {
     try {
       await validateSandboxUsageLimits(
         accountConfig,
-        DEVELOPER_SANDBOX_TYPE,
+        HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
         env
       );
     } catch (err) {
@@ -176,7 +176,9 @@ exports.handler = async options => {
       process.exit(EXIT_CODES.ERROR);
     }
     try {
-      const { name } = await sandboxNamePrompt(DEVELOPER_SANDBOX_TYPE);
+      const { name } = await sandboxNamePrompt(
+        HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
+      );
 
       trackCommandMetadataUsage(
         'sandbox-create',
@@ -186,7 +188,7 @@ exports.handler = async options => {
 
       const { result } = await buildSandbox({
         name,
-        type: DEVELOPER_SANDBOX_TYPE,
+        type: HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX,
         accountConfig,
         env,
       });

package/commands/project/download.js

@@ -11,7 +11,7 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { extractZipArchive } = require('@hubspot/local-dev-lib/archive');
 const {
   downloadProject,

package/commands/project/listBuilds.js

@@ -12,7 +12,7 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   fetchProject,
   fetchProjectBuilds,

package/commands/project/logs.js

@@ -8,7 +8,7 @@ const {
   addUseEnvironmentOptions,
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 // const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
 const {
   fetchProject,

package/commands/project/open.js

@@ -9,7 +9,7 @@ const {
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   getProjectConfig,
   getProjectDetailUrl,

package/commands/project/upload.js

@@ -5,7 +5,7 @@ const {
   addUseEnvironmentOptions,
 } = require('../../lib/commonOpts');
 const chalk = require('chalk');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { uiBetaTag, uiLine } = require('../../lib/ui');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
@@ -39,9 +39,9 @@ exports.handler = async options => {
   const { forceCreate, path: projectPath, message } = options;
   const accountId = getAccountId(options);
   const accountConfig = getAccountConfig(accountId);
-  const sandboxType = accountConfig && accountConfig.sandboxAccountType;
+  const accountType = accountConfig && accountConfig.accountType;
 
-  trackCommandUsage('project-upload', { type: sandboxType }, accountId);
+  trackCommandUsage('project-upload', { type: accountType }, accountId);
 
   const { projectConfig, projectDir } = await getProjectConfig(projectPath);
 

package/commands/project/watch.js

@@ -4,7 +4,7 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
 const {
   addAccountOptions,

package/commands/remove.js

@@ -1,5 +1,5 @@
 const { deleteFile } = require('@hubspot/local-dev-lib/api/fileMapper');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   logApiErrorInstance,
   ApiErrorContext,

package/commands/sandbox/create.js

@@ -13,13 +13,12 @@ const { buildSandbox } = require('../../lib/sandboxCreate');
 const { uiFeatureHighlight, uiAccountDescription } = require('../../lib/ui');
 const {
   sandboxTypeMap,
-  getSandboxTypeAsString,
   getAvailableSyncTypes,
   syncTypes,
   validateSandboxUsageLimits,
 } = require('../../lib/sandboxes');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   trackCommandUsage,
   trackCommandMetadataUsage,
@@ -35,7 +34,10 @@ const {
   isMissingScopeError,
 } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { DEVELOPER_SANDBOX_TYPE } = require('../../lib/constants');
+const {
+  HUBSPOT_ACCOUNT_TYPES,
+  HUBSPOT_ACCOUNT_TYPE_STRINGS,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.create';
 
@@ -54,13 +56,16 @@ exports.handler = async options => {
 
   // Default account is not a production portal
   if (
-    accountConfig.sandboxAccountType &&
-    accountConfig.sandboxAccountType !== null
+    accountConfig.accountType &&
+    accountConfig.accountType !== HUBSPOT_ACCOUNT_TYPES.STANDARD
   ) {
     logger.error(
-      i18n(`${i18nKey}.failure.creatingWithinSandbox`, {
-        sandboxType: getSandboxTypeAsString(accountConfig.sandboxAccountType),
-        sandboxName: accountConfig.name,
+      i18n(`${i18nKey}.failure.invalidAccountType`, {
+        accountType:
+          HUBSPOT_ACCOUNT_TYPE_STRINGS[
+            HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]
+          ],
+        accountName: accountConfig.name,
       })
     );
     process.exit(EXIT_CODES.ERROR);
@@ -69,7 +74,7 @@ exports.handler = async options => {
   let typePrompt;
   let namePrompt;
 
-  if ((type && !sandboxTypeMap[type]) || !type) {
+  if ((type && !sandboxTypeMap[type.toLowerCase()]) || !type) {
     if (!force) {
       typePrompt = await sandboxTypePrompt();
     } else {
@@ -77,7 +82,9 @@ exports.handler = async options => {
       process.exit(EXIT_CODES.ERROR);
     }
   }
-  const sandboxType = sandboxTypeMap[type] || sandboxTypeMap[typePrompt.type];
+  const sandboxType = type
+    ? sandboxTypeMap[type.toLowerCase()]
+    : typePrompt.type;
 
   // Check usage limits and exit if parent portal has no available sandboxes for the selected type
   try {
@@ -117,11 +124,15 @@ exports.handler = async options => {
   let contactRecordsSyncPromptResult = true;
   if (!force) {
     const syncI18nKey = 'cli.lib.sandbox.sync';
+    const sandboxLangKey =
+      sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
+        ? 'developer'
+        : 'standard';
     const { sandboxSyncPrompt } = await promptUser([
       {
         name: 'sandboxSyncPrompt',
         type: 'confirm',
-        message: i18n(`${syncI18nKey}.confirm.createFlow.${sandboxType}`, {
+        message: i18n(`${syncI18nKey}.confirm.createFlow.${sandboxLangKey}`, {
           parentAccountName: uiAccountDescription(accountId),
           sandboxName,
         }),
@@ -135,7 +146,7 @@ exports.handler = async options => {
           name: 'contactRecordsSyncPrompt',
           type: 'confirm',
           message: i18n(
-            `${syncI18nKey}.confirm.syncContactRecords.${sandboxType}`
+            `${syncI18nKey}.confirm.syncContactRecords.${sandboxLangKey}`
           ),
         },
       ]);
@@ -191,7 +202,7 @@ exports.handler = async options => {
     }
 
     const highlightItems = ['accountsUseCommand', 'projectCreateCommand'];
-    if (sandboxType === DEVELOPER_SANDBOX_TYPE) {
+    if (sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
       highlightItems.push('projectDevCommand');
     } else {
       highlightItems.push('projectUploadCommand');

package/commands/sandbox/delete.js

@@ -5,7 +5,7 @@ const {
   getAccountId,
   addTestingOptions,
 } = require('../../lib/commonOpts');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const {

package/commands/sandbox/sync.js

@@ -6,7 +6,7 @@ const {
   addTestingOptions,
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
@@ -15,18 +15,20 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { uiLine, uiAccountDescription } = require('../../lib/ui');
 const {
-  sandboxTypeMap,
   getAvailableSyncTypes,
   getSyncTypesWithContactRecordsPrompt,
+  isDevelopmentSandbox,
+  isStandardSandbox,
+  isSandbox,
 } = require('../../lib/sandboxes');
 const { syncSandbox } = require('../../lib/sandboxSync');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/apiErrors');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 const {
-  DEVELOPER_SANDBOX_TYPE,
-  STANDARD_SANDBOX_TYPE,
-} = require('../../lib/constants');
+  HUBSPOT_ACCOUNT_TYPE_STRINGS,
+  HUBSPOT_ACCOUNT_TYPES,
+} = require('@hubspot/local-dev-lib/constants/config');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.sync';
 
@@ -43,17 +45,22 @@ exports.handler = async options => {
 
   trackCommandUsage(
     'sandbox-sync',
-    { type: accountConfig.sandboxAccountType },
+    { type: accountConfig.accountType },
     accountId
   );
 
   if (
     // Check if default account is a sandbox, otherwise exit
-    // sandboxAccountType is null for non-sandbox portals, and one of 'DEVELOPER' or 'STANDARD' for sandbox portals. Undefined is to handle older config entries.
-    accountConfig.sandboxAccountType === undefined ||
-    accountConfig.sandboxAccountType === null
+    !isSandbox(accountConfig)
   ) {
-    logger.error(i18n(`${i18nKey}.failure.notSandbox`));
+    logger.error(
+      i18n(`${i18nKey}.failure.invalidAccountType`, {
+        accountType:
+          HUBSPOT_ACCOUNT_TYPE_STRINGS[
+            HUBSPOT_ACCOUNT_TYPES[accountConfig.accountType]
+          ],
+      })
+    );
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -70,10 +77,6 @@ exports.handler = async options => {
   }
 
   const parentAccountConfig = getAccountConfig(parentAccountId);
-  const isDevelopmentSandbox =
-    sandboxTypeMap[accountConfig.sandboxAccountType] === DEVELOPER_SANDBOX_TYPE;
-  const isStandardSandbox =
-    sandboxTypeMap[accountConfig.sandboxAccountType] === STANDARD_SANDBOX_TYPE;
 
   let availableSyncTasks;
   try {
@@ -100,7 +103,7 @@ exports.handler = async options => {
     process.exit(EXIT_CODES.ERROR);
   }
 
-  if (isDevelopmentSandbox) {
+  if (isDevelopmentSandbox(accountConfig)) {
     logger.log(i18n(`${i18nKey}.info.developmentSandbox`));
     logger.log(
       i18n(`${i18nKey}.info.sync`, {
@@ -129,7 +132,7 @@ exports.handler = async options => {
         process.exit(EXIT_CODES.SUCCESS);
       }
     }
-  } else if (isStandardSandbox) {
+  } else if (isStandardSandbox(accountConfig)) {
     const standardSyncUrl = `${getHubSpotWebsiteOrigin(
       env
     )}/sandboxes-developer/${parentAccountId}/sync?step=select_sync_path&id=${parentAccountId}_${accountId}`;

package/commands/secrets/addSecret.js

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

package/commands/secrets/deleteSecret.js

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

package/commands/secrets/listSecrets.js

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

package/commands/secrets/updateSecret.js

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

package/commands/theme/generate-selectors.js

@@ -1,6 +1,6 @@
 const fs = require('fs');
 const { i18n } = require('../../lib/lang');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   findFieldsJsonPath,
   combineThemeCss,

package/commands/theme/preview.js

@@ -0,0 +1,175 @@
+const fs = require('fs');
+const path = require('path');
+const { i18n } = require('../../lib/lang');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const {
+  addAccountOptions,
+  addConfigOptions,
+  getAccountId,
+} = require('../../lib/commonOpts');
+const { getCwd } = require('@hubspot/local-dev-lib/path');
+const { preview } = require('@hubspot/theme-preview-dev-server');
+const { getUploadableFileList } = require('../../lib/upload');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const { loadAndValidateOptions } = require('../../lib/validation');
+const { previewPrompt } = require('../../lib/prompts/previewPrompt');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const { FileUploadResultType } = require('@hubspot/cli-lib/lib/uploadFolder');
+const i18nKey = 'cli.commands.preview';
+const cliProgress = require('cli-progress');
+const {
+  ApiErrorContext,
+  logApiUploadErrorInstance,
+} = require('../../lib/errorHandlers/apiErrors');
+
+const validateSrcPath = src => {
+  const logInvalidPath = () => {
+    logger.error(
+      i18n(`${i18nKey}.errors.invalidPath`, {
+        path: src,
+      })
+    );
+  };
+  try {
+    const stats = fs.statSync(src);
+    if (!stats.isDirectory()) {
+      logInvalidPath();
+      return false;
+    }
+  } catch (e) {
+    logInvalidPath();
+    return false;
+  }
+  return true;
+};
+
+exports.command = 'preview [--src] [--dest]';
+exports.describe = false; // i18n(`${i18nKey}.describe`) - Hiding command
+
+exports.handler = async options => {
+  const { notify, skipUpload, noSsl, port, debug } = options;
+
+  await loadAndValidateOptions(options);
+
+  const accountId = getAccountId(options);
+
+  const previewPromptAnswers = await previewPrompt(options);
+  const src = options.src || previewPromptAnswers.src;
+  let dest = options.dest || previewPromptAnswers.dest;
+  if (!dest) {
+    logger.error(i18n(`${i18nKey}.errors.destinationRequired`));
+    return;
+  }
+
+  const absoluteSrc = path.resolve(getCwd(), src);
+  if (!validateSrcPath(absoluteSrc)) {
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  const filePaths = await getUploadableFileList(absoluteSrc, false);
+
+  const initialUploadProgressBar = new cliProgress.SingleBar(
+    {
+      gracefulExit: true,
+      format: '[{bar}] {percentage}% | {value}/{total} | {label}',
+      hideCursor: true,
+    },
+    cliProgress.Presets.rect
+  );
+  initialUploadProgressBar.start(filePaths.length, 0, {
+    label: i18n(`${i18nKey}.initialUploadProgressBar.start`),
+  });
+  let uploadsHaveStarted = false;
+  const uploadOptions = {
+    onAttemptCallback: () => {
+      /* Intentionally blank */
+    },
+    onSuccessCallback: () => {
+      initialUploadProgressBar.increment();
+      if (!uploadsHaveStarted) {
+        uploadsHaveStarted = true;
+        initialUploadProgressBar.update(0, {
+          label: i18n(`${i18nKey}.initialUploadProgressBar.uploading`),
+        });
+      }
+    },
+    onFirstErrorCallback: () => {
+      /* Intentionally blank */
+    },
+    onRetryCallback: () => {
+      /* Intentionally blank */
+    },
+    onFinalErrorCallback: () => initialUploadProgressBar.increment(),
+    onFinishCallback: results => {
+      initialUploadProgressBar.update(filePaths.length, {
+        label: i18n(`${i18nKey}.initialUploadProgressBar.finish`),
+      });
+      initialUploadProgressBar.stop();
+      results.forEach(result => {
+        if (result.resultType == FileUploadResultType.FAILURE) {
+          logger.error('Uploading file "%s" to "%s" failed', result.file, dest);
+          logApiUploadErrorInstance(
+            result.error,
+            new ApiErrorContext({
+              accountId,
+              request: dest,
+              payload: result.file,
+            })
+          );
+        }
+      });
+    },
+  };
+
+  trackCommandUsage('preview', accountId);
+
+  preview(accountId, absoluteSrc, dest, {
+    notify,
+    filePaths,
+    skipUpload,
+    noSsl,
+    port,
+    debug,
+    uploadOptions,
+  });
+};
+
+exports.builder = yargs => {
+  addConfigOptions(yargs, true);
+  addAccountOptions(yargs, true);
+
+  yargs.option('src', {
+    describe: i18n(`${i18nKey}.options.src.describe`),
+    type: 'string',
+    requiresArg: true,
+  });
+  yargs.option('dest', {
+    describe: i18n(`${i18nKey}.options.dest.describe`),
+    type: 'string',
+    requiresArg: true,
+  });
+  yargs.option('notify', {
+    alias: 'n',
+    describe: i18n(`${i18nKey}.options.notify.describe`),
+    type: 'string',
+    requiresArg: true,
+  });
+  yargs.option('no-ssl', {
+    describe: i18n(`${i18nKey}.options.noSsl.describe`),
+    type: 'boolean',
+  });
+  yargs.option('port', {
+    describe: i18n(`${i18nKey}.options.port.describe`),
+    type: 'number',
+  });
+  yargs.option('debug', {
+    describe: false,
+    type: 'boolean',
+  });
+  yargs.option('skipUpload', {
+    alias: 'skip',
+    describe: false,
+    type: 'boolean',
+  });
+  return yargs;
+};

package/commands/theme.js

@@ -1,5 +1,6 @@
 const marketplaceValidate = require('./theme/marketplace-validate');
 const generateSelectors = require('./theme/generate-selectors');
+const previewCommand = require('./theme/preview');
 
 const { i18n } = require('../lib/lang');
 
@@ -10,6 +11,7 @@ exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
   yargs
+    .command(previewCommand)
     .command(marketplaceValidate)
     .command(generateSelectors)
     .demandCommand(1, '');

package/commands/upload.js

@@ -10,7 +10,7 @@ const {
   convertToUnixPath,
   isAllowedExtension,
 } = require('@hubspot/local-dev-lib/path');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   ApiErrorContext,
   logApiUploadErrorInstance,

package/commands/watch.js

@@ -3,7 +3,7 @@ const path = require('path');
 
 const { watch } = require('@hubspot/cli-lib');
 const { getCwd } = require('@hubspot/local-dev-lib/path');
-const { logger } = require('@hubspot/cli-lib/logger');
+const { logger } = require('@hubspot/local-dev-lib/logger');
 
 const {
   addConfigOptions,