@hubspot/cli 7.5.2-experimental.0 → 7.5.3-beta.0

package/commands/project/dev/deprecatedFlow.js

@@ -13,13 +13,12 @@ const lang_1 = require("../../../lib/lang");
 const exitCodes_1 = require("../../../lib/enums/exitCodes");
 const ui_1 = require("../../../lib/ui");
 const SpinniesManager_1 = __importDefault(require("../../../lib/ui/SpinniesManager"));
-const LocalDevManager_1 = __importDefault(require("../../../lib/LocalDevManager"));
-const localDev_1 = require("../../../lib/localDev");
+const LocalDevManager_1 = __importDefault(require("../../../lib/projects/localDev/LocalDevManager"));
+const helpers_1 = require("../../../lib/projects/localDev/helpers");
 const process_1 = require("../../../lib/process");
 const accountTypes_1 = require("../../../lib/accountTypes");
-const projects_1 = require("../../../lib/projects");
-const i18nKey = 'commands.project.subcommands.dev';
-async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, projectDir) {
+const ensureProjectExists_1 = require("../../../lib/projects/ensureProjectExists");
+async function deprecatedProjectDevFlow({ args, accountId, projectConfig, projectDir, }) {
     const { providedAccountId, derivedAccountId } = args;
     const env = (0, environment_1.getValidEnv)((0, config_1.getEnv)(derivedAccountId));
     const components = await (0, structure_1.findProjectComponents)(projectDir);
@@ -27,26 +26,43 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
     const componentTypes = (0, structure_1.getProjectComponentTypes)(runnableComponents);
     const hasPrivateApps = !!componentTypes[Projects_1.ComponentTypes.PrivateApp];
     const hasPublicApps = !!componentTypes[Projects_1.ComponentTypes.PublicApp];
+    const accountConfig = (0, config_1.getAccountConfig)(accountId);
+    if (!accountConfig) {
+        logger_1.logger.error((0, lang_1.i18n)('commands.project.subcommands.dev.errors.noAccount', {
+            accountId: accountId,
+            authCommand: (0, ui_1.uiCommandReference)('hs auth'),
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     if (runnableComponents.length === 0) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noRunnableComponents`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noRunnableComponents`, {
             projectDir,
             command: (0, ui_1.uiCommandReference)('hs project add'),
         }));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     else if (hasPrivateApps && hasPublicApps) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.invalidProjectComponents`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.invalidProjectComponents`));
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     const accounts = (0, config_1.getConfigAccounts)();
     if (!accounts) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noAccountsInConfig`, {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noAccountsInConfig`, {
             authCommand: (0, ui_1.uiCommandReference)('hs auth'),
         }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const defaultAccountIsRecommendedType = (0, accountTypes_1.isDeveloperTestAccount)(accountConfig) ||
-        (!hasPublicApps && (0, accountTypes_1.isSandbox)(accountConfig));
+    let bypassRecommendedAccountPrompt = false;
+    if ((0, accountTypes_1.isDeveloperTestAccount)(accountConfig)) {
+        bypassRecommendedAccountPrompt = true;
+    }
+    else if (!hasPublicApps && (0, accountTypes_1.isSandbox)(accountConfig)) {
+        bypassRecommendedAccountPrompt = true;
+    }
+    else if (!hasPublicApps) {
+        const defaultAccountHasSandboxes = await (0, helpers_1.hasSandboxes)(accountConfig);
+        bypassRecommendedAccountPrompt = !defaultAccountHasSandboxes;
+    }
     // targetProjectAccountId and targetTestingAccountId are set to null if --account flag is not provided.
     // By setting them to null, we can later check if they need to be assigned based on the default account configuration and the type of app.
     let targetProjectAccountId = providedAccountId ? derivedAccountId : null;
@@ -54,20 +70,20 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
     let targetTestingAccountId = providedAccountId ? derivedAccountId : null;
     // Check that the default account or flag option is valid for the type of app in this project
     if (providedAccountId) {
-        (0, localDev_1.checkIfAccountFlagIsSupported)(accountConfig, hasPublicApps);
+        (0, helpers_1.checkIfAccountFlagIsSupported)(accountConfig, hasPublicApps);
         if (hasPublicApps) {
             targetProjectAccountId = accountConfig.parentAccountId || null;
         }
     }
     else {
-        (0, localDev_1.checkIfDefaultAccountIsSupported)(accountConfig, hasPublicApps);
+        await (0, helpers_1.checkIfDefaultAccountIsSupported)(accountConfig, hasPublicApps);
     }
     // The user is targeting an account type that we recommend developing on
-    if (!targetProjectAccountId && defaultAccountIsRecommendedType) {
+    if (!targetProjectAccountId && bypassRecommendedAccountPrompt) {
         targetTestingAccountId = derivedAccountId;
-        await (0, localDev_1.confirmDefaultAccountIsTarget)(accountConfig);
+        await (0, helpers_1.confirmDefaultAccountIsTarget)(accountConfig);
         if (hasPublicApps) {
-            (0, localDev_1.checkIfParentAccountIsAuthed)(accountConfig);
+            (0, helpers_1.checkIfParentAccountIsAuthed)(accountConfig);
             targetProjectAccountId = accountConfig.parentAccountId || null;
         }
         else {
@@ -77,34 +93,33 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
     let createNewSandbox = false;
     let createNewDeveloperTestAccount = false;
     if (!targetProjectAccountId) {
-        const { targetAccountId, parentAccountId, createNestedAccount, notInConfigAccount, } = await (0, localDev_1.suggestRecommendedNestedAccount)(accounts, accountConfig, hasPublicApps);
+        const { targetAccountId, parentAccountId, createNestedAccount, notInConfigAccount, } = await (0, helpers_1.suggestRecommendedNestedAccount)(accounts, accountConfig, hasPublicApps);
         targetProjectAccountId = hasPublicApps
             ? parentAccountId || null
             : targetAccountId;
         targetTestingAccountId = targetAccountId;
         // Only used for developer test accounts that are not yet in the config
         if (notInConfigAccount) {
-            await (0, localDev_1.useExistingDevTestAccount)(env, notInConfigAccount);
+            await (0, helpers_1.useExistingDevTestAccount)(env, notInConfigAccount);
         }
-        createNewSandbox = (0, accountTypes_1.isStandardAccount)(accountConfig) && createNestedAccount;
-        createNewDeveloperTestAccount =
-            (0, accountTypes_1.isAppDeveloperAccount)(accountConfig) && createNestedAccount;
+        createNewSandbox = hasPrivateApps && createNestedAccount;
+        createNewDeveloperTestAccount = hasPublicApps && createNestedAccount;
     }
     if (createNewSandbox) {
-        targetProjectAccountId = await (0, localDev_1.createSandboxForLocalDev)(derivedAccountId, accountConfig, env);
+        targetProjectAccountId = await (0, helpers_1.createSandboxForLocalDev)(derivedAccountId, accountConfig, env);
         // We will be running our tests against this new sandbox account
         targetTestingAccountId = targetProjectAccountId;
     }
     if (createNewDeveloperTestAccount) {
-        targetTestingAccountId = await (0, localDev_1.createDeveloperTestAccountForLocalDev)(derivedAccountId, accountConfig, env);
+        targetTestingAccountId = await (0, helpers_1.createDeveloperTestAccountForLocalDev)(derivedAccountId, accountConfig, env);
         targetProjectAccountId = derivedAccountId;
     }
     if (!targetProjectAccountId || !targetTestingAccountId) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noAccount`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.dev.errors.noAccount`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     // eslint-disable-next-line prefer-const
-    let { projectExists, project } = await (0, projects_1.ensureProjectExists)(targetProjectAccountId, projectConfig.name, {
+    let { projectExists, project } = await (0, ensureProjectExists_1.ensureProjectExists)(targetProjectAccountId, projectConfig.name, {
         allowCreate: false,
         noLogs: true,
         withPolling: createNewSandbox,
@@ -117,8 +132,8 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
         isGithubLinked = Boolean(project.sourceIntegration && project.sourceIntegration.source === 'GITHUB');
     }
     else {
-        project = await (0, localDev_1.createNewProjectForLocalDev)(projectConfig, targetProjectAccountId, createNewSandbox, hasPublicApps);
-        deployedBuild = await (0, localDev_1.createInitialBuildForNewProject)(projectConfig, projectDir, targetProjectAccountId);
+        project = await (0, helpers_1.createNewProjectForLocalDev)(projectConfig, targetProjectAccountId, createNewSandbox, hasPublicApps);
+        deployedBuild = await (0, helpers_1.createInitialBuildForNewProject)(projectConfig, projectDir, targetProjectAccountId);
     }
     const LocalDev = new LocalDevManager_1.default({
         runnableComponents,

package/commands/project/dev/index.d.ts

@@ -1,6 +1,5 @@
-import { ArgumentsCamelCase, Argv } from 'yargs';
+import { Argv, CommandModule } from 'yargs';
 import { ProjectDevArgs } from '../../../types/Yargs';
-export declare const command = "dev";
-export declare const describe: string;
-export declare function handler(args: ArgumentsCamelCase<ProjectDevArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ProjectDevArgs>;
+export declare const builder: (yargs: Argv) => Promise<Argv<ProjectDevArgs>>;
+declare const projectDevCommand: CommandModule<unknown, ProjectDevArgs>;
+export default projectDevCommand;

package/commands/project/dev/index.js

@@ -1,52 +1,122 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
-exports.handler = handler;
-exports.builder = builder;
-const commonOpts_1 = require("../../../lib/commonOpts");
+exports.builder = void 0;
 const usageTracking_1 = require("../../../lib/usageTracking");
-const lang_1 = require("../../../lib/lang");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
-const projects_1 = require("../../../lib/projects");
+const config_2 = require("../../../lib/projects/config");
 const exitCodes_1 = require("../../../lib/enums/exitCodes");
 const ui_1 = require("../../../lib/ui");
 const deprecatedFlow_1 = require("./deprecatedFlow");
 const unifiedFlow_1 = require("./unifiedFlow");
 const buildAndDeploy_1 = require("../../../lib/projects/buildAndDeploy");
-const i18nKey = 'commands.project.subcommands.dev';
-exports.command = 'dev';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
-async function handler(args) {
-    const { derivedAccountId } = args;
-    const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
-    (0, usageTracking_1.trackCommandUsage)('project-dev', {}, derivedAccountId);
-    const { projectConfig, projectDir } = await (0, projects_1.getProjectConfig)();
-    (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.logs.betaMessage`));
-    logger_1.logger.log((0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.logs.learnMoreLocalDevServer`), 'https://developers.hubspot.com/docs/platform/project-cli-commands#start-a-local-development-server'));
-    if (!projectConfig || !projectDir) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noProjectConfig`, {
-            accountId: derivedAccountId,
-            authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-        }));
+const yargsUtils_1 = require("../../../lib/yargsUtils");
+const projectProfiles_1 = require("../../../lib/projectProfiles");
+const en_1 = require("../../../lang/en");
+const logger_1 = require("../../../lib/ui/logger");
+const command = 'dev';
+const describe = (0, ui_1.uiBetaTag)(en_1.commands.project.dev.describe, false);
+function validateAccountFlags(testingAccount, projectAccount, providedAccountId, useV3) {
+    // Legacy projects do not support targetTestingAccount and targetProjectAccount
+    if (testingAccount && projectAccount && !useV3) {
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.unsupportedAccountFlagLegacy);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    if (!accountConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noAccount`));
+    if (providedAccountId && useV3) {
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.unsupportedAccountFlagV3);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    (0, projects_1.validateProjectConfig)(projectConfig, projectDir);
-    if ((0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion)) {
-        await (0, unifiedFlow_1.unifiedProjectDevFlow)(args, accountConfig, projectConfig, projectDir);
+}
+async function handler(args) {
+    const { derivedAccountId, providedAccountId, testingAccount, projectAccount, } = args;
+    const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
+    (0, config_2.validateProjectConfig)(projectConfig, projectDir);
+    const useV3 = (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion);
+    if (!projectDir) {
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.noProjectConfig);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    validateAccountFlags(testingAccount, projectAccount, providedAccountId, useV3);
+    let targetProjectAccountId = (projectAccount && (0, config_1.getAccountId)(projectAccount)) ||
+        (providedAccountId && derivedAccountId);
+    let profile;
+    if (!targetProjectAccountId && (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
+        if (args.profile) {
+            (0, projectProfiles_1.logProfileHeader)(args.profile);
+            profile = (0, projectProfiles_1.loadProfile)(projectConfig, projectDir, args.profile);
+            if (!profile) {
+                (0, ui_1.uiLine)();
+                process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            }
+            targetProjectAccountId = profile.accountId;
+            (0, projectProfiles_1.logProfileFooter)(profile);
+        }
+        else {
+            // A profile must be specified if this project has profiles configured
+            await (0, projectProfiles_1.exitIfUsingProfiles)(projectConfig, projectDir);
+        }
+    }
+    if (!targetProjectAccountId) {
+        // The user is not using profile or account flags, so we can use the derived accountId
+        targetProjectAccountId = derivedAccountId;
+    }
+    (0, usageTracking_1.trackCommandUsage)('project-dev', {}, targetProjectAccountId);
+    (0, ui_1.uiBetaTag)(en_1.commands.project.dev.logs.betaMessage);
+    logger_1.uiLogger.log(en_1.commands.project.dev.logs.learnMoreLocalDevServer);
+    if ((0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
+        const targetTestingAccountId = (testingAccount && (0, config_1.getAccountId)(testingAccount)) || undefined;
+        await (0, unifiedFlow_1.unifiedProjectDevFlow)({
+            args,
+            targetProjectAccountId,
+            providedTargetTestingAccountId: targetTestingAccountId,
+            projectConfig,
+            projectDir,
+            profileConfig: profile,
+        });
     }
     else {
-        await (0, deprecatedFlow_1.deprecatedProjectDevFlow)(args, accountConfig, projectConfig, projectDir);
+        await (0, deprecatedFlow_1.deprecatedProjectDevFlow)({
+            args,
+            accountId: targetProjectAccountId,
+            projectConfig,
+            projectDir,
+        });
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
-    yargs.example([['$0 project dev', (0, lang_1.i18n)(`${i18nKey}.examples.default`)]]);
+function projectDevBuilder(yargs) {
+    yargs.option('profile', {
+        type: 'string',
+        alias: 'p',
+        description: en_1.commands.project.dev.options.profile,
+        hidden: true,
+    });
+    yargs.options('testingAccount', {
+        type: 'string',
+        description: en_1.commands.project.dev.options.testingAccount,
+        hidden: true,
+        implies: ['projectAccount'],
+    });
+    yargs.options('projectAccount', {
+        type: 'string',
+        description: en_1.commands.project.dev.options.projectAccount,
+        hidden: true,
+        implies: ['testingAccount'],
+    });
+    yargs.example([['$0 project dev', en_1.commands.project.dev.examples.default]]);
+    yargs.conflicts('profile', 'account');
+    yargs.conflicts('profile', 'testingAccount');
+    yargs.conflicts('profile', 'projectAccount');
     return yargs;
 }
+exports.builder = (0, yargsUtils_1.makeYargsBuilder)(projectDevBuilder, command, describe, {
+    useGlobalOptions: true,
+    useAccountOptions: true,
+    useConfigOptions: true,
+    useEnvironmentOptions: true,
+});
+const projectDevCommand = {
+    command,
+    describe,
+    handler,
+    builder: exports.builder,
+};
+exports.default = projectDevCommand;

package/commands/project/dev/unifiedFlow.d.ts

@@ -1,5 +1,14 @@
 import { ArgumentsCamelCase } from 'yargs';
-import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { HsProfileFile } from '@hubspot/project-parsing-lib/src/lib/types';
 import { ProjectDevArgs } from '../../../types/Yargs';
 import { ProjectConfig } from '../../../types/Projects';
-export declare function unifiedProjectDevFlow(args: ArgumentsCamelCase<ProjectDevArgs>, accountConfig: CLIAccount, projectConfig: ProjectConfig, projectDir: string): Promise<void>;
+type UnifiedProjectDevFlowArgs = {
+    args: ArgumentsCamelCase<ProjectDevArgs>;
+    targetProjectAccountId: number;
+    providedTargetTestingAccountId?: number;
+    projectConfig: ProjectConfig;
+    projectDir: string;
+    profileConfig?: HsProfileFile;
+};
+export declare function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTargetTestingAccountId, projectConfig, projectDir, profileConfig, }: UnifiedProjectDevFlowArgs): Promise<void>;
+export {};

package/commands/project/dev/unifiedFlow.js

@@ -6,27 +6,27 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.unifiedProjectDevFlow = unifiedProjectDevFlow;
 const path_1 = __importDefault(require("path"));
 const util_1 = __importDefault(require("util"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
+const config_1 = require("@hubspot/local-dev-lib/constants/config");
 const errors_1 = require("@hubspot/project-parsing-lib/src/lib/errors");
 const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
-const config_1 = require("@hubspot/local-dev-lib/config");
+const config_2 = require("@hubspot/local-dev-lib/config");
 const environment_1 = require("@hubspot/local-dev-lib/environment");
 const errorHandlers_1 = require("../../../lib/errorHandlers");
 const exitCodes_1 = require("../../../lib/enums/exitCodes");
-const projects_1 = require("../../../lib/projects");
-const localDev_1 = require("../../../lib/localDev");
+const ensureProjectExists_1 = require("../../../lib/projects/ensureProjectExists");
+const helpers_1 = require("../../../lib/projects/localDev/helpers");
 const projectDevTargetAccountPrompt_1 = require("../../../lib/prompts/projectDevTargetAccountPrompt");
 const SpinniesManager_1 = __importDefault(require("../../../lib/ui/SpinniesManager"));
-const LocalDevManagerV2_1 = __importDefault(require("../../../lib/LocalDevManagerV2"));
+const LocalDevProcess_1 = __importDefault(require("../../../lib/projects/localDev/LocalDevProcess"));
+const LocalDevWatcher_1 = __importDefault(require("../../../lib/projects/localDev/LocalDevWatcher"));
 const process_1 = require("../../../lib/process");
 const accountTypes_1 = require("../../../lib/accountTypes");
 const ui_1 = require("../../../lib/ui");
-const lang_1 = require("../../../lib/lang");
-const i18nKey = 'commands.project.subcommands.dev';
-async function unifiedProjectDevFlow(args, accountConfig, projectConfig, projectDir) {
-    logger_1.logger.log('Unified Apps Local Dev');
-    const targetProjectAccountId = args.derivedAccountId;
-    const env = (0, environment_1.getValidEnv)((0, config_1.getEnv)(targetProjectAccountId));
+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;
     // Get IR
     try {
@@ -34,52 +34,72 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
             projectSourceDir: path_1.default.join(projectDir, projectConfig.srcDir),
             platformVersion: projectConfig.platformVersion,
             accountId: targetProjectAccountId,
-        });
+        }, { profile: args.profile });
         projectNodes = intermediateRepresentation.intermediateNodesIndexedByUid;
-        logger_1.logger.debug(util_1.default.inspect(projectNodes, false, null, true));
+        logger_1.uiLogger.debug(util_1.default.inspect(projectNodes, false, null, true));
     }
     catch (e) {
         if ((0, errors_1.isTranslationError)(e)) {
-            logger_1.logger.error(e.toString());
+            logger_1.uiLogger.error(e.toString());
         }
         else {
             (0, errorHandlers_1.logError)(e);
         }
         return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    // @TODO Do we need to do more than this or leave it to the dev servers?
     if (!Object.keys(projectNodes).length) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noRunnableComponents`, {
-            projectDir,
-            command: (0, ui_1.uiCommandReference)('hs project add'),
-        }));
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.noRunnableComponents);
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
-    // @TODO Validate component types (i.e. previously you could not have both private and public apps)
-    const accounts = (0, config_1.getConfigAccounts)();
-    // TODO Ideally this should require the user to target a Combined account
-    // For now, check if the account is either developer or standard
-    const derivedAccountIsRecommendedType = (0, accountTypes_1.isAppDeveloperAccount)(accountConfig) || (0, accountTypes_1.isStandardAccount)(accountConfig);
-    if (!derivedAccountIsRecommendedType) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.invalidUnifiedAppsAccount`), {
-            authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-        });
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    const targetProjectAccountConfig = (0, config_2.getAccountConfig)(targetProjectAccountId);
+    if (!targetProjectAccountConfig) {
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.noAccount(targetProjectAccountId));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    let targetTestingAccountId = null;
-    const devAccountPromptResponse = await (0, projectDevTargetAccountPrompt_1.selectDeveloperTestTargetAccountPrompt)(accounts, accountConfig);
-    targetTestingAccountId = devAccountPromptResponse.targetAccountId;
-    if (!!devAccountPromptResponse.notInConfigAccount) {
-        // When the developer test account isn't configured in the CLI config yet
-        // Walk the user through adding the account's PAK to the config
-        await (0, localDev_1.useExistingDevTestAccount)(env, devAccountPromptResponse.notInConfigAccount);
+    const accounts = (0, config_2.getConfigAccounts)();
+    const accountIsCombined = await (0, accountTypes_1.isUnifiedAccount)(targetProjectAccountConfig);
+    if (!accountIsCombined && !profileConfig) {
+        logger_1.uiLogger.error(en_1.commands.project.dev.errors.accountNotCombined);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    else if (devAccountPromptResponse.createNestedAccount) {
-        // Create a new developer test account and automatically add it to the CLI config
-        targetTestingAccountId = await (0, localDev_1.createDeveloperTestAccountForLocalDev)(targetProjectAccountId, accountConfig, env);
+    let targetTestingAccountId = providedTargetTestingAccountId;
+    if (profileConfig) {
+        // Bypass the prompt for the testing account if the user has a profile configured
+        targetTestingAccountId = profileConfig.accountId;
+    }
+    else if (!targetTestingAccountId) {
+        logger_1.uiLogger.log('');
+        (0, ui_1.uiLine)();
+        logger_1.uiLogger.log(en_1.commands.project.dev.logs.accountTypeInformation);
+        logger_1.uiLogger.log(en_1.commands.project.dev.logs.learnMoreMessage);
+        (0, ui_1.uiLine)();
+        logger_1.uiLogger.log('');
+        const accountType = await (0, helpers_1.selectAccountTypePrompt)(targetProjectAccountConfig);
+        if (accountType === config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPER_TEST) {
+            const devAccountPromptResponse = await (0, projectDevTargetAccountPrompt_1.selectDeveloperTestTargetAccountPrompt)(accounts, targetProjectAccountConfig);
+            targetTestingAccountId =
+                devAccountPromptResponse.targetAccountId || undefined;
+            if (!!devAccountPromptResponse.notInConfigAccount) {
+                // When the developer test account isn't configured in the CLI config yet
+                // Walk the user through adding the account's PAK to the config
+                await (0, helpers_1.useExistingDevTestAccount)(env, devAccountPromptResponse.notInConfigAccount);
+            }
+            else if (devAccountPromptResponse.createNestedAccount) {
+                // Create a new developer test account and automatically add it to the CLI config
+                targetTestingAccountId = await (0, helpers_1.createDeveloperTestAccountForLocalDev)(targetProjectAccountId, targetProjectAccountConfig, env);
+            }
+        }
+        else if (accountType === config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {
+            const sandboxAccountPromptResponse = await (0, projectDevTargetAccountPrompt_1.selectSandboxTargetAccountPrompt)(accounts, targetProjectAccountConfig);
+            targetTestingAccountId =
+                sandboxAccountPromptResponse.targetAccountId || undefined;
+        }
+        else {
+            targetTestingAccountId = targetProjectAccountId;
+        }
     }
     // Check if project exists in HubSpot
-    const { projectExists, project: uploadedProject } = await (0, projects_1.ensureProjectExists)(targetProjectAccountId, projectConfig.name, {
+    const { projectExists, project: uploadedProject } = await (0, ensureProjectExists_1.ensureProjectExists)(targetProjectAccountId, projectConfig.name, {
         allowCreate: false,
         noLogs: true,
     });
@@ -92,11 +112,12 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
         isGithubLinked = Boolean(project.sourceIntegration && project.sourceIntegration.source === 'GITHUB');
     }
     else {
-        project = await (0, localDev_1.createNewProjectForLocalDev)(projectConfig, targetProjectAccountId, false, false);
-        deployedBuild = await (0, localDev_1.createInitialBuildForNewProject)(projectConfig, projectDir, targetProjectAccountId, true);
+        project = await (0, helpers_1.createNewProjectForLocalDev)(projectConfig, targetProjectAccountId, false, false);
+        deployedBuild = await (0, helpers_1.createInitialBuildForNewProject)(projectConfig, projectDir, targetProjectAccountId, true, args.profile);
     }
-    const LocalDev = new LocalDevManagerV2_1.default({
-        projectNodes,
+    // End setup, start local dev process
+    const localDevProcess = new LocalDevProcess_1.default({
+        initialProjectNodes: projectNodes,
         debug: args.debug,
         deployedBuild,
         isGithubLinked,
@@ -104,9 +125,27 @@ async function unifiedProjectDevFlow(args, accountConfig, projectConfig, project
         targetTestingAccountId: targetTestingAccountId,
         projectConfig,
         projectDir,
+        projectName: project.name,
         projectId: project.id,
         env,
     });
-    await LocalDev.start();
-    (0, process_1.handleExit)(({ isSIGHUP }) => LocalDev.stop(!isSIGHUP));
+    await localDevProcess.start();
+    const watcher = new LocalDevWatcher_1.default(localDevProcess);
+    watcher.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(),
+            ]);
+        }
+    });
+    (0, process_1.handleExit)(({ isSIGHUP }) => {
+        localDevProcess.stop(!isSIGHUP);
+        watcher.stop();
+        websocketServer.shutdown();
+    });
 }

package/commands/project/download.d.ts

@@ -1,12 +1,8 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "download";
-export declare const describe: string;
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
 type ProjectDownloadArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     project?: string;
     dest?: string;
     build?: number;
 };
-export declare function handler(args: ArgumentsCamelCase<ProjectDownloadArgs>): Promise<void>;
-export declare const builder: (yargs: Argv) => Promise<Argv<ProjectDownloadArgs>>;
-export {};
+declare const projectDownloadCommand: YargsCommandModule<unknown, ProjectDownloadArgs>;
+export default projectDownloadCommand;

package/commands/project/download.js

@@ -3,28 +3,25 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.describe = exports.command = void 0;
-exports.handler = handler;
 const path_1 = __importDefault(require("path"));
 const path_2 = require("@hubspot/local-dev-lib/path");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const archive_1 = require("@hubspot/local-dev-lib/archive");
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const index_1 = require("../../lib/errorHandlers/index");
-const projects_2 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const downloadProjectPrompt_1 = require("../../lib/prompts/downloadProjectPrompt");
 const lang_1 = require("../../lib/lang");
 const ui_1 = require("../../lib/ui");
 const usageTracking_1 = require("../../lib/usageTracking");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-const i18nKey = 'commands.project.subcommands.download';
-exports.command = 'download';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+const command = 'download';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.download.describe`), false);
 async function handler(args) {
-    const { projectConfig } = await (0, projects_2.getProjectConfig)();
+    const { projectConfig } = await (0, config_1.getProjectConfig)();
     if (projectConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.warnings.cannotDownloadWithinProject`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.download.warnings.cannotDownloadWithinProject`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const { dest, build, derivedAccountId } = args;
@@ -41,13 +38,13 @@ async function handler(args) {
             }
         }
         if (!buildNumberToDownload) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noBuildIdToDownload`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.download.errors.noBuildIdToDownload`));
             process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         const absoluteDestPath = dest ? path_1.default.resolve((0, path_2.getCwd)(), dest) : (0, path_2.getCwd)();
         const { data: zippedProject } = await (0, projects_1.downloadProject)(derivedAccountId, projectName, buildNumberToDownload);
         await (0, archive_1.extractZipArchive)(zippedProject, (0, path_2.sanitizeFileName)(projectName), path_1.default.resolve(absoluteDestPath), { includesRootDir: false });
-        logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.downloadSucceeded`, {
+        logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.download.logs.downloadSucceeded`, {
             buildId: buildNumberToDownload,
             projectName,
         }));
@@ -64,15 +61,15 @@ async function handler(args) {
 function projectDownloadBuilder(yargs) {
     yargs.options({
         project: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.project.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.download.options.project.describe`),
             type: 'string',
         },
         dest: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.dest.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.download.options.dest.describe`),
             type: 'string',
         },
         build: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.build.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.download.options.build.describe`),
             alias: ['build-id'],
             type: 'number',
         },
@@ -80,19 +77,21 @@ function projectDownloadBuilder(yargs) {
     yargs.example([
         [
             '$0 project download --project=myProject --dest=myProjectFolder',
-            (0, lang_1.i18n)(`${i18nKey}.examples.default`),
+            (0, lang_1.i18n)(`commands.project.subcommands.download.examples.default`),
         ],
     ]);
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(projectDownloadBuilder, exports.command, exports.describe, {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectDownloadBuilder, command, describe, {
+    useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
     useEnvironmentOptions: true,
 });
-module.exports = {
-    command: exports.command,
-    describe: exports.describe,
-    builder: exports.builder,
+const projectDownloadCommand = {
+    command,
+    describe,
     handler,
+    builder,
 };
+exports.default = projectDownloadCommand;