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

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/lang/en.lyaml

@@ -962,7 +962,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 }}"

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/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/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.6",
   "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/local-dev-lib": "1.2.0",
+    "@hubspot/serverless-dev-runtime": "5.2.1-beta.6",
     "@hubspot/theme-preview-dev-server": "0.0.6",
-    "@hubspot/ui-extensions-dev-server": "0.8.17",
+    "@hubspot/ui-extensions-dev-server": "0.8.19",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "21195f0f24e2e148f37c0320f0b31c2ebad817ff"
+  "gitHead": "399851070db3e2fd91ade022044981bd45c28574"
 }