@hubspot/cli 7.7.2-experimental.0 → 7.7.4-experimental.0

package/commands/account/auth.d.ts

@@ -1,6 +1,8 @@
 import { CommonArgs, ConfigArgs, YargsCommandModule } from '../../types/Yargs';
 type AccountAuthArgs = CommonArgs & ConfigArgs & {
     disableTracking?: boolean;
+} & {
+    personalAccessKey?: string;
 };
 declare const accountAuthCommand: YargsCommandModule<unknown, AccountAuthArgs>;
 export default accountAuthCommand;

package/commands/account/auth.js

@@ -26,12 +26,14 @@ const TRACKING_STATUS = {
     COMPLETE: 'complete',
 };
 const authType = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
-async function updateConfigWithNewAccount(env, configAlreadyExists, accountId) {
+async function updateConfigWithNewAccount(env, configAlreadyExists, providedPersonalAccessKey, accountId) {
     try {
-        const { personalAccessKey } = await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
-            env,
-            account: accountId,
-        });
+        const { personalAccessKey } = providedPersonalAccessKey
+            ? { personalAccessKey: providedPersonalAccessKey }
+            : await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
+                env,
+                account: accountId,
+            });
         const token = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env);
         const defaultAccountName = token.hubName
             ? (0, text_1.toKebabCase)(token.hubName)
@@ -96,7 +98,7 @@ async function handleConfigMigration() {
 const describe = en_1.commands.account.subcommands.auth.describe;
 const command = 'auth';
 async function handler(args) {
-    const { providedAccountId, disableTracking } = args;
+    const { providedAccountId, disableTracking, personalAccessKey: providedPersonalAccessKey, } = args;
     if (!disableTracking) {
         (0, usageTracking_1.trackCommandUsage)('account-auth', {}, providedAccountId);
         await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.STARTED);
@@ -112,7 +114,7 @@ async function handler(args) {
     }
     (0, config_1.loadConfig)('');
     (0, process_1.handleExit)(config_1.deleteEmptyConfigFile);
-    const updatedConfig = await updateConfigWithNewAccount(args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD, configAlreadyExists, providedAccountId);
+    const updatedConfig = await updateConfigWithNewAccount(args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD, configAlreadyExists, providedPersonalAccessKey, providedAccountId);
     if (!updatedConfig) {
         if (!disableTracking) {
             await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);
@@ -151,6 +153,12 @@ function accountAuthBuilder(yargs) {
             hidden: true,
             default: false,
         },
+        'personal-access-key': {
+            describe: en_1.commands.account.subcommands.auth.options.personalAccessKey,
+            type: 'string',
+            hidden: false,
+            alias: 'pak',
+        },
     });
     return yargs;
 }

package/commands/auth.d.ts

@@ -1,6 +1,8 @@
 import { AccountArgs, CommonArgs, ConfigArgs, TestingArgs, YargsCommandModule } from '../types/Yargs';
 type AuthArgs = CommonArgs & ConfigArgs & TestingArgs & AccountArgs & {
     authType?: string;
+} & {
+    personalAccessKey?: string;
 };
 declare const authCommand: YargsCommandModule<unknown, AuthArgs>;
 export default authCommand;

package/commands/auth.js

@@ -20,6 +20,7 @@ const oauth_1 = require("../lib/oauth");
 const exitCodes_1 = require("../lib/enums/exitCodes");
 const ui_1 = require("../lib/ui");
 const index_1 = require("../lib/errorHandlers/index");
+const en_1 = require("../lang/en");
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -33,7 +34,7 @@ const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = (0, text_1.commaSeparatedValues)
 const command = 'auth';
 const describe = (0, lang_1.i18n)('commands.auth.describe');
 async function handler(args) {
-    const { authType: authTypeFlagValue, config: configFlagValue, qa, providedAccountId, } = args;
+    const { authType: authTypeFlagValue, config: configFlagValue, qa, providedAccountId, personalAccessKey: providedPersonalAccessKey, } = args;
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     (0, commonOpts_1.setLogLevel)(args);
@@ -68,14 +69,16 @@ async function handler(args) {
             successAuthMethod = auth_1.OAUTH_AUTH_METHOD.name;
             break;
         case auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
-            configData = await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
-                env,
-                account: providedAccountId,
-            });
+            const { personalAccessKey } = providedPersonalAccessKey
+                ? { personalAccessKey: providedPersonalAccessKey }
+                : await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
+                    env,
+                    account: providedAccountId,
+                });
             try {
-                token = await (0, personalAccessKey_1.getAccessToken)(configData.personalAccessKey, env);
+                token = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env);
                 defaultName = token.hubName ? (0, text_1.toKebabCase)(token.hubName) : undefined;
