@hubspot/cli 5.2.1-beta.5 → 5.2.1-beta.7

package/bin/hs

@@ -1,3 +1,3 @@
-#!/usr/bin/env node
+#!/usr/bin/env node --no-deprecation
 
 require('./cli');

package/commands/accounts/list.js

@@ -9,12 +9,7 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { getSandboxName } = require('../../lib/sandboxes');
-const {
-  isSandbox,
-  isDeveloperTestAccount,
-  isAppDeveloperAccount,
-} = require('../../lib/accountTypes');
+const { isSandbox, isDeveloperTestAccount } = require('../../lib/accountTypes');
 
 const { i18n } = require('../../lib/lang');
 const {
@@ -63,23 +58,17 @@ const getPortalData = mappedPortalData => {
       p => p.portalId === parseInt(key, 10)
     )[0];
     set.forEach(portal => {
-      let name = portal.name;
+      let name = `${portal.name} [${
+        HUBSPOT_ACCOUNT_TYPE_STRINGS[portal.accountType]
+      }]`;
       if (isSandbox(portal)) {
-        name = `${portal.name} ${getSandboxName(portal)}`;
         if (hasParentPortal && set.length > 1) {
           name = `↳ ${name}`;
         }
       } else if (isDeveloperTestAccount(portal)) {
-        name = `${portal.name} [${
-          HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
-        }]`;
         if (hasParentPortal && set.length > 1) {
           name = `↳ ${name}`;
         }
-      } else if (isAppDeveloperAccount(portal)) {
-        name = `${portal.name} [${
-          HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER]
-        }]`;
       }
       portalData.push([name, portal.portalId, portal.authType]);
     });

package/commands/functions/deploy.js

@@ -10,7 +10,8 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('../../lib/errorHandlers/apiErrors');
-const { POLLING_DELAY } = require('../../lib/constants');
+
+const { poll } = require('../../lib/polling');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
   buildPackage,
@@ -22,23 +23,6 @@ const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'commands.functions.subcommands.deploy';
 
-const pollBuildStatus = (accountId, buildId) => {
-  return new Promise((resolve, reject) => {
-    const pollInterval = setInterval(async () => {
-      const pollResp = await getBuildStatus(accountId, buildId);
-      const { status } = pollResp;
-
-      if (status === 'SUCCESS') {
-        clearInterval(pollInterval);
-        resolve(pollResp);
-      } else if (status === 'ERROR') {
-        clearInterval(pollInterval);
-        reject(pollResp);
-      }
-    }, POLLING_DELAY);
-  });
-};
-
 exports.command = 'deploy <path>';
 exports.describe = false;
 
@@ -78,7 +62,7 @@ exports.handler = async options => {
       })
     ).start();
     const buildId = await buildPackage(accountId, functionPath);
-    const successResp = await pollBuildStatus(accountId, buildId);
+    const successResp = await poll(getBuildStatus, accountId, buildId);
     const buildTimeSeconds = (successResp.buildTime / 1000).toFixed(2);
     spinner.stop();
     await outputBuildLog(successResp.cdnUrl);

package/commands/project/migrateApp.js

