@hubspot/cli 6.2.0 → 6.2.1

package/commands/create/api-sample.js

@@ -7,7 +7,6 @@ const {
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const path = require('path');
 const fs = require('fs-extra');
-const ora = require('ora');
 const {
   fetchFileFromRepository,
   cloneGithubRepo,
@@ -37,14 +36,13 @@ module.exports = {
         return;
       }
     }
-    const downloadSpinner = ora(i18n(`${i18nKey}.loading.apiSamples`));
-    downloadSpinner.start();
+
     const samplesConfig = await fetchFileFromRepository(
       'HubSpot/sample-apps-list',
       'samples.json',
       'main'
     );
-    downloadSpinner.stop();
+
     if (!samplesConfig) {
       logger.error(i18n(`${i18nKey}.errors.noSamples`));
       return;

package/commands/functions/deploy.js

@@ -1,4 +1,4 @@
-const ora = require('ora');
+const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -7,7 +7,7 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
-
+const { uiAccountDescription } = require('../../lib/ui');
 const { poll } = require('../../lib/polling');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const {
@@ -30,7 +30,6 @@ exports.handler = async options => {
   const { path: functionPath } = options;
   const accountId = getAccountId(options);
   const splitFunctionPath = functionPath.split('.');
-  let spinner;
 
   trackCommandUsage('functions-deploy', null, accountId);
 
@@ -52,17 +51,22 @@ exports.handler = async options => {
     })
   );
 
+  SpinniesManager.init();
+
+  SpinniesManager.add('loading', {
+    text: i18n(`${i18nKey}.loading`, {
+      account: uiAccountDescription(accountId),
+      functionPath,
+    }),
+  });
+
   try {
-    spinner = ora(
-      i18n(`${i18nKey}.loading`, {
-        accountId,
-        functionPath,
-      })
-    ).start();
     const { data: buildId } = await buildPackage(accountId, functionPath);
     const successResp = await poll(getBuildStatus, accountId, buildId);
     const buildTimeSeconds = (successResp.buildTime / 1000).toFixed(2);
-    spinner.stop();
+
+    SpinniesManager.succeed('loading');
+
     await outputBuildLog(successResp.cdnUrl);
     logger.success(
       i18n(`${i18nKey}.success.deployed`, {
@@ -72,15 +76,19 @@ exports.handler = async options => {
       })
     );
   } catch (e) {
-    spinner && spinner.stop && spinner.stop();
+    SpinniesManager.fail('loading', {
+      text: i18n(`${i18nKey}.loadingFailed`, {
+        account: uiAccountDescription(accountId),
+        functionPath,
+      }),
+    });
+
     if (isHubSpotHttpError(e) && e.status === 404) {
       logger.error(
         i18n(`${i18nKey}.errors.noPackageJson`, {
           functionPath,
         })
       );
-    } else if (isHubSpotHttpError(e) && e.status === 400) {
-      logger.error(e.error.message);
     } else if (e.status === 'ERROR') {
       await outputBuildLog(e.cdnUrl);
       logger.error(

package/commands/project/cloneApp.js

@@ -100,9 +100,7 @@ exports.handler = async options => {
     const {
       data: { exportId },
     } = await cloneApp(accountId, appId);
-    const {
-      data: { status },
-    } = await poll(checkCloneStatus, accountId, exportId);
+    const { status } = await poll(checkCloneStatus, accountId, exportId);
     if (status === 'SUCCESS') {
       // Ensure correct project folder structure exists
       const baseDestPath = path.resolve(getCwd(), location);

package/lang/en.lyaml

@@ -183,8 +183,6 @@ en:
             noSamples: "Currently there are no samples available, please, try again later."
           info:
             sampleChosen: "You've chosen {{ sampleType }} sample written on {{ sampleLanguage }} language"
-          loading:
-            apiSamples: "Loading available API samples"
           success:
             sampleCreated: "Please, follow {{ filePath }}/README.md to find out how to run the sample"
         module:
@@ -335,7 +333,8 @@ en:
             notFunctionsFolder: "Specified path {{ functionPath }} is not a .functions folder."
           examples:
             default: "Build and deploy a new bundle for all functions within the myFunctionFolder.functions folder"
-          loading: "Building and deploying bundle for \"{{ functionPath }}\" on account \"{{ accountId }}\".\n"
+          loading: "Building and deploying bundle for \"{{ functionPath }}\" on {{ account }}"
+          loadingFailed: "Failed to build and deploy bundle for \"{{ functionPath }}\" on {{ account }}"
           positionals:
             path:
               describe: "Path to .functions folder"

package/lib/localDev.js

@@ -80,7 +80,13 @@ const confirmDefaultAccountIsTarget = async accountConfig => {
 
 // Confirm the default account is supported for the type of apps being developed
 const checkIfDefaultAccountIsSupported = (accountConfig, hasPublicApps) => {
-  if (hasPublicApps && !isAppDeveloperAccount(accountConfig)) {
+  if (
+    hasPublicApps &&
+    !(
+      isAppDeveloperAccount(accountConfig) ||
+      isDeveloperTestAccount(accountConfig)
+    )
+  ) {
     logger.error(
       i18n(`${i18nKey}.checkIfDefaultAccountIsSupported.publicApp`, {
         useCommand: uiCommandReference('hs accounts use'),

package/lib/projects.js

@@ -436,7 +436,7 @@ const pollProjectBuildAndDeploy = async (
         )
       );
 
-      displayWarnLogs(accountId, projectConfig.name, buildId);
+      await displayWarnLogs(accountId, projectConfig.name, buildId);
     }
 
     // autoDeployId of 0 indicates a skipped deploy
@@ -495,7 +495,7 @@ const pollProjectBuildAndDeploy = async (
   }
 
   if (result && result.deployResult) {
-    displayWarnLogs(
+    await displayWarnLogs(
       accountId,
       projectConfig.name,
       result.deployResult.deployId,
@@ -1003,10 +1003,13 @@ const displayWarnLogs = async (
     }
   }
 
-  if (result && result.logs.length) {
-    result.logs.forEach(log => {
+  if (result && result.logs) {
+    const logLength = result.logs.length;
+    result.logs.forEach((log, i) => {
       logger.warn(log.message);
-      logger.log('');
+      if (i < logLength - 1) {
+        logger.log('');
+      }
     });
   }
 };

package/lib/prompts/selectPublicAppPrompt.js

@@ -16,7 +16,9 @@ const fetchPublicAppOptions = async (
   isMigratingApp = false
 ) => {
   try {
-    const { data: publicApps } = await fetchPublicAppsForPortal(accountId);
+    const {
+      data: { results: publicApps },
+    } = await fetchPublicAppsForPortal(accountId);
     const filteredPublicApps = publicApps.filter(
       app => !app.projectId && !app.sourceId
     );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,11 +8,11 @@
     "url": "https://github.com/HubSpot/hubspot-cli"
   },
   "dependencies": {
-    "@hubspot/local-dev-lib": "2.0.0",
+    "@hubspot/local-dev-lib": "^2.0.1",
     "@hubspot/serverless-dev-runtime": "6.2.0",
     "@hubspot/theme-preview-dev-server": "0.0.8",
     "@hubspot/ui-extensions-dev-server": "0.8.33",
-    "archiver": "^5.3.0",
+    "archiver": "^7.0.1",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
     "cli-cursor": "^3.1.0",
@@ -24,13 +24,12 @@
     "js-yaml": "^4.1.0",
     "moment": "^2.29.1",
     "open": "^7.0.3",
-    "ora": "^4.0.3",
     "p-queue": "^6.0.2",
     "strip-ansi": "^5.2.0",
     "table": "^6.6.0",
     "tmp": "^0.2.1",
     "update-notifier": "^5.1.0",
-    "yargs": "15.4.1"
+    "yargs": "17.7.2"
   },
   "devDependencies": {
     "axios": "^1.7.2",
@@ -46,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "760939368a64cd5dedf529ca89106253dbf98fce"
+  "gitHead": "bca108b05c57cfb6984cda5c09740760855c70d8"
 }