-                updatedConfig = await (0, personalAccessKey_1.updateConfigWithAccessToken)(token, configData.personalAccessKey, env);
+                updatedConfig = await (0, personalAccessKey_1.updateConfigWithAccessToken)(token, personalAccessKey, env);
             }
             catch (e) {
                 (0, index_1.logError)(e);
@@ -108,7 +111,7 @@ async function handler(args) {
         await (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.ERROR, providedAccountId);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const nameFromConfigData = 'name' in configData ? configData.name : undefined;
+    const nameFromConfigData = configData && 'name' in configData ? configData.name : undefined;
     const accountName = (updatedConfig && updatedConfig.name) || validName || nameFromConfigData;
     await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(accountName);
     logger_1.logger.success((0, lang_1.i18n)('commands.auth.success.configFileUpdated', {
@@ -141,6 +144,12 @@ function authBuilder(yargs) {
             type: 'string',
             alias: 'a',
         },
+        'personal-access-key': {
+            describe: en_1.commands.auth.options.personalAccessKey.describe,
+            type: 'string',
+            hidden: false,
+            alias: 'pak',
+        },
     });
     return yargs;
 }

package/commands/hubdb/list.d.ts

@@ -0,0 +1,4 @@
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type HubdbListArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs;
+declare const hubdbListCommand: YargsCommandModule<unknown, HubdbListArgs>;
+export default hubdbListCommand;

package/commands/hubdb/list.js

@@ -0,0 +1,83 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const hubdb_1 = require("@hubspot/local-dev-lib/api/hubdb");
+const config_1 = require("@hubspot/local-dev-lib/config");
+const urls_1 = require("@hubspot/local-dev-lib/urls");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const logger_1 = require("../../lib/ui/logger");
+const index_1 = require("../../lib/errorHandlers/index");
+const en_1 = require("../../lang/en");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const usageTracking_1 = require("../../lib/usageTracking");
+const table_1 = require("../../lib/ui/table");
+const command = ['list', 'ls'];
+const describe = en_1.commands.hubdb.subcommands.list.describe;
+async function getTableData(accountId) {
+    try {
+        const response = await (0, hubdb_1.fetchTables)(accountId);
+        return response.data;
+    }
+    catch (err) {
+        (0, index_1.logError)(err);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+}
+// stripping the types and unnecessary fields so this data can be turned into a UI table
+function mapTablesToUI(tables) {
+    return tables.map(({ id, label, name, columnCount, rowCount }) => [
+        `${id}`,
+        label,
+        name,
+        `${columnCount || 0}`,
+        `${rowCount}`,
+    ]);
+}
+async function handler(args) {
+    const { derivedAccountId } = args;
+    (0, usageTracking_1.trackCommandUsage)('hubdb-list', {}, derivedAccountId);
+    const { results: tables, total } = await getTableData(derivedAccountId);
+    const tableUIData = mapTablesToUI(tables);
+    tableUIData.unshift((0, table_1.getTableHeader)([
+        en_1.commands.hubdb.subcommands.list.labels.id,
+        en_1.commands.hubdb.subcommands.list.labels.label,
+        en_1.commands.hubdb.subcommands.list.labels.name,
+        en_1.commands.hubdb.subcommands.list.labels.columns,
+        en_1.commands.hubdb.subcommands.list.labels.rows,
+    ]));
+    logger_1.uiLogger.success(en_1.commands.hubdb.subcommands.list.success(derivedAccountId));
+    logger_1.uiLogger.log(' ');
+    // link devs to the hubdb page in hubspot for easy access
+    // TODO: This is hacky, we should make a util like getBaseUrl()
+    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getEnv)());
+    logger_1.uiLogger.log(en_1.commands.hubdb.subcommands.list.viewTablesLink(baseUrl, derivedAccountId));
+    // don't bother showing an empty list of tables
+    if (tables.length > 0) {
+        // if truncated is 0, it will be interpreted as falsy
+        const truncated = total - tables.length;
+        logger_1.uiLogger.log(en_1.commands.hubdb.subcommands.list.tablesDisplayed(tables.length, total, truncated));
+        logger_1.uiLogger.log('--------------------------------');
+        logger_1.uiLogger.log(en_1.commands.hubdb.subcommands.list.tables);
+        logger_1.uiLogger.log((0, table_1.getTableContents)(tableUIData, { border: { bodyLeft: '  ' } }));
+    }
+    else {
+        logger_1.uiLogger.log(en_1.commands.hubdb.subcommands.list.noTables(derivedAccountId));
+    }
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function hubdbListBuilder(yargs) {
+    yargs.example([['$0 hubdb list']]);
+    return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(hubdbListBuilder, command, describe, {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+const hubdbListCommand = {
+    command,
+    describe,
+    handler,
+    builder,
+};
+exports.default = hubdbListCommand;

package/commands/hubdb.js

@@ -8,6 +8,7 @@ const create_1 = __importDefault(require("./hubdb/create"));
 const fetch_1 = __importDefault(require("./hubdb/fetch"));
 const delete_1 = __importDefault(require("./hubdb/delete"));
 const clear_1 = __importDefault(require("./hubdb/clear"));
+const list_1 = __importDefault(require("./hubdb/list"));
 const lang_1 = require("../lib/lang");
 const yargsUtils_1 = require("../lib/yargsUtils");
 exports.command = 'hubdb';
@@ -18,6 +19,7 @@ function hubdbBuilder(yargs) {
         .command(create_1.default)
         .command(fetch_1.default)
         .command(delete_1.default)
+        .command(list_1.default)
         .demandCommand(1, '');
     return yargs;
 }

package/commands/project/dev/unifiedFlow.js

@@ -24,6 +24,7 @@ const accountTypes_1 = require("../../../lib/accountTypes");
 const ui_1 = require("../../../lib/ui");
 const logger_1 = require("../../../lib/ui/logger");
 const en_1 = require("../../../lang/en");
+const LocalDevWebsocketServer_1 = __importDefault(require("../../../lib/projects/localDev/LocalDevWebsocketServer"));
 async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTargetTestingAccountId, projectConfig, projectDir, profileConfig, }) {
     const env = (0, environment_1.getValidEnv)((0, config_2.getEnv)(targetProjectAccountId));
     let projectNodes;
@@ -131,23 +132,20 @@ async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTar
     await localDevProcess.start();
     const watcher = new LocalDevWatcher_1.default(localDevProcess);
     watcher.start();
-    // const websocketServer = new LocalDevWebsocketServer(
-    //   localDevProcess,
-    //   args.debug
-    // );
-    // await websocketServer.start();
+    const websocketServer = new LocalDevWebsocketServer_1.default(localDevProcess, args.debug);
+    await websocketServer.start();
     (0, process_1.handleKeypress)(async (key) => {
         if ((key.ctrl && key.name === 'c') || key.name === 'q') {
             await Promise.all([
                 localDevProcess.stop(),
                 watcher.stop(),
-                // websocketServer.shutdown(),
+                websocketServer.shutdown(),
             ]);
         }
     });
     (0, process_1.handleExit)(({ isSIGHUP }) => {
         localDevProcess.stop(!isSIGHUP);
         watcher.stop();
-        // websocketServer.shutdown();
+        websocketServer.shutdown();
     });
 }

package/lang/en.d.ts

@@ -26,6 +26,7 @@ The authentication method is ${string}, which is an access token tied to a speci
 Global configuration replaces hubspot.config.yml, and you will be prompted to migrate your existing config if one exists.`;
                 readonly options: {
                     readonly account: "HubSpot account to authenticate";
+                    readonly personalAccessKey: "Enter existing personal access key";
                 };
                 readonly errors: {
                     readonly failedToUpdateConfig: "Failed to update the configuration file. Please try again.";
@@ -153,6 +154,9 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
             readonly account: {
                 readonly describe: "HubSpot account to authenticate";
             };
+            readonly personalAccessKey: {
+                readonly describe: "Enter existing personal access key";
+            };
         };
         readonly success: {
             readonly configFileUpdated: (accountName: string, configFilename: string, authType: string) => string;
@@ -665,6 +669,21 @@ Global configuration replaces hubspot.config.yml, and you will be prompted to mi
                     readonly fetch: (tableId: string, path: string) => string;
                 };
             };
+            readonly list: {
+                readonly tables: `${string}:`;
+                readonly describe: "List HubDB tables.";
+                readonly labels: {
+                    readonly label: "Label";
+                    readonly id: "ID";
+                    readonly name: "Name";
+                    readonly columns: "Columns";
+                    readonly rows: "Rows";
+                };
+                readonly success: (accountId: number) => string;
+                readonly noTables: (accountId: number) => string;
+                readonly tablesDisplayed: (displayed: number, total: number, truncated?: number) => string;
+                readonly viewTablesLink: (baseUrl: string, accountId: number) => string;
+            };
         };
     };
     readonly init: {
@@ -2258,6 +2277,7 @@ export declare const lib: {
         readonly running: (projectName: string, accountIdentifier: string) => string;
         readonly quitHelper: `Press ${string} to stop the local dev server`;
         readonly viewProjectLink: (name: string, accountId: number) => string;
+        readonly viewLocalDevUILink: (accountId: number) => string;
         readonly viewTestAccountLink: "View developer test account in HubSpot";
         readonly exitingStart: "Stopping local dev server ...";
         readonly exitingSucceed: "Successfully exited";
@@ -2664,11 +2684,14 @@ Run ${string} to upgrade to version ${string}`;
             readonly enterAccountId: "Enter the account ID for your account (the number under the DOMAIN column at https://app.hubspot.com/myaccounts-beta ): ";
             readonly enterClientId: "Enter your OAuth2 client ID: ";
             readonly enterClientSecret: "Enter your OAuth2 client secret: ";
-            readonly enterPersonalAccessKey: "Enter your personal access key: ";
+            readonly enterPersonalAccessKey: "[--personal-access-key] Enter your personal access key: ";
             readonly selectScopes: "Select access scopes (see https://developers.hubspot.com/docs/methods/oauth2/initiate-oauth-integration#scopes)";
             readonly personalAccessKeySetupTitle: "HubSpot Personal Access Key Setup";
-            readonly personalAccessKeyBrowserOpenPrep: "A personal access key is required to authenticate the CLI to interact with your HubSpot account. We'll open a secure page in your default browser where you can view and copy your personal access key.";
-            readonly personalAccessKeyBrowserOpenPrompt: "Open HubSpot to copy your personal access key?";
+            readonly personalAccessKeyBrowserOpenPrep: "A personal access key is required to authenticate the CLI to interact with your HubSpot account.";
+            readonly personalAccessKeyPromptChoices: {
+                readonly OPEN_BROWSER: "Open HubSpot to copy your personal access key";
+                readonly PASTE_EXISTING: "Enter existing personal access key";
+            };
             readonly logs: {
                 readonly openingWebBrowser: (url: string) => string;
             };

package/lang/en.js

@@ -36,6 +36,7 @@ exports.commands = {
                 verboseDescribe: `Configure authentication for a HubSpot account. This will create or update the global config file at ${config_1.GLOBAL_CONFIG_PATH} that stores your account information.\n\nThe authentication method is ${chalk_1.default.bold(auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value)}, which is an access token tied to a specific user account.\n\nGlobal configuration replaces ${config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}, and you will be prompted to migrate your existing config if one exists.`,
                 options: {
                     account: 'HubSpot account to authenticate',
+                    personalAccessKey: 'Enter existing personal access key',
                 },
                 errors: {
                     failedToUpdateConfig: 'Failed to update the configuration file. Please try again.',
@@ -163,6 +164,9 @@ exports.commands = {
             account: {
                 describe: 'HubSpot account to authenticate',
             },
+            personalAccessKey: {
+                describe: 'Enter existing personal access key',
+            },
         },
         success: {
             configFileUpdated: (accountName, configFilename, authType) => `Account "${accountName}" updated in ${configFilename} using "${authType}"`,
@@ -675,6 +679,23 @@ exports.commands = {
                     fetch: (tableId, path) => `Downloaded HubDB table ${tableId} to ${path}`,
                 },
             },
+            list: {
+                tables: `${chalk_1.default.bold('Tables')}:`,
+                describe: 'List HubDB tables.',
+                labels: {
+                    label: 'Label',
+                    id: 'ID',
+                    name: 'Name',
+                    columns: 'Columns',
+                    rows: 'Rows',
+                },
+                success: (accountId) => `Showing tables for account ${accountId}:`,
+                noTables: (accountId) => `No tables found for account ${accountId}.`,
+                tablesDisplayed: (displayed, total, truncated) => `Displaying ${displayed} of ${total} tables${truncated
+                    ? `, the remaining ${truncated} tables were not displayed.`
+                    : '.'}`,
+                viewTablesLink: (baseUrl, accountId) => (0, ui_1.uiLink)('Manage tables in HubSpot', `${baseUrl}/hubdb/${accountId}`),
+            },
         },
     },
     init: {
@@ -2257,6 +2278,7 @@ exports.lib = {
         running: (projectName, accountIdentifier) => chalk_1.default.hex(ui_1.UI_COLORS.SORBET)(`Running ${chalk_1.default.bold(projectName)} locally on ${accountIdentifier}, waiting for changes ...`),
         quitHelper: `Press ${chalk_1.default.bold('q')} to stop the local dev server`,
         viewProjectLink: (name, accountId) => (0, ui_1.uiLink)('View project in HubSpot', (0, urls_1.getProjectDetailUrl)(name, accountId) || ''),
+        viewLocalDevUILink: (accountId) => (0, ui_1.uiLink)('View local dev session in HubSpot', (0, urls_1.getLocalDevUiUrl)(accountId)),
         viewTestAccountLink: 'View developer test account in HubSpot',
         exitingStart: 'Stopping local dev server ...',
         exitingSucceed: 'Successfully exited',
@@ -2660,11 +2682,14 @@ exports.lib = {
             enterAccountId: 'Enter the account ID for your account (the number under the DOMAIN column at https://app.hubspot.com/myaccounts-beta ): ',
             enterClientId: 'Enter your OAuth2 client ID: ',
             enterClientSecret: 'Enter your OAuth2 client secret: ',
-            enterPersonalAccessKey: 'Enter your personal access key: ',
+            enterPersonalAccessKey: '[--personal-access-key] Enter your personal access key: ',
             selectScopes: 'Select access scopes (see https://developers.hubspot.com/docs/methods/oauth2/initiate-oauth-integration#scopes)',
             personalAccessKeySetupTitle: 'HubSpot Personal Access Key Setup',
-            personalAccessKeyBrowserOpenPrep: "A personal access key is required to authenticate the CLI to interact with your HubSpot account. We'll open a secure page in your default browser where you can view and copy your personal access key.",
-            personalAccessKeyBrowserOpenPrompt: 'Open HubSpot to copy your personal access key?',
+            personalAccessKeyBrowserOpenPrep: 'A personal access key is required to authenticate the CLI to interact with your HubSpot account.',
+            personalAccessKeyPromptChoices: {
+                OPEN_BROWSER: 'Open HubSpot to copy your personal access key',
+                PASTE_EXISTING: 'Enter existing personal access key',
+            },
             logs: {
                 openingWebBrowser: (url) => `Opening ${url} in your web browser`,
             },

package/lib/projects/localDev/LocalDevLogger.js

@@ -101,6 +101,7 @@ class LocalDevLogger {
         logger_2.uiLogger.log('');
         logger_2.uiLogger.log(en_1.lib.LocalDevManager.running(this.state.projectConfig.name, (0, ui_1.uiAccountDescription)(this.state.targetProjectAccountId)));
         logger_2.uiLogger.log(en_1.lib.LocalDevManager.viewProjectLink(this.state.projectConfig.name, this.state.targetProjectAccountId));
+        logger_2.uiLogger.log(en_1.lib.LocalDevManager.viewLocalDevUILink(this.state.targetTestingAccountId));
         logger_2.uiLogger.log('');
         logger_2.uiLogger.log(en_1.lib.LocalDevManager.quitHelper);
         (0, ui_1.uiLine)();

package/lib/projects/localDev/LocalDevWebsocketServer.js

@@ -13,8 +13,8 @@ class LocalDevWebsocketServer {
     debug;
     localDevProcess;
     ALLOWED_ORIGINS = [
-        'https://hubspot.com',
-        'https://hubspotqa.com',
+        'https://app.hubspot.com',
+        'https://app.hubspotqa.com',
         'https://local.hubspot.com',
         'https://local.hubspotqa.com',
     ];

package/lib/projects/urls.d.ts

@@ -3,3 +3,4 @@ export declare function getProjectSettingsUrl(projectName: string, accountId: nu
 export declare function getProjectActivityUrl(projectName: string, accountId: number): string;
 export declare function getProjectBuildDetailUrl(projectName: string, buildId: number, accountId: number): string;
 export declare function getProjectDeployDetailUrl(projectName: string, deployId: number, accountId: number): string;
+export declare function getLocalDevUiUrl(accountId: number): string;

package/lib/projects/urls.js

@@ -5,12 +5,15 @@ exports.getProjectSettingsUrl = getProjectSettingsUrl;
 exports.getProjectActivityUrl = getProjectActivityUrl;
 exports.getProjectBuildDetailUrl = getProjectBuildDetailUrl;
 exports.getProjectDeployDetailUrl = getProjectDeployDetailUrl;
+exports.getLocalDevUiUrl = getLocalDevUiUrl;
 const urls_1 = require("@hubspot/local-dev-lib/urls");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
+function getBaseUrl(accountId) {
+    return (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getEnv)(accountId) === 'qa' ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD);
+}
 function getProjectHomeUrl(accountId) {
-    const baseUrl = (0, urls_1.getHubSpotWebsiteOrigin)((0, config_1.getEnv)(accountId) === 'qa' ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD);
-    return `${baseUrl}/developer-projects/${accountId}`;
+    return `${getBaseUrl(accountId)}/developer-projects/${accountId}`;
 }
 function getProjectDetailUrl(projectName, accountId) {
     if (!projectName)
@@ -31,3 +34,6 @@ function getProjectBuildDetailUrl(projectName, buildId, accountId) {
 function getProjectDeployDetailUrl(projectName, deployId, accountId) {
     return `${getProjectActivityUrl(projectName, accountId)}/deploy/${deployId}`;
 }
+function getLocalDevUiUrl(accountId) {
+    return `${getBaseUrl(accountId)}/developer-projects-local-dev/${accountId}`;
+}

package/lib/prompts/personalAccessKeyPrompt.js

@@ -12,9 +12,9 @@ const urls_1 = require("@hubspot/local-dev-lib/urls");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const promptUtils_1 = require("./promptUtils");
 const accountNamePrompt_1 = require("./accountNamePrompt");
-const lang_1 = require("../lang");
 const ui_1 = require("../ui");
 const exitCodes_1 = require("../enums/exitCodes");
+const en_1 = require("../../lang/en");
 /**
  * Displays notification to user that we are about to open the browser,
  * then opens their browser to the personal-access-key shortlink
@@ -23,24 +23,26 @@ async function personalAccessKeyPrompt({ env, account, }) {
     const websiteOrigin = (0, urls_1.getHubSpotWebsiteOrigin)(env);
     let url = `${websiteOrigin}/l/personal-access-key`;
     if (process.env.BROWSER !== 'none') {
-        (0, ui_1.uiInfoSection)((0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.personalAccessKeySetupTitle`), () => {
-            logger_1.logger.log((0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.personalAccessKeyBrowserOpenPrep`));
+        (0, ui_1.uiInfoSection)(en_1.lib.prompts.personalAccessKeyPrompt.personalAccessKeySetupTitle, () => {
+            logger_1.logger.log(en_1.lib.prompts.personalAccessKeyPrompt.personalAccessKeyBrowserOpenPrep);
         });
         if (account) {
             url = `${websiteOrigin}/personal-access-key/${account}`;
         }
-        const { personalAcessKeyBrowserOpenPrep: shouldOpen } = await (0, promptUtils_1.promptUser)([
+        const { personalAcessKeyBrowserOpenPrep: choice } = await (0, promptUtils_1.promptUser)([
             PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP,
         ]);
-        if (shouldOpen) {
-            (0, open_1.default)(url, { url: true });
-        }
-        else {
+        if (!choice) {
             (0, config_1.deleteEmptyConfigFile)();
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
+        if (choice ===
+            en_1.lib.prompts.personalAccessKeyPrompt.personalAccessKeyPromptChoices
+                .OPEN_BROWSER) {
+            (0, open_1.default)(url, { url: true });
+            logger_1.logger.log(en_1.lib.prompts.personalAccessKeyPrompt.logs.openingWebBrowser(url));
+        }
     }
-    logger_1.logger.log((0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.logs.openingWebBrowser`, { url }));
     const { personalAccessKey } = await (0, promptUtils_1.promptUser)(PERSONAL_ACCESS_KEY);
     return {
         personalAccessKey,
@@ -49,52 +51,59 @@ async function personalAccessKeyPrompt({ env, account, }) {
 }
 const ACCOUNT_ID = {
     name: 'accountId',
-    message: (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.enterAccountId`),
+    message: en_1.lib.prompts.personalAccessKeyPrompt.enterAccountId,
     type: 'number',
     validate(val) {
         if (!Number.isNaN(val) && val !== undefined && val > 0) {
             return true;
         }
-        return (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.errors.invalidAccountId`);
+        return en_1.lib.prompts.personalAccessKeyPrompt.errors.invalidAccountId;
     },
 };
 const CLIENT_ID = {
     name: 'clientId',
-    message: (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.enterClientId`),
+    message: en_1.lib.prompts.personalAccessKeyPrompt.enterClientId,
     validate(val) {
         if (typeof val !== 'string') {
-            return (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.errors.invalidOauthClientId`);
+            return en_1.lib.prompts.personalAccessKeyPrompt.errors.invalidOauthClientId;
         }
         else if (val.length !== 36) {
-            return (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.errors.invalidOauthClientIdLength`);
+            return en_1.lib.prompts.personalAccessKeyPrompt.errors
+                .invalidOauthClientIdLength;
         }
         return true;
     },
 };
 const CLIENT_SECRET = {
     name: 'clientSecret',
-    message: (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.enterClientSecret`),
+    message: en_1.lib.prompts.personalAccessKeyPrompt.enterClientSecret,
     validate(val) {
         if (typeof val !== 'string') {
-            return (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.errors.invalidOauthClientSecret`);
+            return en_1.lib.prompts.personalAccessKeyPrompt.errors
+                .invalidOauthClientSecret;
         }
         else if (val.length !== 36) {
-            return (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.errors.invalidOauthClientSecretLength`);
+            return en_1.lib.prompts.personalAccessKeyPrompt.errors
+                .invalidOauthClientSecretLength;
         }
         else if (val[0] === '*') {
-            return (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.errors.invalidOauthClientSecretCopy`);
+            return en_1.lib.prompts.personalAccessKeyPrompt.errors
+                .invalidOauthClientSecretCopy;
         }
         return true;
     },
 };
 const PERSONAL_ACCESS_KEY_BROWSER_OPEN_PREP = {
     name: 'personalAcessKeyBrowserOpenPrep',
-    type: 'confirm',
-    message: (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.personalAccessKeyBrowserOpenPrompt`),
+    type: 'list',
+    message: 'Choose your preferred method of authentication',
+    choices: Object.values(en_1.lib.prompts.personalAccessKeyPrompt.personalAccessKeyPromptChoices),
+    default: en_1.lib.prompts.personalAccessKeyPrompt.personalAccessKeyPromptChoices
+        .OPEN_BROWSER,
 };
 const PERSONAL_ACCESS_KEY = {
     name: 'personalAccessKey',
-    message: (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.enterPersonalAccessKey`),
+    message: en_1.lib.prompts.personalAccessKeyPrompt.enterPersonalAccessKey,
     transformer: (val) => {
         if (!val)
             return val;
@@ -106,10 +115,12 @@ const PERSONAL_ACCESS_KEY = {
     },
     validate(val) {
         if (!val || typeof val !== 'string') {
-            return (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.errors.invalidPersonalAccessKey`);
+            return en_1.lib.prompts.personalAccessKeyPrompt.errors
+                .invalidPersonalAccessKey;
         }
         else if (val[0] === '•') {
-            return (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.errors.invalidPersonalAccessKeyCopy`);
+            return en_1.lib.prompts.personalAccessKeyPrompt.errors
+                .invalidPersonalAccessKeyCopy;
         }
         return true;
     },
@@ -117,7 +128,7 @@ const PERSONAL_ACCESS_KEY = {
 const SCOPES = {
     type: 'checkbox',
     name: 'scopes',
-    message: (0, lang_1.i18n)(`lib.prompts.personalAccessKeyPrompt.selectScopes`),
+    message: en_1.lib.prompts.personalAccessKeyPrompt.selectScopes,
     default: [...auth_1.DEFAULT_OAUTH_SCOPES],
     choices: [...auth_1.OAUTH_SCOPES],
 };

package/package.json

@@ -1,13 +1,13 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.7.2-experimental.0",
+    "version": "7.7.4-experimental.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
         "@hubspot/local-dev-lib": "3.7.1",
-        "@hubspot/project-parsing-lib": "0.3.1-beta.0",
-        "@hubspot/serverless-dev-runtime": "7.0.2",
+        "@hubspot/project-parsing-lib": "0.3.2-beta.0",
+        "@hubspot/serverless-dev-runtime": "7.0.6",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.9.2",
         "archiver": "7.0.1",