@@ -0,0 +1,206 @@
+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 (e) {
+    SpinniesManager.fail('migrateApp', {
+      text: i18n(`${i18nKey}.migrationStatus.failure`),
+      failColor: 'white',
+    });
+    logApiErrorInstance(e.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, true);
+  addAccountOptions(yargs, true);
+  addUseEnvironmentOptions(yargs, true);
+
+  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';
 
@@ -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/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`);
 

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]';
@@ -87,14 +92,55 @@ 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 => {

package/lang/en.lyaml

@@ -496,6 +496,37 @@ en:
               describe: "The starting template"
             templateSource:
               describe: "Path to custom GitHub repository from which to create project template"
+        migrateApp:
+          describe: "Migrate a public app to the projects framework"
+          examples:
+            default: "Migrate a public app to the projects framework"
+          options:
+            appId:
+              describe: "The ID for the public app being migrated to the projects framework"
+            location:
+              describe: "Directory where project should be created"
+            name:
+              describe: "Project name (cannot be changed)"
+          migrationStatus:
+            inProgress: "Converting app configuration to {{#bold}}public-app.json{{/bold}} component definition ..."
+            success: "{{#bold}}Your app was converted and build #1 is deployed{{/bold}}"
+            done: "Converting app configuration to public-app.json component definition ... DONE"
+            failure: "Converting app configuration to public-app.json component definition ... FAILED"
+          warning:
+            title: "{{#bold}}Migrate an app to the projects framework?{{/bold}}"
+            projectConversion: "{{#bold}}The selected app will be permanently converted to a project component.{{/bold}}"
+            appConfig: "All supported app configuration will be moved to the {{#bold}}public-app.json{{/bold}} component definition file. Future updates to those features must be made through the project build and deploy pipeline, not the developer account UI."
+            buildAndDeploy: "This will create a new project with a single app component and immediately build and deploy it to your developer account (build #1)."
+            existingApps: "{{#bold}}This will not affect existing app users or installs.{{/bold}}"
+            copyApp: "We strongly recommend making a copy of your app to test this process in a development app before replacing production."
+          createAppPrompt: "Proceed with migrating this app to a project component?"
+          projectDetailsLink: "View project details in your developer account"
+          errors:
+            invalidAccountType: "Public apps must be migrated within an app developer account. Your current account {{#bold}}{{ accountName }}{{/bold}} is a {{ accountType }}.
+              \n- Run {{ useCommand }} to switch your default account to an app developer account.
+              \n- Run {{ authCommand }} to connect an app developer account to the HubSpot CLI.\n"
+            projectAlreadyExists: "A project with name {{ projectName }} already exists. Please choose another name."
+            invalidAppId: "[--appId] Could not find appId {{ appId }}. Please choose another public app."
         add:
           describe: "Create a new component within a project"
           options:
@@ -795,6 +826,28 @@ en:
           positionals:
             src:
               describe: "Path to the theme within the Design Manager."
+        preview:
+          describe: "Upload and watch a theme directory on your computer for changes and start a local development server to preview theme changes on a site"
+          errors:
+            invalidPath: "The path \"{{ path }}\" is not a path to a directory"
+            noThemeComponents: "Your project has no theme components available to preview."
+          options:
+            src:
+              describe: "Path to the local directory your theme is in, relative to your current working directory"
+            dest:
+              describe: "Path in HubSpot Design Tools. Can be a net new path. If you wish to preview a site page using your theme changes it must match the path of the theme used by the site."
+            notify:
+              describe: "Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file"
+            noSsl:
+              describe: "Disable HTTPS"
+            port:
+              describe: "The port on which to start the local server"
+          initialUploadProgressBar:
+            start: "Starting..."
+            uploading: "Uploading..."
+            finish: "Complete!"
+          logs:
+            processExited: "Stopping dev server..."
     module:
       describe: "Commands for working with modules, including marketplace validation with the marketplace-validate subcommand."
       subcommands:
@@ -852,6 +905,8 @@ en:
     watch:
       describe: "Watch a directory on your computer for changes and upload the changed files to the HubSpot CMS."
       errors:
+        folderFailed: "Initial uploading of folder \"{{ src }}\" to \"{{ dest }}\" in account {{ accountId }} had failures"
+        fileFailed: "Upload of file \"{{ file }}\" to \"{{ dest }}\" in account {{ accountId }} failed"
         destinationRequired: "A destination directory needs to be passed"
         invalidPath: "The \"{{ path }}\" is not a path to a directory"
       options:
@@ -878,28 +933,6 @@ en:
         disableInitial: "Passing the \"--disable-initial\" option is no longer necessary. Running \"hs watch\" no longer uploads the watched directory by default."
         initialUpload: "To upload the directory run \"hs upload\" beforehand or add the \"--initial-upload\" option when running \"hs watch\"."
         notUploaded: "The \"hs watch\" command no longer uploads the watched directory when started. The directory \"{{ path }}\" was not uploaded."
-    preview:
-      describe: "Upload and watch a theme directory on your computer for changes and start a local development server to preview theme changes on a site"
-      errors:
-        invalidPath: "The path \"{{ path }}\" is not a path to a directory"
-        noThemeComponents: "Your project has no theme components available to preview."
-      options:
-        src:
-          describe: "Path to the local directory your theme is in, relative to your current working directory"
-        dest:
-          describe: "Path in HubSpot Design Tools. Can be a net new path. If you wish to preview a site page using your theme changes it must match the path of the theme used by the site."
-        notify:
-          describe: "Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file"
-        noSsl:
-          describe: "Disable HTTPS"
-        port:
-          describe: "The port on which to start the local server"
-      initialUploadProgressBar:
-        start: "Starting..."
-        uploading: "Uploading..."
-        finish: "Complete!"
-      logs:
-        processExited: "Stopping dev server..."
     convertFields:
       describe: "Converts a specific JavaScript fields file of a module or theme to JSON"
       positionals:
@@ -962,7 +995,7 @@ en:
       createNewProjectForLocalDev:
         projectMustExistExplanation: "The project {{ projectName }} does not exist in the target account {{ accountIdentifier}}. This command requires the project to exist in the target account."
         publicAppProjectMustExistExplanation: "The project {{ projectName }} does not exist in {{ accountIdentifier}}, the app developer account associated with your target account. This command requires the project to exist in this app developer account."
-        createProject: "Create new project {{ projectName}} in {{#bold}}[{{ accountIdentifier }}]{{/bold}}?"
+        createProject: "Create new project {{ projectName}} in {{ accountIdentifier }}?"
         choseNotToCreateProject: "Exiting because this command requires the project to exist in the target account."
         creatingProject: "Creating project {{ projectName }} in {{ accountIdentifier }}"
         createdProject: "Created project {{ projectName }} in {{ accountIdentifier }}"
@@ -1171,6 +1204,14 @@ en:
           invalidTemplate: "[--template] Could not find template {{ template }}. Please choose an available template."
           noProjectsInConfig: "Please ensure that there is a config.json file that contains a \"projects\" field."
           missingPropertiesInConfig: "Please ensure that each of the projects in your config.json file contain the following properties: [\"name\", \"label\", \"path\", \"insertPath\"]."
+      selectPublicAppPrompt:
+        selectAppIdMigrate: "[--appId] Choose an app under {{ accountName }} to migrate:"
+        selectAppIdClone: "[--appId] Choose an app under {{ accountName }} to clone:"
+        errors:
+          noApps: "{{#bold}}No apps to migrate{{/bold}}"
+          noAppsMessage: "The selected developer account {{#bold}}{{ accountName }}{{/bold}} doesn't have any apps that can be migrated to the projects framework."
+          errorFetchingApps: "There was an error fetching public apps."
+          invalidAppId: "[--appId] Could not find appId {{ appId }}. Please choose another public app."
       developerTestAccountPrompt:
         name:
           message: "Name your developer test account"

package/lib/constants.js

@@ -22,6 +22,12 @@ const CONFIG_FLAGS = {
 
 const POLLING_DELAY = 2000;
 
+const POLLING_STATUS = {
+  SUCCESS: 'SUCCESS',
+  ERROR: 'ERROR',
+  FAILURE: 'FAILURE',
+};
+
 const PROJECT_CONFIG_FILE = 'hsproject.json';
 const PROJECT_BUILD_STATES = {
   BUILDING: 'BUILDING',
@@ -54,6 +60,8 @@ const PROJECT_ERROR_TYPES = {
   PROJECT_LOCKED: 'BuildPipelineErrorType.PROJECT_LOCKED',
   MISSING_PROJECT_PROVISION: 'BuildPipelineErrorType.MISSING_PROJECT_PROVISION',
   BUILD_NOT_IN_PROGRESS: 'BuildPipelineErrorType.BUILD_NOT_IN_PROGRESS',
+  SUBBUILD_FAILED: 'BuildPipelineErrorType.DEPENDENT_SUBBUILD_FAILED',
+  SUBDEPLOY_FAILED: 'DeployPipelineErrorType.DEPENDENT_SUBDEPLOY_FAILED',
 };
 const PROJECT_TASK_TYPES = {
   PRIVATE_APP: 'private app',
@@ -82,6 +90,7 @@ module.exports = {
   MARKETPLACE_FOLDER,
   CONFIG_FLAGS,
   POLLING_DELAY,
+  POLLING_STATUS,
   PROJECT_CONFIG_FILE,
   PROJECT_BUILD_TEXT,
   PROJECT_DEPLOY_TEXT,

package/lib/localDev.js

@@ -23,7 +23,6 @@ const {
 const { confirmPrompt } = require('./prompts/promptUtils');
 const {
   validateSandboxUsageLimits,
-  getSandboxTypeAsString,
   getAvailableSyncTypes,
 } = require('./sandboxes');
 const { buildSandbox } = require('./sandboxCreate');
@@ -70,9 +69,7 @@ const confirmDefaultAccountIsTarget = async accountConfig => {
   logger.log();
   const useDefaultAccount = await confirmDefaultAccountPrompt(
     accountConfig.name,
-    isDeveloperTestAccount(accountConfig)
-      ? HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
-      : `${getSandboxTypeAsString(accountConfig.accountType)} sandbox`
+    HUBSPOT_ACCOUNT_TYPE_STRINGS[accountConfig.accountType]
   );
 
   if (!useDefaultAccount) {

package/lib/polling.js

@@ -0,0 +1,25 @@
+const { POLLING_DELAY, POLLING_STATUS } = require('./constants');
+
+const poll = (callback, accountId, taskId) => {
+  return new Promise((resolve, reject) => {
+    const pollInterval = setInterval(async () => {
+      const pollResp = await callback(accountId, taskId);
+      const { status } = pollResp;
+
+      if (status === POLLING_STATUS.SUCCESS) {
+        clearInterval(pollInterval);
+        resolve(pollResp);
+      } else if (
+        status === POLLING_STATUS.ERROR ||
+        status === POLLING_STATUS.FAILURE
+      ) {
+        clearInterval(pollInterval);
+        reject(pollResp);
+      }
+    }, POLLING_DELAY);
+  });
+};
+
+module.exports = {
+  poll,
+};

package/lib/projects.js

@@ -17,6 +17,7 @@ const {
   PROJECT_DEPLOY_TEXT,
   PROJECT_CONFIG_FILE,
   PROJECT_TASK_TYPES,
+  PROJECT_ERROR_TYPES,
 } = require('./constants');
 const {
   createProject,
@@ -772,7 +773,9 @@ const makePollTaskStatusFunc = ({
                 const displayErrors = failedSubtasks.filter(
                   subtask =>
                     subtask.standardError.subCategory !==
-                    'BuildPipelineErrorType.DEPENDENT_SUBBUILD_FAILED'
+                      PROJECT_ERROR_TYPES.SUBBUILD_FAILED &&
+                    subtask.standardError.subCategory !==
+                      PROJECT_ERROR_TYPES.SUBDEPLOY_FAILED
                 );
 
                 displayErrors.forEach(subTask => {

package/lib/prompts/createProjectPrompt.js

@@ -48,11 +48,18 @@ const createTemplateOptions = async (templateSource, githubRef) => {
   return config[PROJECT_COMPONENT_TYPES.PROJECTS];
 };
 
-const createProjectPrompt = async (githubRef, promptOptions = {}) => {
-  const projectTemplates = await createTemplateOptions(
-    promptOptions.templateSource,
-    githubRef
-  );
+const createProjectPrompt = async (
+  githubRef,
+  promptOptions = {},
+  skipTemplatePrompt = false
+) => {
+  let projectTemplates = [];
+  if (!skipTemplatePrompt) {
+    projectTemplates = await createTemplateOptions(
+      promptOptions.templateSource,
+      githubRef
+    );
+  }
 
   return promptUser([
     {
@@ -91,8 +98,9 @@ const createProjectPrompt = async (githubRef, promptOptions = {}) => {
           : i18n(`${i18nKey}.selectTemplate`);
       },
       when:
-        !promptOptions.template ||
-        !projectTemplates.find(t => t.name === promptOptions.template),
+        !skipTemplatePrompt &&
+        (!promptOptions.template ||
+          !projectTemplates.find(t => t.name === promptOptions.template)),
       type: 'list',
       choices: projectTemplates.map(template => {
         return {

package/lib/prompts/installPublicAppPrompt.js

@@ -33,8 +33,8 @@ const installPublicAppPrompt = async (
   const url =
     `${websiteOrigin}/oauth/${targetAccountId}/authorize` +
     `?client_id=${encodeURIComponent(clientId)}` +
-    `&scope=${encodeURIComponent(scopes)}` +
-    `&redirect_uri=${encodeURIComponent(redirectUrls)}`;
+    `&scope=${encodeURIComponent(scopes.join(' '))}` +
+    `&redirect_uri=${encodeURIComponent(redirectUrls[0])}`;
 
   open(url);
 };

package/lib/prompts/selectPublicAppPrompt.js

@@ -0,0 +1,74 @@
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('../lang');
+const { uiLine } = require('../ui');
+const { logApiErrorInstance } = require('../errorHandlers/apiErrors');
+const { logger } = require('@hubspot/local-dev-lib/logger');
+const {
+  fetchPublicAppsForPortal,
+} = require('@hubspot/local-dev-lib/api/appsDev');
+const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+
+const i18nKey = 'lib.prompts.selectPublicAppPrompt';
+
+const fetchPublicAppOptions = async (accountId, accountName) => {
+  try {
+    const publicApps = await fetchPublicAppsForPortal(accountId);
+    const filteredPublicApps = publicApps.filter(
+      app => !app.projectId && !app.sourceId
+    );
+
+    if (!filteredPublicApps.length) {
+      uiLine();
+      logger.error(i18n(`${i18nKey}.errors.noApps`));
+      logger.log(i18n(`${i18nKey}.errors.noAppsMessage`, { accountName }));
+      uiLine();
+      process.exit(EXIT_CODES.SUCCESS);
+    }
+    return filteredPublicApps;
+  } catch (error) {
+    logApiErrorInstance(error, { accountId });
+    logger.error(i18n(`${i18nKey}.errors.errorFetchingApps`));
+    process.exit(EXIT_CODES.ERROR);
+  }
+};
+
+const selectPublicAppPrompt = async ({
+  accountId,
+  accountName,
+  promptOptions = {},
+  migrateApp = false,
+}) => {
+  const publicApps = await fetchPublicAppOptions(accountId, accountName);
+  const translationKey = migrateApp ? 'selectAppIdMigrate' : 'selectAppIdClone';
+
+  return promptUser([
+    {
+      name: 'appId',
+      message: () => {
+        return promptOptions.appId &&
+          !publicApps.find(a => a.id === promptOptions.appId)
+          ? i18n(`${i18nKey}.errors.invalidAppId`, {
+              appId: promptOptions.appId,
+            })
+          : i18n(`${i18nKey}.${translationKey}`, {
+              accountName,
+            });
+      },
+      when:
+        !promptOptions.appId ||
+        !publicApps.find(a => a.id === promptOptions.appId),
+      type: 'list',
+      choices: publicApps.map(app => {
+        return {
+          name: `${app.name} (${app.id})`,
+          value: app.id,
+        };
+      }),
+    },
+  ]);
+};
+
+module.exports = {
+  fetchPublicAppOptions,
+  selectPublicAppPrompt,
+};

package/lib/sandboxes.js

@@ -39,9 +39,6 @@ const getSandboxTypeAsString = accountType => {
   return 'standard';
 };
 
-const getSandboxName = config =>
-  `[${getSandboxTypeAsString(config.accountType)} sandbox] `;
-
 function getHasSandboxesByType(parentAccountConfig, type) {
   const config = getConfig();
   const parentPortalId = getAccountId(parentAccountConfig.portalId);
@@ -342,7 +339,6 @@ module.exports = {
   sandboxTypeMap,
   sandboxApiTypeMap,
   syncTypes,
-  getSandboxName,
   getSandboxTypeAsString,
   getHasSandboxesByType,
   getSandboxLimit,

package/lib/ui/index.js

@@ -3,17 +3,10 @@ const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const supportsHyperlinks = require('./supportHyperlinks');
 const supportsColor = require('./supportsColor');
-const {
-  isSandbox,
-  isDeveloperTestAccount,
-  isAppDeveloperAccount,
-} = require('../accountTypes');
-const { getSandboxName } = require('../sandboxes');
 const { i18n } = require('../lang');
 
 const {
   HUBSPOT_ACCOUNT_TYPE_STRINGS,
-  HUBSPOT_ACCOUNT_TYPES,
 } = require('@hubspot/local-dev-lib/constants/config');
 
 const UI_COLORS = {
@@ -84,19 +77,9 @@ const uiLink = (linkText, url) => {
  */
 const uiAccountDescription = (accountId, bold = true) => {
   const account = getAccountConfig(accountId);
-  let accountTypeString = '';
-  if (isSandbox(account)) {
-    accountTypeString = getSandboxName(account);
-  } else if (isDeveloperTestAccount(account)) {
-    accountTypeString = `[${
-      HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST]
-    }] `;
-  } else if (isAppDeveloperAccount(account)) {
-    accountTypeString = `[${
-      HUBSPOT_ACCOUNT_TYPE_STRINGS[HUBSPOT_ACCOUNT_TYPES.APP_DEVELOPER]
-    }] `;
-  }
-  const message = `${account.name} ${accountTypeString}(${account.portalId})`;
+  const message = `${account.name} [${
+    HUBSPOT_ACCOUNT_TYPE_STRINGS[account.accountType]
+  }] (${account.portalId})`;
   return bold ? chalk.bold(message) : message;
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.2.1-beta.5",
+  "version": "5.2.1-beta.7",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,10 +8,10 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/local-dev-lib": "1.1.0",
-    "@hubspot/serverless-dev-runtime": "5.2.1-beta.4",
-    "@hubspot/theme-preview-dev-server": "0.0.6",
-    "@hubspot/ui-extensions-dev-server": "0.8.17",
+    "@hubspot/local-dev-lib": "1.4.0",
+    "@hubspot/serverless-dev-runtime": "5.2.1-beta.7",
+    "@hubspot/theme-preview-dev-server": "0.0.7",
+    "@hubspot/ui-extensions-dev-server": "0.8.20",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "21195f0f24e2e148f37c0320f0b31c2ebad817ff"
+  "gitHead": "8a823fcec0f1538d0af77c30a177e1d33b474d50"
 }