@hubspot/cli 6.3.0-experimental.0 → 6.4.0-beta.0

package/lib/errorHandlers/suppressError.js

@@ -1,26 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { isSpecifiedError, isMissingScopeError, } = require('@hubspot/local-dev-lib/errors/index');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { PLATFORM_VERSION_ERROR_TYPES } = require('../constants');
-const { i18n } = require('../lang');
-const { uiAccountDescription, uiLine, uiLink, uiCommandReference, } = require('../ui');
+exports.shouldSuppressError = shouldSuppressError;
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const constants_1 = require("../constants");
+const lang_1 = require("../lang");
+const ui_1 = require("../ui");
 const i18nKey = 'lib.errorHandlers.suppressErrors';
 function createPlatformVersionError(err, subCategory) {
     let translationKey = 'unspecifiedPlatformVersion';
     let platformVersion = 'unspecified platformVersion';
-    const errorContext = err.response && err.response.data && err.response.data.context;
+    const errorContext = err.data.context;
     switch (subCategory) {
-        case [PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_RETIRED]:
+        case constants_1.PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_RETIRED:
             translationKey = 'platformVersionRetired';
             if (errorContext && errorContext[subCategory]) {
                 platformVersion = errorContext[subCategory];
             }
             break;
-        case [
-            PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_SPECIFIED_DOES_NOT_EXIST,
-        ]:
+        case constants_1.PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_SPECIFIED_DOES_NOT_EXIST:
             translationKey = 'nonExistentPlatformVersion';
             if (errorContext && errorContext[subCategory]) {
                 platformVersion = errorContext[subCategory];
@@ -29,48 +27,45 @@ function createPlatformVersionError(err, subCategory) {
         default:
             break;
     }
-    uiLine();
-    logger.error(i18n(`${i18nKey}.platformVersionErrors.header`));
-    logger.log(i18n(`${i18nKey}.platformVersionErrors.${translationKey}`, {
+    (0, ui_1.uiLine)();
+    logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.platformVersionErrors.header`));
+    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.platformVersionErrors.${translationKey}`, {
         platformVersion,
     }));
-    logger.log(i18n(`${i18nKey}.platformVersionErrors.updateProject`));
-    logger.log(i18n(`${i18nKey}.platformVersionErrors.betaLink`, {
-        docsLink: uiLink(i18n(`${i18nKey}.platformVersionErrors.docsLink`), 'https://developers.hubspot.com/docs/platform/platform-versioning'),
+    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.platformVersionErrors.updateProject`));
+    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.platformVersionErrors.betaLink`, {
+        docsLink: (0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.platformVersionErrors.docsLink`), 'https://developers.hubspot.com/docs/platform/platform-versioning'),
     }));
-    uiLine();
+    (0, ui_1.uiLine)();
 }
-function shouldSuppressError(err, context = {}) {
-    if (isMissingScopeError(err)) {
-        logger.error(i18n(`${i18nKey}.missingScopeError`, {
-            accountName: context.accountId
-                ? uiAccountDescription(context.accountId)
+function shouldSuppressError(err, context) {
+    if ((0, index_1.isMissingScopeError)(err)) {
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.missingScopeError`, {
+            accountName: context?.accountId
+                ? (0, ui_1.uiAccountDescription)(context.accountId)
                 : '',
-            request: context.request || 'request',
-            authCommand: uiCommandReference('hs auth'),
+            request: context?.request || 'request',
+            authCommand: (0, ui_1.uiCommandReference)('hs auth'),
         }));
         return true;
     }
-    if (isSpecifiedError(err, {
-        subCategory: PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_NOT_SPECIFIED,
+    if ((0, index_1.isSpecifiedError)(err, {
+        subCategory: constants_1.PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_NOT_SPECIFIED,
     })) {
-        createPlatformVersionError(err.data, PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_NOT_SPECIFIED);
+        createPlatformVersionError(err.data, constants_1.PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_NOT_SPECIFIED);
         return true;
     }
-    if (isSpecifiedError(err, {
-        subCategory: PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_RETIRED,
+    if ((0, index_1.isSpecifiedError)(err, {
+        subCategory: constants_1.PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_RETIRED,
     })) {
-        createPlatformVersionError(err.data, PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_RETIRED);
+        createPlatformVersionError(err.data, constants_1.PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_RETIRED);
         return true;
     }
-    if (isSpecifiedError(err, {
-        subCategory: PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_SPECIFIED_DOES_NOT_EXIST,
+    if ((0, index_1.isSpecifiedError)(err, {
+        subCategory: constants_1.PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_SPECIFIED_DOES_NOT_EXIST,
     })) {
-        createPlatformVersionError(err.data, PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_SPECIFIED_DOES_NOT_EXIST);
+        createPlatformVersionError(err.data, constants_1.PLATFORM_VERSION_ERROR_TYPES.PLATFORM_VERSION_SPECIFIED_DOES_NOT_EXIST);
         return true;
     }
     return false;
 }
-module.exports = {
-    shouldSuppressError,
-};

package/lib/links.d.ts

@@ -1 +1,10 @@
+type SiteLink = {
+    shortcut: string;
+    alias?: string;
+    getUrl: (accountId: number, baseUrl: string) => string;
+    url?: string;
+};
+export declare function getSiteLinksAsArray(accountId: number): SiteLink[];
+export declare function logSiteLinks(accountId: number): void;
+export declare function openLink(accountId: number, shortcut: string): void;
 export {};

package/lib/links.js

@@ -1,107 +1,109 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { getEnv } = require('@hubspot/local-dev-lib/config');
-const { ENVIRONMENTS, } = require('@hubspot/local-dev-lib/constants/environments');
-const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { getTableContents, getTableHeader } = require('./ui/table');
-const open = require('open');
-const logSiteLinks = accountId => {
+exports.getSiteLinksAsArray = getSiteLinksAsArray;
+exports.logSiteLinks = logSiteLinks;
+exports.openLink = openLink;
+const open_1 = __importDefault(require("open"));
+const config_1 = require("@hubspot/local-dev-lib/config");
+const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
+const urls_1 = require("@hubspot/local-dev-lib/urls");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const table_1 = require("./ui/table");
+const SITE_LINKS = {
+    APPS_MARKETPLACE: {
+        shortcut: 'apps-marketplace',
+        alias: 'apm',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/ecosystem/${accountId}/marketplace/apps`,
+    },
+    ASSET_MARKETPLACE: {
+        shortcut: 'asset-marketplace',
+        alias: 'asm',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/ecosystem/${accountId}/marketplace/products`,
+    },
+    CONTENT_STAGING: {
+        shortcut: 'content-staging',
+        alias: 'cs',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/content/${accountId}/staging`,
+    },
+    DESIGN_MANAGER: {
+        shortcut: 'design-manager',
+        alias: 'dm',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/design-manager/${accountId}`,
+    },
+    DOCS: {
+        shortcut: 'docs',
+        getUrl: () => 'https://developers.hubspot.com',
+    },
+    FILE_MANAGER: {
+        shortcut: 'file-manager',
+        alias: 'fm',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/files/${accountId}`,
+    },
+    FORUMS: {
+        shortcut: 'forums',
+        getUrl: () => 'https://community.hubspot.com',
+    },
+    HUBDB: {
+        shortcut: 'hubdb',
+        alias: 'hdb',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/hubdb/${accountId}`,
+    },
+    SETTINGS: {
+        shortcut: 'settings',
+        alias: 's',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/settings/${accountId}`,
+    },
+    SETTINGS_NAVIGATION: {
+        shortcut: 'settings/navigation',
+        alias: 'sn',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/menus/${accountId}/edit/`,
+    },
+    SETTINGS_WEBSITE: {
+        shortcut: 'settings/website',
+        alias: 'sw',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/settings/${accountId}/website/pages/all-domains/page-templates`,
+    },
+    SETTINGS_getUrl_REDIRECTS: {
+        shortcut: 'settings/url-redirects',
+        alias: 'sur',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/domains/${accountId}/url-redirects`,
+    },
+    PURCHASED_ASSETS: {
+        shortcut: 'purchased-assets',
+        alias: 'pa',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/marketplace/${accountId}/manage-purchases`,
+    },
+    WEBSITE_PAGES: {
+        shortcut: 'website-pages',
+        alias: 'wp',
+        getUrl: (accountId, baseUrl) => `${baseUrl}/website/${accountId}/pages/site`,
+    },
+};
+function getSiteLinksAsArray(accountId) {
+    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getEnv)() === 'qa' ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD);
+    return Object.values(SITE_LINKS)
+        .sort((a, b) => (a.shortcut < b.shortcut ? -1 : 1))
+        .map(l => ({ ...l, url: l.getUrl(accountId, baseUrl) }));
+}
+function logSiteLinks(accountId) {
     const linksAsArray = getSiteLinksAsArray(accountId).map(l => [
         `${l.shortcut}${l.alias ? ` [alias: ${l.alias}]` : ''}`,
         '=>',
         l.url,
     ]);
-    linksAsArray.unshift(getTableHeader(['Shortcut', '', 'Url']));
-    logger.log(getTableContents(linksAsArray));
-};
-const getSiteLinksAsArray = accountId => Object.values(getSiteLinks(accountId)).sort((a, b) => a.shortcut < b.shortcut ? -1 : 1);
-const getSiteLinks = accountId => {
-    const baseUrl = getHubSpotWebsiteOrigin(getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
-    return {
-        APPS_MARKETPLACE: {
-            shortcut: 'apps-marketplace',
-            alias: 'apm',
-            url: `${baseUrl}/ecosystem/${accountId}/marketplace/apps`,
-        },
-        ASSET_MARKETPLACE: {
-            shortcut: 'asset-marketplace',
-            alias: 'asm',
-            url: `${baseUrl}/ecosystem/${accountId}/marketplace/products`,
-        },
-        CONTENT_STAGING: {
-            shortcut: 'content-staging',
-            alias: 'cs',
-            url: `${baseUrl}/content/${accountId}/staging`,
-        },
-        DESIGN_MANAGER: {
-            shortcut: 'design-manager',
-            alias: 'dm',
-            url: `${baseUrl}/design-manager/${accountId}`,
-        },
-        DOCS: {
-            shortcut: 'docs',
-            url: 'https://developers.hubspot.com',
-        },
-        FILE_MANAGER: {
-            shortcut: 'file-manager',
-            alias: 'fm',
-            url: `${baseUrl}/files/${accountId}`,
-        },
-        FORUMS: {
-            shortcut: 'forums',
-            url: 'https://community.hubspot.com',
-        },
-        HUBDB: {
-            shortcut: 'hubdb',
-            alias: 'hdb',
-            url: `${baseUrl}/hubdb/${accountId}`,
-        },
-        SETTINGS: {
-            shortcut: 'settings',
-            alias: 's',
-            url: `${baseUrl}/settings/${accountId}`,
-        },
-        SETTINGS_NAVIGATION: {
-            shortcut: 'settings/navigation',
-            alias: 'sn',
-            url: `${baseUrl}/menus/${accountId}/edit/`,
-        },
-        SETTINGS_WEBSITE: {
-            shortcut: 'settings/website',
-            alias: 'sw',
-            url: `${baseUrl}/settings/${accountId}/website/pages/all-domains/page-templates`,
-        },
-        SETTINGS_URL_REDIRECTS: {
-            shortcut: 'settings/url-redirects',
-            alias: 'sur',
-            url: `${baseUrl}/domains/${accountId}/url-redirects`,
-        },
-        PURCHASED_ASSETS: {
-            shortcut: 'purchased-assets',
-            alias: 'pa',
-            url: `${baseUrl}/marketplace/${accountId}/manage-purchases`,
-        },
-        WEBSITE_PAGES: {
-            shortcut: 'website-pages',
-            alias: 'wp',
-            url: `${baseUrl}/website/${accountId}/pages/site`,
-        },
-    };
-};
-const openLink = (accountId, shortcut) => {
-    const match = Object.values(getSiteLinks(accountId)).find(l => l.shortcut === shortcut || (l.alias && l.alias === shortcut));
+    linksAsArray.unshift((0, table_1.getTableHeader)(['Shortcut', '', 'Url']));
+    logger_1.logger.log((0, table_1.getTableContents)(linksAsArray));
+}
+function openLink(accountId, shortcut) {
+    const match = Object.values(SITE_LINKS).find(l => l.shortcut === shortcut || (l.alias && l.alias === shortcut));
     if (!match) {
-        logger.error(`We couldn't find a shortcut matching ${shortcut}.  Type 'hs open list' to see a list of available shortcuts`);
+        logger_1.logger.error(`We couldn't find a shortcut matching ${shortcut}.  Type 'hs open list' to see a list of available shortcuts`);
         return;
     }
-    open(match.url, { url: true });
-    logger.success(`We opened ${match.url} in your browser`);
-};
-module.exports = {
-    getSiteLinks,
-    getSiteLinksAsArray,
-    logSiteLinks,
-    openLink,
-};
+    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getEnv)() === 'qa' ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD);
+    (0, open_1.default)(match.getUrl(accountId, baseUrl), { url: true });
+    logger_1.logger.success(`We opened ${match.getUrl(accountId, baseUrl)} in your browser`);
+}

package/lib/oauth.js

@@ -5,7 +5,6 @@ const express = require('express');
 const open = require('open');
 const { OAuth2Manager, } = require('@hubspot/local-dev-lib/models/OAuth2Manager');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { addOauthToAccountConfig } = require('@hubspot/local-dev-lib/oauth');
 const { handleExit } = require('./process');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
@@ -75,8 +74,7 @@ const authorize = async (oauthManager) => {
     });
 };
 const setupOauth = accountConfig => {
-    const id = getAccountIdentifier(accountConfig);
-    const accountId = parseInt(id, 10);
+    const accountId = parseInt(accountConfig.portalId, 10);
     const config = getAccountConfig(accountId) || {};
     return new OAuth2Manager({
         ...accountConfig,

package/lib/prompts/accountsPrompt.js

@@ -1,19 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
-const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiAccountDescription } = require('../ui');
 const mapAccountChoices = portals => portals.map(p => ({
-    name: uiAccountDescription(getAccountIdentifier(p), false),
-    value: p.name || getAccountIdentifier(p),
+    name: uiAccountDescription(p.portalId, false),
+    value: p.name || p.portalId,
 }));
 const i18nKey = 'commands.accounts.subcommands.use';
 const selectAccountFromConfig = async (config, prompt) => {
-    const accountsList = getConfigAccounts();
-    const defaultAccount = getConfigDefaultAccount(config);
     const { default: selectedDefault } = await promptUser([
         {
             type: 'list',
@@ -21,8 +17,8 @@ const selectAccountFromConfig = async (config, prompt) => {
             name: 'default',
             pageSize: 20,
             message: prompt || i18n(`${i18nKey}.promptMessage`),
-            choices: mapAccountChoices(accountsList),
-            default: defaultAccount,
+            choices: mapAccountChoices(config.portals),
+            default: config.defaultPortal,
         },
     ]);
     return selectedDefault;

package/lib/prompts/projectDevTargetAccountPrompt.js

@@ -8,12 +8,11 @@ const { isSandbox } = require('../accountTypes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { getSandboxUsageLimits, } = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const { HUBSPOT_ACCOUNT_TYPES, HUBSPOT_ACCOUNT_TYPE_STRINGS, } = require('@hubspot/local-dev-lib/constants/config');
-const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { fetchDeveloperTestAccounts, } = require('@hubspot/local-dev-lib/api/developerTestAccounts');
 const i18nKey = 'lib.prompts.projectDevTargetAccountPrompt';
 const mapNestedAccount = accountConfig => ({
-    name: uiAccountDescription(getAccountIdentifier(accountConfig), false),
+    name: uiAccountDescription(accountConfig.portalId, false),
     value: {
         targetAccountId: getAccountId(accountConfig.name),
         createNestedAccount: false,
@@ -98,7 +97,7 @@ const selectDeveloperTestTargetAccountPrompt = async (accounts, defaultAccountCo
     }
     const devTestAccounts = [];
     if (devTestAccountsResponse && devTestAccountsResponse.results) {
-        const accountIds = accounts.map(account => getAccountIdentifier(account));
+        const accountIds = accounts.map(account => account.portalId);
         devTestAccountsResponse.results.forEach(acct => {
             const inConfig = accountIds.includes(acct.id);
             devTestAccounts.push({

package/lib/prompts/sandboxesPrompt.js

@@ -5,24 +5,22 @@ const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiAccountDescription } = require('../ui');
 const { HUBSPOT_ACCOUNT_TYPES, } = require('@hubspot/local-dev-lib/constants/config');
-const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { isSandbox } = require('../accountTypes');
-const { getConfigDefaultAccount, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
 const i18nKey = 'lib.prompts.sandboxesPrompt';
 const mapSandboxAccountChoices = portals => portals
     .filter(p => isSandbox(p))
     .map(p => {
     return {
-        name: uiAccountDescription(getAccountIdentifier(p), false),
-        value: p.name || getAccountIdentifier(p),
+        name: uiAccountDescription(p.portalId, false),
+        value: p.name || p.portalId,
     };
 });
 const mapNonSandboxAccountChoices = portals => portals
     .filter(p => !isSandbox(p))
     .map(p => {
     return {
-        name: `${p.name} (${getAccountIdentifier(p)})`,
-        value: p.name || getAccountIdentifier(p),
+        name: `${p.name} (${p.portalId})`,
+        value: p.name || p.portalId,
     };
 });
 const sandboxTypePrompt = () => {
@@ -47,10 +45,9 @@ const sandboxTypePrompt = () => {
     ]);
 };
 const deleteSandboxPrompt = (config, promptParentAccount = false) => {
-    const accountsList = getConfigAccounts();
     const choices = promptParentAccount
-        ? mapNonSandboxAccountChoices(accountsList)
-        : mapSandboxAccountChoices(accountsList);
+        ? mapNonSandboxAccountChoices(config.portals)
+        : mapSandboxAccountChoices(config.portals);
     if (!choices.length) {
         return undefined;
     }
@@ -64,7 +61,7 @@ const deleteSandboxPrompt = (config, promptParentAccount = false) => {
             look: false,
             pageSize: 20,
             choices,
-            default: getConfigDefaultAccount(config),
+            default: config.defaultPortal,
         },
     ]);
 };

package/lib/prompts/setAsDefaultAccountPrompt.js

@@ -1,19 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
-const { getConfig, updateDefaultAccount, getConfigDefaultAccount, } = require('@hubspot/local-dev-lib/config');
+const { getConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const i18nKey = 'lib.prompts.setAsDefaultAccountPrompt';
 const setAsDefaultAccountPrompt = async (accountName) => {
     const config = getConfig();
-    // Accounts for deprecated and new config
-    const defaultAccount = getConfigDefaultAccount(config);
     const { setAsDefault } = await promptUser([
         {
             name: 'setAsDefault',
             type: 'confirm',
-            when: defaultAccount !== accountName,
+            when: config.defaultPortal !== accountName,
             message: i18n(`${i18nKey}.setAsDefaultAccountMessage`),
         },
     ]);

package/lib/sandboxSync.js

@@ -11,7 +11,6 @@ const { debugError, logError, ApiErrorContext, } = require('./errorHandlers/inde
 const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
 const { getSandboxTypeAsString } = require('./sandboxes');
 const { getAccountId } = require('@hubspot/local-dev-lib/config');
-const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { uiAccountDescription, uiLine, uiLink, uiCommandDisabledBanner, } = require('./ui');
 const { isDevelopmentSandbox } = require('./accountTypes');
 const i18nKey = 'lib.sandbox.sync';
@@ -23,10 +22,8 @@ const i18nKey = 'lib.sandbox.sync';
  * @returns
  */
 const syncSandbox = async ({ accountConfig, parentAccountConfig, env, syncTasks, slimInfoMessage = false, }) => {
-    const id = getAccountIdentifier(accountConfig);
-    const accountId = getAccountId(id);
-    const parentId = getAccountIdentifier(parentAccountConfig);
-    const parentAccountId = getAccountId(parentId);
+    const accountId = getAccountId(accountConfig.portalId);
+    const parentAccountId = getAccountId(parentAccountConfig.portalId);
     const isDevSandbox = isDevelopmentSandbox(accountConfig);
     SpinniesManager.init({
         succeedColor: 'white',

package/lib/sandboxes.js

@@ -5,12 +5,11 @@ const { i18n } = require('./lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getSandboxUsageLimits, } = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const { fetchTypes } = require('@hubspot/local-dev-lib/api/sandboxSync');
-const { getAccountId, getEnv, getConfigAccounts, } = require('@hubspot/local-dev-lib/config');
+const { getConfig, getAccountId, getEnv, } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./prompts/promptUtils');
 const { isDevelopmentSandbox } = require('./accountTypes');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { HUBSPOT_ACCOUNT_TYPES, } = require('@hubspot/local-dev-lib/constants/config');
-const { getAccountIdentifier, } = require('@hubspot/local-dev-lib/config/getAccountIdentifier');
 const { uiAccountDescription } = require('./ui');
 const { isMissingScopeError, isSpecifiedError, } = require('@hubspot/local-dev-lib/errors/index');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
@@ -35,10 +34,9 @@ const getSandboxTypeAsString = accountType => {
     return 'standard';
 };
 function getHasSandboxesByType(parentAccountConfig, type) {
-    const id = getAccountIdentifier(parentAccountConfig);
-    const parentPortalId = getAccountId(id);
-    const accountsList = getConfigAccounts();
-    for (const portal of accountsList) {
+    const config = getConfig();
+    const parentPortalId = getAccountId(parentAccountConfig.portalId);
+    for (const portal of config.portals) {
         if ((portal.parentAccountId !== null ||
             portal.parentAccountId !== undefined) &&
             portal.parentAccountId === parentPortalId &&
@@ -56,10 +54,8 @@ function getSandboxLimit(error) {
 }
 // Fetches available sync types for a given sandbox portal
 async function getAvailableSyncTypes(parentAccountConfig, config) {
-    const parentId = getAccountIdentifier(parentAccountConfig);
-    const parentPortalId = getAccountId(parentId);
-    const id = getAccountIdentifier(config);
-    const portalId = getAccountId(id);
+    const parentPortalId = getAccountId(parentAccountConfig.portalId);
+    const portalId = getAccountId(config.portalId);
     const { data: { results: syncTypes }, } = await fetchTypes(parentPortalId, portalId);
     if (!syncTypes) {
         throw new Error('Unable to fetch available sandbox sync types. Please try again.');
@@ -102,8 +98,7 @@ const getSyncTypesWithContactRecordsPrompt = async (accountConfig, syncTasks, sk
  * @returns {null}
  */
 const validateSandboxUsageLimits = async (accountConfig, sandboxType, env) => {
-    const id = getAccountIdentifier(accountConfig);
-    const accountId = getAccountId(id);
+    const accountId = getAccountId(accountConfig.portalId);
     const { data: { usage }, } = await getSandboxUsageLimits(accountId);
     if (!usage) {
         throw new Error('Unable to fetch sandbox usage limits. Please try again.');

package/lib/ui/serverlessFunctionLogs.js

@@ -68,13 +68,17 @@ function processLog(log, options) {
     }
 }
 function isLogsResponse(logsResp) {
-    return ('results' in logsResp &&
+    return (logsResp &&
+        'results' in logsResp &&
         Array.isArray(logsResp.results) &&
-        logsResp.results !== undefined &&
-        logsResp.results.length > 0);
+        logsResp.results !== undefined);
 }
 function processLogs(logsResp, options) {
-    if (isLogsResponse(logsResp)) {
+    const isLogsResp = isLogsResponse(logsResp);
+    if (!logsResp || (isLogsResp && logsResp.results.length === 0)) {
+        return (0, lang_1.i18n)(`${i18nKey}.noLogsFound`);
+    }
+    else if (isLogsResp) {
         return logsResp
             .results.map(log => {
             return processLog(log, options);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "6.3.0-experimental.0",
+    "version": "6.4.0-beta.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -50,6 +50,9 @@
         "ts-node": "^10.9.2",
         "typescript": "^5.6.2"
     },
+    "optionalDependencies": {
+        "@hubspot/cms-dev-server": "^0.18.9"
+    },
     "scripts": {
         "build": "ts-node ./scripts/build.ts",
         "lint": "eslint . && prettier --list-different ./**/*.{js,json}",