@hubspot/cli 5.2.1-beta.6 → 5.2.1-beta.8

package/commands/project/migrateApp.js

@@ -0,0 +1,210 @@
+const path = require('path');
+const {
+  addAccountOptions,
+  addConfigOptions,
+  getAccountId,
+  addUseEnvironmentOptions,
+} = require('../../lib/commonOpts');
+const { trackCommandUsage } = require('../../lib/usageTracking');
+const { loadAndValidateOptions } = require('../../lib/validation');
+const {
+  createProjectPrompt,
+} = require('../../lib/prompts/createProjectPrompt');
+const { i18n } = require('../../lib/lang');
+const {
+  fetchPublicAppOptions,
+  selectPublicAppPrompt,
+} = require('../../lib/prompts/selectPublicAppPrompt');
+const { poll } = require('../../lib/polling');
+const {
+  uiBetaTag,
+  uiLine,
+  uiLink,
+  uiCommandReference,
+  uiAccountDescription,
+} = require('../../lib/ui');
+const SpinniesManager = require('../../lib/ui/SpinniesManager');
+const {
+  logApiErrorInstance,
+  ApiErrorContext,
+} = require('../../lib/errorHandlers/apiErrors');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const { promptUser } = require('../../lib/prompts/promptUtils');
+const { isAppDeveloperAccount } = require('../../lib/accountTypes');
+const { ensureProjectExists } = require('../../lib/projects');
+const {
+  migrateApp,
+  checkMigrationStatus,
+} = require('@hubspot/local-dev-lib/api/projects');
+const { getCwd } = require('@hubspot/local-dev-lib/path');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
+const { downloadProject } = require('@hubspot/local-dev-lib/api/projects');
+const { extractZipArchive } = require('@hubspot/local-dev-lib/archive');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
+
+const i18nKey = 'commands.project.subcommands.migrateApp';
+
+exports.command = 'migrate-app';
+exports.describe = null; // uiBetaTag(i18n(`${i18nKey}.describe`), false);
+
+exports.handler = async options => {
+  await loadAndValidateOptions(options);
+
+  const accountId = getAccountId(options);
+  const accountConfig = getAccountConfig(accountId);
+  const accountName = uiAccountDescription(accountId);
+
+  trackCommandUsage('migrate-app', {}, accountId);
+
+  if (!isAppDeveloperAccount(accountConfig)) {
+    logger.error(
+      i18n(`${i18nKey}.errors.invalidAccountType`, {
+        accountName,
+        accountType: accountConfig.accountType,
+        useCommand: uiCommandReference('hs accounts use'),
+        authCommand: uiCommandReference('hs auth'),
+      })
+    );
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  const { appId } =
+    'appId' in options
+      ? options
+      : await selectPublicAppPrompt({
+          accountId,
+          accountName,
+          options,
+          migrateApp: true,
+        });
+
+  const publicApps = await fetchPublicAppOptions(accountId, accountName);
+  if (!publicApps.find(a => a.id === appId)) {
+    logger.error(i18n(`${i18nKey}.errors.invalidAppId`, { appId }));
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  const { name, location } = await createProjectPrompt('', options, true);
+
+  const projectName = options.name || name;
+  const projectLocation = options.location || location;
+
+  const { projectExists } = await ensureProjectExists(accountId, projectName, {
+    allowCreate: false,
+    noLogs: true,
+  });
+
+  if (projectExists) {
+    logger.error(
+      i18n(`${i18nKey}.errors.projectAlreadyExists`, {
+        projectName,
+      })
+    );
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  logger.log('');
+  uiLine();
+  logger.log(uiBetaTag(i18n(`${i18nKey}.warning.title`), false));
+  logger.log(i18n(`${i18nKey}.warning.projectConversion`));
+  logger.log(i18n(`${i18nKey}.warning.appConfig`));
+  logger.log('');
+  logger.log(i18n(`${i18nKey}.warning.buildAndDeploy`));
+  logger.log('');
+  logger.log(i18n(`${i18nKey}.warning.existingApps`));
+  logger.log('');
+  logger.log(i18n(`${i18nKey}.warning.copyApp`));
+  uiLine();
+
+  const { shouldCreateApp } = await promptUser({
+    name: 'shouldCreateApp',
+    type: 'confirm',
+    message: i18n(`${i18nKey}.createAppPrompt`),
+  });
+
+  if (!shouldCreateApp) {
+    process.exit(EXIT_CODES.SUCCESS);
+  }
+
+  try {
+    SpinniesManager.init();
+
+    SpinniesManager.add('migrateApp', {
+      text: i18n(`${i18nKey}.migrationStatus.inProgress`),
+    });
+
+    const migrateResponse = await migrateApp(accountId, appId, projectName);
+    const { id } = migrateResponse;
+    const pollResponse = await poll(checkMigrationStatus, accountId, id);
+    const { status, project } = pollResponse;
+    if (status === 'SUCCESS') {
+      const absoluteDestPath = path.resolve(getCwd(), projectLocation);
+      const { env } = getAccountConfig(accountId);
+      const baseUrl = getHubSpotWebsiteOrigin(env);
+
+      const zippedProject = await downloadProject(accountId, projectName, 1);
+
+      await extractZipArchive(
+        zippedProject,
+        projectName,
+        path.resolve(absoluteDestPath),
+        { includesRootDir: true, hideLogs: true }
+      );
+
+      SpinniesManager.succeed('migrateApp', {
+        text: i18n(`${i18nKey}.migrationStatus.done`),
+        succeedColor: 'white',
+      });
+      logger.log('');
+      uiLine();
+      logger.success(i18n(`${i18nKey}.migrationStatus.success`));
+      logger.log('');
+      logger.log(
+        uiLink(
+          i18n(`${i18nKey}.projectDetailsLink`),
+          `${baseUrl}/developer-projects/${accountId}/project/${project.name}`
+        )
+      );
+      process.exit(EXIT_CODES.SUCCESS);
+    }
+  } catch (error) {
+    SpinniesManager.fail('migrateApp', {
+      text: i18n(`${i18nKey}.migrationStatus.failure`),
+      failColor: 'white',
+    });
+    logApiErrorInstance(
+      error.error || error,
+      new ApiErrorContext({ accountId })
+    );
+
+    process.exit(EXIT_CODES.ERROR);
+  }
+};
+
+exports.builder = yargs => {
+  yargs.options({
+    name: {
+      describe: i18n(`${i18nKey}.options.name.describe`),
+      type: 'string',
+    },
+    location: {
+      describe: i18n(`${i18nKey}.options.location.describe`),
+      type: 'string',
+    },
+    appId: {
+      describe: i18n(`${i18nKey}.options.appId.describe`),
+      type: 'number',
+    },
+  });
+
+  yargs.example([
+    ['$0 project migrate-app', i18n(`${i18nKey}.examples.default`)],
+  ]);
+
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
+
+  return yargs;
+};

package/commands/project/open.js

@@ -66,10 +66,10 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
-  addTestingOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
+  addTestingOptions(yargs);
 
   yargs.options({
     project: {

package/commands/project/upload.js

@@ -6,7 +6,7 @@ const {
 } = require('../../lib/commonOpts');
 const chalk = require('chalk');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { uiBetaTag, uiLine } = require('../../lib/ui');
+const { uiBetaTag, uiCommandReference } = require('../../lib/ui');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const {
@@ -82,7 +82,6 @@ exports.handler = async options => {
       process.exit(EXIT_CODES.ERROR);
     }
     if (result.succeeded && !result.buildResult.isAutoDeployEnabled) {
-      uiLine();
       logger.log(
         chalk.bold(
           i18n(`${i18nKey}.logs.buildSucceeded`, {
@@ -90,7 +89,13 @@ exports.handler = async options => {
           })
         )
       );
-      uiLine();
+      logger.log(
+        i18n(`${i18nKey}.logs.autoDeployDisabled`, {
+          deployCommand: uiCommandReference(
+            `hs project deploy --buildId=${result.buildId}`
+          ),
+        })
+      );
       logFeedbackMessage(result.buildId);
 
       await displayWarnLogs(accountId, projectConfig.name, result.buildId);
@@ -126,9 +131,9 @@ exports.builder = yargs => {
     ['$0 project upload myProjectFolder', i18n(`${i18nKey}.examples.default`)],
   ]);
 
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
 
   return yargs;
 };

package/commands/project/watch.js

@@ -179,9 +179,9 @@ exports.builder = yargs => {
     ['$0 project watch myProjectFolder', i18n(`${i18nKey}.examples.default`)],
   ]);
 
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
 
   return yargs;
 };

package/commands/project.js

@@ -11,6 +11,7 @@ const download = require('./project/download');
 const open = require('./project/open');
 const dev = require('./project/dev');
 const add = require('./project/add');
+const migrateApp = require('./project/migrateApp');
 
 const i18nKey = 'commands.project';
 
@@ -18,8 +19,8 @@ exports.command = 'project';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
 
   // TODO: deploy must be updated
   yargs.command(create).demandCommand(0, '');
@@ -32,6 +33,7 @@ exports.builder = yargs => {
   yargs.command(listBuilds).demandCommand(0, '');
   yargs.command(download).demandCommand(0, '');
   yargs.command(open).demandCommand(0, '');
+  yargs.command(migrateApp).demandCommand(0, '');
 
   return yargs;
 };

package/commands/remove.js

@@ -47,9 +47,9 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
   yargs.positional('path', {
     describe: i18n(`${i18nKey}.positionals.path.describe`),
     type: 'string',

package/commands/sandbox/create.js

@@ -9,7 +9,6 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
-const { buildSandbox } = require('../../lib/sandboxCreate');
 const { uiFeatureHighlight, uiAccountDescription } = require('../../lib/ui');
 const {
   sandboxTypeMap,
@@ -38,6 +37,7 @@ const {
   HUBSPOT_ACCOUNT_TYPES,
   HUBSPOT_ACCOUNT_TYPE_STRINGS,
 } = require('@hubspot/local-dev-lib/constants/config');
+const { buildNewAccount } = require('../../lib/buildAccount');
 
 const i18nKey = 'commands.sandbox.subcommands.create';
 
@@ -155,9 +155,9 @@ exports.handler = async options => {
   }
 
   try {
-    const { result } = await buildSandbox({
+    const { result } = await buildNewAccount({
       name: sandboxName,
-      type: sandboxType,
+      accountType: sandboxType,
       accountConfig,
       env,
       force,
@@ -238,10 +238,10 @@ exports.builder = yargs => {
     ],
   ]);
 
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
-  addTestingOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
+  addTestingOptions(yargs);
 
   return yargs;
 };

package/commands/sandbox/delete.js

@@ -242,10 +242,10 @@ exports.builder = yargs => {
     ],
   ]);
 
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
-  addTestingOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
+  addTestingOptions(yargs);
 
   return yargs;
 };

package/commands/sandbox/sync.js

@@ -206,10 +206,10 @@ exports.builder = yargs => {
 
   yargs.example([['$0 sandbox sync', i18n(`${i18nKey}.examples.default`)]]);
 
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
-  addTestingOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
+  addTestingOptions(yargs);
 
   return yargs;
 };

package/commands/sandbox.js

@@ -10,8 +10,8 @@ exports.command = 'sandbox';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
 
   yargs
     .command(create)

package/commands/secrets/addSecret.js

@@ -58,9 +58,9 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
   yargs.positional('name', {
     describe: i18n(`${i18nKey}.positionals.name.describe`),
     type: 'string',

package/commands/secrets/deleteSecret.js

@@ -55,9 +55,9 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
   yargs.positional('name', {
     describe: i18n(`${i18nKey}.positionals.name.describe`),
     type: 'string',

package/commands/secrets/listSecrets.js

@@ -49,8 +49,8 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
   return yargs;
 };

package/commands/secrets/updateSecret.js

@@ -59,9 +59,9 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
   yargs.positional('name', {
     describe: i18n(`${i18nKey}.positionals.name.describe`),
     type: 'string',

package/commands/secrets.js

@@ -12,8 +12,8 @@ exports.command = 'secrets';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
   yargs
     .command(listSecretsCommand)
     .command(addSecretCommand)

package/commands/theme/marketplace-validate.js

@@ -55,9 +55,9 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
 
   yargs.positional('src', {
     describe: i18n(`${i18nKey}.positionals.src.describe`),

package/commands/theme/preview.js

@@ -33,7 +33,8 @@ const {
   COMPONENT_TYPES,
 } = require('../../lib/projectStructure');
 
-const i18nKey = 'commands.preview';
+const i18nKey = 'commands.theme.subcommands.preview';
+
 exports.command = 'preview [--src] [--dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
@@ -187,8 +188,8 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
 
   yargs.option('src', {
     describe: i18n(`${i18nKey}.options.src.describe`),

package/commands/upload.js

@@ -279,10 +279,10 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addModeOptions(yargs, { write: true }, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addModeOptions(yargs, { write: true });
+  addUseEnvironmentOptions(yargs);
 
   yargs.positional('src', {
     describe: i18n(`${i18nKey}.positionals.src.describe`),

package/commands/watch.js

@@ -18,8 +18,13 @@ const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
 const { getUploadableFileList } = require('../lib/upload');
-
+const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
+const {
+  logApiUploadErrorInstance,
+  ApiErrorContext,
+} = require('../lib/errorHandlers/apiErrors');
 const i18nKey = 'commands.watch';
+
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 exports.command = 'watch [--src] [--dest]';
@@ -71,12 +76,9 @@ exports.handler = async options => {
 
   if (disableInitial) {
     logger.info(i18n(`${i18nKey}.warnings.disableInitial`));
-  } else {
+  } else if (!initialUpload) {
     logger.info(i18n(`${i18nKey}.warnings.notUploaded`, { path: src }));
-
-    if (!initialUpload) {
-      logger.info(i18n(`${i18nKey}.warnings.initialUpload`));
-    }
+    logger.info(i18n(`${i18nKey}.warnings.initialUpload`));
   }
 
   if (initialUpload) {
@@ -87,21 +89,62 @@ exports.handler = async options => {
   }
 
   trackCommandUsage('watch', { mode }, accountId);
-  watch(accountId, absoluteSrcPath, dest, {
-    mode,
-    remove,
-    disableInitial: initialUpload ? false : true,
-    notify,
-    commandOptions: options,
-    filePaths: filesToUpload,
-  });
+
+  const postInitialUploadCallback = null;
+  const onUploadFolderError = error => {
+    logger.error(
+      i18n(`${i18nKey}.errors.folderFailed`, {
+        src,
+        dest,
+        accountId,
+      })
+    );
+    logErrorInstance(error, {
+      accountId,
+    });
+  };
+  const onQueueAddError = null;
+  const onUploadFileError = (file, dest, accountId) => error => {
+    logger.error(
+      i18n(`${i18nKey}.errors.fileFailed`, {
+        file,
+        dest,
+        accountId,
+      })
+    );
+    logApiUploadErrorInstance(
+      error,
+      new ApiErrorContext({
+        accountId,
+        request: dest,
+        payload: file,
+      })
+    );
+  };
+  watch(
+    accountId,
+    absoluteSrcPath,
+    dest,
+    {
+      mode,
+      remove,
+      disableInitial: initialUpload ? false : true,
+      notify,
+      commandOptions: options,
+      filePaths: filesToUpload,
+    },
+    postInitialUploadCallback,
+    onUploadFolderError,
+    onQueueAddError,
+    onUploadFileError
+  );
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addModeOptions(yargs, { write: true }, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addModeOptions(yargs, { write: true });
+  addUseEnvironmentOptions(yargs);
 
   yargs.positional('src', {
     describe: i18n(`${i18nKey}.positionals.src.describe`),

package/jest.config.js

@@ -1,3 +1,4 @@
 module.exports = {
   testPathIgnorePatterns: ['commands/functions/test.js'],
+  clearMocks: true,
 };