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

package/lib/SpinniesManager.js

@@ -60,30 +60,6 @@ class SpinniesManager {
     this.stream = process.stderr;
     this.lineCount = 0;
     this.currentFrameIndex = 0;
-
-    // Custom fields
-    this.parentSpinnerName = null;
-    this.categories = {};
-  }
-
-  addSpinnerToCategory(name, category) {
-    if (!this.categories[category]) {
-      this.categories[category] = {};
-    }
-    this.categories[category][name] = true;
-  }
-
-  getSpinnerCategory(name) {
-    return Object.keys(this.categories).find(
-      category => !!this.categories[category][name]
-    );
-  }
-
-  removeSpinnerFromCategory(name) {
-    const category = this.getSpinnerCategory(name);
-    if (category) {
-      delete this.categories[category][name];
-    }
   }
 
   pick(name) {
@@ -91,40 +67,24 @@ class SpinniesManager {
   }
 
   add(name, options = {}) {
-    const { category, isParent, noIndent, ...spinnerOptions } = options;
-
     // Support adding generic spinnies lines without specifying a name
     const resolvedName = name || `${Date.now()}-${Math.random()}`;
 
-    if (category) {
-      this.addSpinnerToCategory(resolvedName, category);
-    }
-
     if (!options.text) {
-      spinnerOptions.text = resolvedName;
+      options.text = resolvedName;
     }
 
-    const originalIndent = spinnerOptions.indent || 0;
-
     const spinnerProperties = {
       ...colorOptions(this.options),
       succeedPrefix: this.options.succeedPrefix,
       failPrefix: this.options.failPrefix,
       status: 'spinning',
-      ...purgeSpinnerOptions(spinnerOptions),
-      indent:
-        this.parentSpinnerName && !noIndent
-          ? originalIndent + 1
-          : originalIndent,
+      ...purgeSpinnerOptions(options),
     };
 
     this.spinners[resolvedName] = spinnerProperties;
     this.updateSpinnerState();
 
-    if (isParent) {
-      this.parentSpinnerName = resolvedName;
-    }
-
     return { name: resolvedName, ...spinnerProperties };
   }
 
@@ -136,20 +96,6 @@ class SpinniesManager {
     return this.spinners[name];
   }
 
-  // TODO there is an issue here with the usage of "non-spinnable"
-  // The spinnies lib automatically removes any non-active spinners
-  // after adding a new spinner (add -> updateSpinnerState -> checkIfActiveSpinners)
-  // so "pick" is telling us that these newly-added spinners don't exist.
-  addOrUpdate(name, options = {}) {
-    const spinner = this.pick(name);
-
-    if (spinner) {
-      this.update(name, options);
-    } else {
-      this.add(name, options);
-    }
-  }
-
   succeed(name, options = {}) {
     this.setSpinnerProperties(name, options, 'succeed');
     this.updateSpinnerState();
@@ -169,37 +115,11 @@ class SpinniesManager {
       throw Error('A spinner reference name must be specified');
     }
 
-    if (name === this.parentSpinnerName) {
-      this.parentSpinnerName = null;
-    }
-
-    this.removeSpinnerFromCategory(name);
-
     const spinner = this.spinners[name];
     delete this.spinners[name];
     return spinner;
   }
 
-  /**
-   * Removes all spinnies instances
-   * @param {string} targetCategory - remove all spinnies with a matching category
-   * @param {string} preserveCategory - do not remove spinnies with a matching category
-   */
-  removeAll({ preserveCategory = null, targetCategory = null } = {}) {
-    Object.keys(this.spinners).forEach(name => {
-      if (targetCategory) {
-        if (this.getSpinnerCategory(name) === targetCategory) {
-          this.remove(name);
-        }
-      } else if (
-        !preserveCategory ||
-        this.getSpinnerCategory(name) !== preserveCategory
-      ) {
-        this.remove(name);
-      }
-    });
-  }
-
   stopAll(newStatus = 'stopped') {
     Object.keys(this.spinners).forEach(name => {
       const { status: currentStatus } = this.spinners[name];

package/lib/projectStructure.js

@@ -100,6 +100,7 @@ async function findProjectComponents(projectSourceDir) {
 }
 
 module.exports = {
+  APP_COMPONENT_CONFIG,
   COMPONENT_TYPES,
   findProjectComponents,
   getAppCardConfigs,

package/lib/projects.js

@@ -43,6 +43,7 @@ const { i18n } = require('./lang');
 const SpinniesManager = require('./SpinniesManager');
 const {
   isSpecifiedError,
+  isSpecifiedHubSpotAuthError,
 } = require('@hubspot/cli-lib/errorHandlers/apiErrors');
 
 const i18nKey = 'cli.lib.projects';
@@ -132,24 +133,15 @@ const createProjectConfig = async (
     }`
   );
 
+  await downloadGitHubRepoContents(templateSource, template.path, projectPath);
+  const _config = JSON.parse(fs.readFileSync(projectConfigPath));
+  writeProjectConfig(projectConfigPath, {
+    ..._config,
+    name: projectName,
+  });
+
   if (template.name === 'no-template') {
     fs.ensureDirSync(path.join(projectPath, 'src'));
-
-    writeProjectConfig(projectConfigPath, {
-      name: projectName,
-      srcDir: 'src',
-    });
-  } else {
-    await downloadGitHubRepoContents(
-      templateSource,
-      template.path,
-      projectPath
-    );
-    const _config = JSON.parse(fs.readFileSync(projectConfigPath));
-    writeProjectConfig(projectConfigPath, {
-      ..._config,
-      name: projectName,
-    });
   }
 
   return true;
@@ -184,7 +176,9 @@ const pollFetchProject = async (accountId, projectName) => {
     let pollCount = 0;
     SpinniesManager.init();
     SpinniesManager.add('pollFetchProject', {
-      text: 'Fetching project status',
+      text: i18n(`${i18nKey}.pollFetchProject.checkingProject`, {
+        accountIdentifier: uiAccountDescription(accountId),
+      }),
     });
     const pollInterval = setInterval(async () => {
       try {
@@ -200,14 +194,10 @@ const pollFetchProject = async (accountId, projectName) => {
             statusCode: 403,
             category: 'GATED',
             subCategory: 'BuildPipelineErrorType.PORTAL_GATED',
-          })
+          }) &&
+          pollCount < 15
         ) {
           pollCount += 1;
-        } else if (pollCount >= 15) {
-          // Poll up to max 30s
-          SpinniesManager.remove('pollFetchProject');
-          clearInterval(pollInterval);
-          reject(err);
         } else {
           SpinniesManager.remove('pollFetchProject');
           clearInterval(pollInterval);
@@ -280,6 +270,14 @@ const ensureProjectExists = async (
         return false;
       }
     }
+    if (
+      isSpecifiedHubSpotAuthError(err, {
+        statusCode: 401,
+      })
+    ) {
+      logger.error(err.message);
+      process.exit(EXIT_CODES.ERROR);
+    }
     logApiErrorInstance(err, new ApiErrorContext({ accountId, projectName }));
     process.exit(EXIT_CODES.ERROR);
   }
@@ -566,7 +564,6 @@ const makePollTaskStatusFunc = ({
       succeedColor: 'white',
       failColor: 'white',
       failPrefix: chalk.bold('!'),
-      category: 'projectPollStatus',
     });
 
     const [
@@ -608,7 +605,10 @@ const makePollTaskStatusFunc = ({
         ) + '\n';
 
     SpinniesManager.update(overallTaskSpinniesKey, {
-      text: `${statusStrings.INITIALIZE(taskName)}\n${componentCountText}`,
+      text: `${statusStrings.INITIALIZE(
+        taskName,
+        displayId
+      )}\n${componentCountText}`,
     });
 
     if (!silenceLogs) {
@@ -627,7 +627,6 @@ const makePollTaskStatusFunc = ({
           indent,
           succeedColor: 'white',
           failColor: 'white',
-          category: 'projectPollStatus',
         });
       };
 
@@ -688,11 +687,11 @@ const makePollTaskStatusFunc = ({
           if (isTaskComplete(taskStatus)) {
             if (status === statusText.STATES.SUCCESS) {
               SpinniesManager.succeed(overallTaskSpinniesKey, {
-                text: statusStrings.SUCCESS(taskName),
+                text: statusStrings.SUCCESS(taskName, displayId),
               });
             } else if (status === statusText.STATES.FAILURE) {
               SpinniesManager.fail(overallTaskSpinniesKey, {
-                text: statusStrings.FAIL(taskName),
+                text: statusStrings.FAIL(taskName, displayId),
               });
 
               if (!silenceLogs) {
@@ -712,7 +711,13 @@ const makePollTaskStatusFunc = ({
                 logger.log('See below for a summary of errors.');
                 uiLine();
 
-                failedSubtasks.forEach(subTask => {
+                const displayErrors = failedSubtasks.filter(
+                  subtask =>
+                    subtask.standardError.subCategory !==
+                    'BuildPipelineErrorType.DEPENDENT_SUBBUILD_FAILED'
+                );
+
+                displayErrors.forEach(subTask => {
                   logger.log(
                     `\n--- ${chalk.bold(
                       subTask[statusText.SUBTASK_NAME_KEY]
@@ -749,9 +754,9 @@ const pollBuildStatus = makePollTaskStatusFunc({
   structureFn: getBuildStructure,
   statusText: PROJECT_BUILD_TEXT,
   statusStrings: {
-    INITIALIZE: name => `Building ${chalk.bold(name)}`,
-    SUCCESS: name => `Built ${chalk.bold(name)}`,
-    FAIL: name => `Failed to build ${chalk.bold(name)}`,
+    INITIALIZE: (name, buildId) => `Building ${chalk.bold(name)} #${buildId}`,
+    SUCCESS: (name, buildId) => `Built ${chalk.bold(name)} #${buildId}`,
+    FAIL: (name, buildId) => `Failed to build ${chalk.bold(name)} #${buildId}`,
     SUBTASK_FAIL: (buildId, name) =>
       `Build #${buildId} failed because there was a problem\nbuilding ${chalk.bold(
         name
@@ -769,9 +774,12 @@ const pollDeployStatus = makePollTaskStatusFunc({
   structureFn: getDeployStructure,
   statusText: PROJECT_DEPLOY_TEXT,
   statusStrings: {
-    INITIALIZE: name => `Deploying ${chalk.bold(name)}`,
-    SUCCESS: name => `Deployed ${chalk.bold(name)}`,
-    FAIL: name => `Failed to deploy ${chalk.bold(name)}`,
+    INITIALIZE: (name, buildId) =>
+      `Deploying build #${buildId} in ${chalk.bold(name)}`,
+    SUCCESS: (name, buildId) =>
+      `Deployed build #${buildId} in ${chalk.bold(name)}`,
+    FAIL: (name, buildId) =>
+      `Failed to deploy build #${buildId} in ${chalk.bold(name)}`,
     SUBTASK_FAIL: (deployedBuildId, name) =>
       `Deploy for build #${deployedBuildId} failed because there was a\nproblem deploying ${chalk.bold(
         name
@@ -825,11 +833,13 @@ const showPlatformVersionWarning = async (accountId, projectConfig) => {
           defaultVersion,
         })
       );
+      logger.log('');
     } catch (e) {
       logger.log('');
       logger.warn(
         i18n(`${i18nKey}.showPlatformVersionWarning.noPlatformVersionAlt`)
       );
+      logger.log('');
       logger.debug(e.error);
     }
   }

package/lib/prompts/downloadProjectPrompt.js

@@ -5,7 +5,6 @@ const {
   logApiErrorInstance,
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
-const { getProjectConfig } = require('../projects');
 const { EXIT_CODES } = require('../enums/exitCodes');
 const { i18n } = require('../lang');
 
@@ -13,14 +12,12 @@ const i18nKey = 'cli.lib.prompts.downloadProjectPrompt';
 
 const createProjectsList = async () => {
   const accountId = getAccountId();
-  const { projectConfig } = await getProjectConfig();
-  const projectName = projectConfig.name;
 
   try {
     const projects = await fetchProjects(accountId);
     return projects.results;
   } catch (e) {
-    logApiErrorInstance(e, new ApiErrorContext({ accountId, projectName }));
+    logApiErrorInstance(e, new ApiErrorContext({ accountId }));
     process.exit(EXIT_CODES.ERROR);
   }
 };

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -26,7 +26,11 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
     logger.debug('Unable to fetch sandbox usage limits: ', err);
   }
 
-  const sandboxAccounts = accounts.reverse().filter(isSandbox);
+  const sandboxAccounts = accounts
+    .reverse()
+    .filter(
+      config => isSandbox(config) && config.parentAccountId === defaultAccountId
+    );
   let disabledMessage = false;
 
   if (sandboxUsage['DEVELOPER'] && sandboxUsage['DEVELOPER'].available === 0) {
@@ -74,6 +78,21 @@ const selectTargetAccountPrompt = async (accounts, defaultAccountConfig) => {
   return targetAccountInfo;
 };
 
+const confirmDefaultSandboxAccountPrompt = async (accountName, accountType) => {
+  const { useDefaultAccount } = await promptUser([
+    {
+      name: 'useDefaultAccount',
+      type: 'confirm',
+      message: i18n(`${i18nKey}.confirmDefaultSandboxAccount`, {
+        accountName,
+        accountType,
+      }),
+    },
+  ]);
+  return useDefaultAccount;
+};
+
 module.exports = {
   selectTargetAccountPrompt,
+  confirmDefaultSandboxAccountPrompt,
 };

package/lib/ui.js

@@ -7,7 +7,9 @@ const { i18n } = require('./lang');
 const { logger } = require('@hubspot/cli-lib/logger');
 
 const UI_COLORS = {
-  orange: '#FF8F59',
+  SORBET: '#FF8F59',
+  MARIGOLD: '#f5c26b',
+  MARIGOLD_DARK: '#dbae60',
 };
 
 /**
@@ -92,6 +94,10 @@ const uiInfoSection = (title, logContent) => {
   uiLine();
 };
 
+const uiCommandReference = command => {
+  return chalk.bold(chalk.hex(UI_COLORS.MARIGOLD_DARK)(`\`${command}\``));
+};
+
 const uiFeatureHighlight = (commands, title) => {
   const i18nKey = 'cli.lib.ui.featureHighlight';
 
@@ -112,7 +118,7 @@ const uiFeatureHighlight = (commands, title) => {
 const uiBetaMessage = message => {
   const i18nKey = 'cli.lib.ui';
 
-  logger.log(chalk.hex(UI_COLORS.orange)(i18n(`${i18nKey}.betaTag`)), message);
+  logger.log(chalk.hex(UI_COLORS.SORBET)(i18n(`${i18nKey}.betaTag`)), message);
 };
 
 const uiBetaWarning = logMessage => {
@@ -126,6 +132,7 @@ const uiBetaWarning = logMessage => {
 module.exports = {
   UI_COLORS,
   uiAccountDescription,
+  uiCommandReference,
   uiBetaMessage,
   uiBetaWarning,
   uiFeatureHighlight,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.2.1-beta.2",
+  "version": "4.2.1-beta.4",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,16 +8,14 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^4.2.1",
-    "@hubspot/serverless-dev-runtime": "4.2.1-beta.2",
-    "@hubspot/ui-extensions-dev-server": "^0.5.0",
+    "@hubspot/cli-lib": "^4.2.2",
+    "@hubspot/serverless-dev-runtime": "4.2.1-beta.3",
+    "@hubspot/ui-extensions-dev-server": "^0.7.2",
     "archiver": "^5.3.0",
-    "body-parser": "^1.19.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
     "cli-cursor": "^3.1.0",
     "cli-progress": "^3.11.2",
-    "cors": "^2.8.5",
     "express": "^4.17.1",
     "findup-sync": "^4.0.0",
     "fs-extra": "^8.1.0",
@@ -26,7 +24,6 @@
     "moment": "^2.29.1",
     "open": "^7.0.3",
     "ora": "^4.0.3",
-    "p-queue": "^6.0.2",
     "strip-ansi": "^5.2.0",
     "tmp": "^0.2.1",
     "update-notifier": "^5.1.0",
@@ -45,5 +42,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9a111f2df1b19153efe867f3501599bfa4aedabe"
+  "gitHead": "24d48c93e04bacc5db761cc15489b5bc82e17847"
 }

package/lib/LocalDevManagerV2.js

@@ -1,239 +0,0 @@
-const path = require('path');
-const chalk = require('chalk');
-const { i18n } = require('./lang');
-const { logger } = require('@hubspot/cli-lib/logger');
-const { handleKeypress } = require('@hubspot/cli-lib/lib/process');
-const {
-  getAccountId,
-  getConfigDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
-const SpinniesManager = require('./SpinniesManager');
-const DevServerManager = require('./DevServerManager');
-const { EXIT_CODES } = require('./enums/exitCodes');
-const { getProjectDetailUrl } = require('./projects');
-const {
-  COMPONENT_TYPES,
-  findProjectComponents,
-  getAppCardConfigs,
-} = require('./projectStructure');
-const {
-  UI_COLORS,
-  uiAccountDescription,
-  uiBetaMessage,
-  uiLink,
-  uiLine,
-} = require('./ui');
-
-const i18nKey = 'cli.lib.LocalDevManagerV2';
-
-class LocalDevManagerV2 {
-  constructor(options) {
-    this.targetAccountId = options.targetAccountId;
-    this.projectConfig = options.projectConfig;
-    this.projectDir = options.projectDir;
-    this.debug = options.debug || false;
-    this.alpha = options.alpha;
-    this.deployedBuild = options.deployedBuild;
-
-    this.projectSourceDir = path.join(
-      this.projectDir,
-      this.projectConfig.srcDir
-    );
-
-    if (!this.targetAccountId || !this.projectConfig || !this.projectDir) {
-      logger.log(i18n(`${i18nKey}.failedToInitialize`));
-      process.exit(EXIT_CODES.ERROR);
-    }
-  }
-
-  async start() {
-    SpinniesManager.removeAll();
-    SpinniesManager.init();
-
-    const components = await findProjectComponents(this.projectSourceDir);
-
-    if (!components.length) {
-      logger.log();
-      logger.error(i18n(`${i18nKey}.noComponents`));
-      process.exit(EXIT_CODES.SUCCESS);
-    }
-
-    const runnableComponents = components.filter(
-      component => component.runnable
-    );
-
-    if (!runnableComponents.length) {
-      logger.log();
-      logger.error(i18n(`${i18nKey}.noRunnableComponents`));
-      process.exit(EXIT_CODES.SUCCESS);
-    }
-
-    logger.log();
-    const setupSucceeded = await this.devServerSetup(runnableComponents);
-
-    if (setupSucceeded || !this.debug) {
-      console.clear();
-    }
-
-    uiBetaMessage(i18n(`${i18nKey}.betaMessage`));
-    logger.log();
-    logger.log(
-      chalk.hex(UI_COLORS.orange)(
-        i18n(`${i18nKey}.running`, {
-          accountIdentifier: uiAccountDescription(this.targetAccountId),
-          projectName: this.projectConfig.name,
-        })
-      )
-    );
-    logger.log(
-      uiLink(
-        i18n(`${i18nKey}.viewInHubSpotLink`),
-        getProjectDetailUrl(this.projectConfig.name, this.targetAccountId)
-      )
-    );
-    logger.log();
-    logger.log(i18n(`${i18nKey}.quitHelper`));
-    uiLine();
-    logger.log();
-
-    await this.devServerStart();
-
-    this.updateKeypressListeners();
-
-    this.compareLocalProjectToDeployed(runnableComponents);
-  }
-
-  async stop() {
-    SpinniesManager.add('cleanupMessage', {
-      text: i18n(`${i18nKey}.exitingStart`),
-    });
-
-    const cleanupSucceeded = await this.devServerCleanup();
-
-    if (!cleanupSucceeded) {
-      SpinniesManager.fail('cleanupMessage', {
-        text: i18n(`${i18nKey}.exitingFail`),
-      });
-      process.exit(EXIT_CODES.ERROR);
-    }
-
-    SpinniesManager.succeed('cleanupMessage', {
-      text: i18n(`${i18nKey}.exitingSucceed`),
-    });
-    process.exit(EXIT_CODES.SUCCESS);
-  }
-
-  updateKeypressListeners() {
-    handleKeypress(async key => {
-      if ((key.ctrl && key.name === 'c') || key.name === 'q') {
-        this.stop();
-      }
-    });
-  }
-
-  logUploadWarning(reason) {
-    const currentDefaultAccount = getConfigDefaultAccount();
-    const defaultAccountId = getAccountId(currentDefaultAccount);
-
-    logger.log();
-    logger.warn(i18n(`${i18nKey}.uploadWarning.header`, { reason }));
-    logger.log(i18n(`${i18nKey}.uploadWarning.stopDev`));
-    if (this.targetAccountId !== defaultAccountId) {
-      logger.log(
-        i18n(`${i18nKey}.uploadWarning.runUploadWithAccount`, {
-          accountId: this.targetAccountId,
-        })
-      );
-    } else {
-      logger.log(i18n(`${i18nKey}.uploadWarning.runUpload`));
-    }
-    logger.log(i18n(`${i18nKey}.uploadWarning.restartDev`));
-  }
-
-  compareLocalProjectToDeployed(runnableComponents) {
-    const deployedComponentNames = this.deployedBuild.subbuildStatuses.map(
-      subbuildStatus => subbuildStatus.buildName
-    );
-
-    let missingComponents = [];
-
-    runnableComponents.forEach(({ type, config, path }) => {
-      if (type === COMPONENT_TYPES.app) {
-        const cardConfigs = getAppCardConfigs(config, path);
-
-        cardConfigs.forEach(cardConfig => {
-          if (
-            cardConfig.data &&
-            cardConfig.data.title &&
-            !deployedComponentNames.includes(cardConfig.data.title)
-          ) {
-            missingComponents.push(cardConfig.data.title);
-          }
-        });
-      }
-    });
-
-    if (missingComponents.length) {
-      this.logUploadWarning(
-        i18n(`${i18nKey}.uploadWarning.missingComponents`, {
-          missingComponents: missingComponents.join(','),
-        })
-      );
-    }
-  }
-
-  async devServerSetup(components) {
-    try {
-      await DevServerManager.setup({
-        alpha: this.alpha,
-        components,
-        debug: this.debug,
-        onUploadRequired: this.logUploadWarning.bind(this),
-      });
-      return true;
-    } catch (e) {
-      if (this.debug) {
-        logger.error(e);
-      }
-      logger.error(
-        i18n(`${i18nKey}.devServer.setupError`, { message: e.message })
-      );
-      return false;
-    }
-  }
-
-  async devServerStart() {
-    try {
-      await DevServerManager.start({
-        alpha: this.alpha,
-        accountId: this.targetAccountId,
-        projectConfig: this.projectConfig,
-      });
-    } catch (e) {
-      if (this.debug) {
-        logger.error(e);
-      }
-      logger.error(
-        i18n(`${i18nKey}.devServer.startError`, { message: e.message })
-      );
-      process.exit(EXIT_CODES.ERROR);
-    }
-  }
-
-  async devServerCleanup() {
-    try {
-      await DevServerManager.cleanup();
-      return true;
-    } catch (e) {
-      if (this.debug) {
-        logger.error(e);
-      }
-      logger.error(
-        i18n(`${i18nKey}.devServer.cleanupError`, { message: e.message })
-      );
-      return false;
-    }
-  }
-}
-
-module.exports = LocalDevManagerV2;