@hubspot/cli 7.4.9-experimental.0 → 7.4.10-beta.0

package/commands/project/create.js

@@ -1,89 +1,96 @@
 "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 path = require('path');
-const fs = require('fs-extra');
-const chalk = require('chalk');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { fetchReleaseData, cloneGithubRepo, } = require('@hubspot/local-dev-lib/github');
-const { getCwd } = require('@hubspot/local-dev-lib/path');
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { createProjectPrompt, } = require('../../lib/prompts/createProjectPrompt');
-const { writeProjectConfig, getProjectConfig } = require('../../lib/projects');
-const { getProjectTemplateListFromRepo, EMPTY_PROJECT_TEMPLATE_NAME, } = require('../../lib/projects/create');
-const { i18n } = require('../../lib/lang');
-const { uiBetaTag, uiFeatureHighlight } = require('../../lib/ui');
-const { debugError } = require('../../lib/errorHandlers');
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { PROJECT_CONFIG_FILE, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, DEFAULT_PROJECT_TEMPLATE_BRANCH, } = require('../../lib/constants');
-const i18nKey = 'commands.project.subcommands.create';
-exports.command = 'create';
-exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
-exports.handler = async (options) => {
-    const { derivedAccountId } = options;
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const chalk_1 = __importDefault(require("chalk"));
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const github_1 = require("@hubspot/local-dev-lib/github");
+const path_2 = require("@hubspot/local-dev-lib/path");
+const usageTracking_1 = require("../../lib/usageTracking");
+const createProjectPrompt_1 = require("../../lib/prompts/createProjectPrompt");
+const config_1 = require("../../lib/projects/config");
+const create_1 = require("../../lib/projects/create");
+const lang_1 = require("../../lib/lang");
+const ui_1 = require("../../lib/ui");
+const errorHandlers_1 = require("../../lib/errorHandlers");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const constants_1 = require("../../lib/constants");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'create';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.create.describe`), false);
+async function handler(args) {
+    const { derivedAccountId } = args;
     let latestRepoReleaseTag;
-    let templateSource = options.templateSource;
+    let templateSource = args.templateSource;
     if (!templateSource) {
-        templateSource = HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
+        templateSource = constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
         try {
-            const releaseData = await fetchReleaseData(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH);
+            const releaseData = await (0, github_1.fetchReleaseData)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH);
             if (releaseData) {
                 latestRepoReleaseTag = releaseData.tag_name;
             }
         }
         catch (err) {
-            logger.error(i18n(`${i18nKey}.error.failedToFetchProjectList`));
-            process.exit(EXIT_CODES.ERROR);
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.create.errors.failedToFetchProjectList`));
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
-    const projectTemplates = await getProjectTemplateListFromRepo(templateSource, latestRepoReleaseTag || DEFAULT_PROJECT_TEMPLATE_BRANCH);
+    if (!templateSource || !templateSource.includes('/')) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.create.errors.invalidTemplateSource`));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    const projectTemplates = await (0, create_1.getProjectTemplateListFromRepo)(templateSource, latestRepoReleaseTag || constants_1.DEFAULT_PROJECT_TEMPLATE_BRANCH);
     if (!projectTemplates.length) {
-        logger.error(i18n(`${i18nKey}.error.failedToFetchProjectList`));
-        process.exit(EXIT_CODES.ERROR);
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.create.errors.failedToFetchProjectList`));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const createProjectPromptResponse = await createProjectPrompt(options, projectTemplates);
-    const projectDest = path.resolve(getCwd(), createProjectPromptResponse.dest);
-    trackCommandUsage('project-create', { type: createProjectPromptResponse.projectTemplate.name }, derivedAccountId);
-    const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await getProjectConfig(projectDest);
+    const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args, projectTemplates);
+    const projectDest = path_1.default.resolve((0, path_2.getCwd)(), createProjectPromptResponse.dest);
+    (0, usageTracking_1.trackCommandUsage)('project-create', { type: createProjectPromptResponse.projectTemplate.name }, derivedAccountId);
+    const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await (0, config_1.getProjectConfig)(projectDest);
     // Exit if the target destination is within an existing project
-    if (existingProjectConfig && projectDest.startsWith(existingProjectDir)) {
-        logger.error(i18n(`${i18nKey}.errors.cannotNestProjects`, {
+    if (existingProjectConfig &&
+        existingProjectDir &&
+        projectDest.startsWith(existingProjectDir)) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.create.errors.cannotNestProjects`, {
             projectDir: existingProjectDir,
         }));
-        process.exit(EXIT_CODES.ERROR);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     try {
-        await cloneGithubRepo(templateSource, projectDest, {
+        await (0, github_1.cloneGithubRepo)(templateSource, projectDest, {
             sourceDir: createProjectPromptResponse.projectTemplate.path,
             tag: latestRepoReleaseTag,
             hideLogs: true,
         });
     }
     catch (err) {
-        debugError(err);
-        logger.error(i18n(`${i18nKey}.errors.failedToDownloadProject`));
-        process.exit(EXIT_CODES.ERROR);
+        (0, errorHandlers_1.debugError)(err);
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.create.errors.failedToDownloadProject`));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const projectConfigPath = path.join(projectDest, PROJECT_CONFIG_FILE);
-    const parsedConfigFile = JSON.parse(fs.readFileSync(projectConfigPath).toString());
-    writeProjectConfig(projectConfigPath, {
+    const projectConfigPath = path_1.default.join(projectDest, constants_1.PROJECT_CONFIG_FILE);
+    const parsedConfigFile = JSON.parse(fs_extra_1.default.readFileSync(projectConfigPath).toString());
+    (0, config_1.writeProjectConfig)(projectConfigPath, {
         ...parsedConfigFile,
         name: createProjectPromptResponse.name,
     });
     // If the template is 'no-template', we need to manually create a src directory
     if (createProjectPromptResponse.projectTemplate.name ===
-        EMPTY_PROJECT_TEMPLATE_NAME) {
-        fs.ensureDirSync(path.join(projectDest, 'src'));
+        create_1.EMPTY_PROJECT_TEMPLATE_NAME) {
+        fs_extra_1.default.ensureDirSync(path_1.default.join(projectDest, 'src'));
     }
-    logger.log('');
-    logger.success(i18n(`${i18nKey}.logs.success`, {
+    logger_1.logger.log('');
+    logger_1.logger.success((0, lang_1.i18n)(`commands.project.subcommands.create.logs.success`, {
         projectName: createProjectPromptResponse.name,
         projectDest,
     }));
-    logger.log('');
-    logger.log(chalk.bold(i18n(`${i18nKey}.logs.welcomeMessage`)));
-    uiFeatureHighlight([
+    logger_1.logger.log('');
+    logger_1.logger.log(chalk_1.default.bold((0, lang_1.i18n)(`commands.project.subcommands.create.logs.welcomeMessage`)));
+    (0, ui_1.uiFeatureHighlight)([
         'projectCommandTip',
         'projectUploadCommand',
         'projectDevCommand',
@@ -92,36 +99,51 @@ exports.handler = async (options) => {
         'feedbackCommand',
         'sampleProjects',
     ]);
-    process.exit(EXIT_CODES.SUCCESS);
-};
-exports.builder = yargs => {
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function projectCreateBuilder(yargs) {
     yargs.options({
         name: {
-            describe: i18n(`${i18nKey}.options.name.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.create.options.name.describe`),
             type: 'string',
         },
         dest: {
-            describe: i18n(`${i18nKey}.options.dest.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.create.options.dest.describe`),
             type: 'string',
         },
         template: {
-            describe: i18n(`${i18nKey}.options.template.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.create.options.template.describe`),
             type: 'string',
         },
         'template-source': {
-            describe: i18n(`${i18nKey}.options.templateSource.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.create.options.templateSource.describe`),
             type: 'string',
         },
     });
-    yargs.example([['$0 project create', i18n(`${i18nKey}.examples.default`)]]);
+    yargs.example([
+        [
+            '$0 project create',
+            (0, lang_1.i18n)(`commands.project.subcommands.create.examples.default`),
+        ],
+    ]);
     yargs.example([
         [
             '$0 project create --template-source HubSpot/ui-extensions-examples',
-            i18n(`${i18nKey}.examples.templateSource`),
+            (0, lang_1.i18n)(`commands.project.subcommands.create.examples.templateSource`),
         ],
     ]);
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectCreateBuilder, command, describe, {
+    useGlobalOptions: true,
+    useAccountOptions: true,
+    useConfigOptions: true,
+    useEnvironmentOptions: true,
+});
+const projectCreateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = projectCreateCommand;

package/commands/project/deploy.d.ts

@@ -1,11 +1,9 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "deploy";
-export declare const describe: string;
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
 export type ProjectDeployArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     project?: string;
     build?: number;
     buildId?: number;
+    profile?: string;
 };
-export declare function handler(args: ArgumentsCamelCase<ProjectDeployArgs>): Promise<void>;
-export declare const builder: (yargs: Argv) => Promise<Argv<ProjectDeployArgs>>;
+declare const projectDeployCommand: YargsCommandModule<unknown, ProjectDeployArgs>;
+export default projectDeployCommand;

package/commands/project/deploy.js

@@ -3,8 +3,6 @@ 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 chalk_1 = __importDefault(require("chalk"));
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const config_1 = require("@hubspot/local-dev-lib/config");
@@ -13,7 +11,7 @@ const index_1 = require("@hubspot/local-dev-lib/errors/index");
 const buildAndDeploy_1 = require("../../lib/projects/buildAndDeploy");
 const usageTracking_1 = require("../../lib/usageTracking");
 const index_2 = require("../../lib/errorHandlers/index");
-const projects_2 = require("../../lib/projects");
+const config_2 = require("../../lib/projects/config");
 const buildAndDeploy_2 = require("../../lib/projects/buildAndDeploy");
 const urls_1 = require("../../lib/projects/urls");
 const projectNamePrompt_1 = require("../../lib/prompts/projectNamePrompt");
@@ -23,49 +21,68 @@ const ui_1 = require("../../lib/ui");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_2 = require("../../lib/ui");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-const i18nKey = 'commands.project.subcommands.deploy';
-exports.command = 'deploy';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+const projectProfiles_1 = require("../../lib/projectProfiles");
+const command = 'deploy';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.deploy.describe`), false);
 function validateBuildId(buildId, deployedBuildId, latestBuildId, projectName, accountId) {
     if (Number(buildId) > latestBuildId) {
-        return (0, lang_1.i18n)(`${i18nKey}.errors.buildIdDoesNotExist`, {
+        return (0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.buildIdDoesNotExist`, {
             buildId: buildId,
             projectName: projectName,
-            linkToProject: (0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.errors.viewProjectsBuilds`), (0, urls_1.getProjectDetailUrl)(projectName, accountId)),
+            linkToProject: (0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.viewProjectsBuilds`), (0, urls_1.getProjectDetailUrl)(projectName, accountId)),
         });
     }
     if (Number(buildId) === deployedBuildId) {
-        return (0, lang_1.i18n)(`${i18nKey}.errors.buildAlreadyDeployed`, {
+        return (0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.buildAlreadyDeployed`, {
             buildId: buildId,
-            linkToProject: (0, ui_1.uiLink)((0, lang_1.i18n)(`${i18nKey}.errors.viewProjectsBuilds`), (0, urls_1.getProjectDetailUrl)(projectName, accountId)),
+            linkToProject: (0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.viewProjectsBuilds`), (0, urls_1.getProjectDetailUrl)(projectName, accountId)),
         });
     }
     return true;
 }
 async function handler(args) {
-    const { derivedAccountId } = args;
+    const { derivedAccountId, project: projectOption, buildId: buildIdOption, } = args;
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
-    const { project: projectOption, buildId: buildIdOption } = args;
     const accountType = accountConfig && accountConfig.accountType;
-    (0, usageTracking_1.trackCommandUsage)('project-deploy', accountType ? { type: accountType } : undefined, derivedAccountId);
-    const { projectConfig } = await (0, projects_2.getProjectConfig)();
+    let targetAccountId;
+    const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
+    if ((0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion)) {
+        if (args.profile) {
+            (0, projectProfiles_1.logProfileHeader)(args.profile);
+            const profile = (0, projectProfiles_1.loadProfile)(projectConfig, projectDir, args.profile);
+            if (!profile) {
+                (0, ui_1.uiLine)();
+                process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            }
+            targetAccountId = 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 (!targetAccountId) {
+        targetAccountId = derivedAccountId;
+    }
+    (0, usageTracking_1.trackCommandUsage)('project-deploy', accountType ? { type: accountType } : undefined, targetAccountId);
     let projectName = projectOption;
     if (!projectOption && projectConfig) {
         projectName = projectConfig.name;
     }
-    const namePromptResponse = await (0, projectNamePrompt_1.projectNamePrompt)(derivedAccountId, {
+    const namePromptResponse = await (0, projectNamePrompt_1.projectNamePrompt)(targetAccountId, {
         project: projectName,
     });
     projectName = namePromptResponse.projectName;
     let buildIdToDeploy = buildIdOption;
     try {
-        const { data: { latestBuild, deployedBuildId }, } = await (0, projects_1.fetchProject)(derivedAccountId, projectName);
+        const { data: { latestBuild, deployedBuildId }, } = await (0, projects_1.fetchProject)(targetAccountId, projectName);
         if (!latestBuild || !latestBuild.buildId) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noBuilds`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.noBuilds`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (buildIdToDeploy) {
-            const validationResult = validateBuildId(buildIdToDeploy, deployedBuildId, latestBuild.buildId, projectName, derivedAccountId);
+            const validationResult = validateBuildId(buildIdToDeploy, deployedBuildId, latestBuild.buildId, projectName, targetAccountId);
             if (validationResult !== true) {
                 logger_1.logger.error(validationResult);
                 return process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -74,30 +91,30 @@ async function handler(args) {
         else {
             const deployBuildIdPromptResponse = await (0, promptUtils_1.promptUser)({
                 name: 'buildId',
-                message: (0, lang_1.i18n)(`${i18nKey}.deployBuildIdPrompt`),
+                message: (0, lang_1.i18n)(`commands.project.subcommands.deploy.deployBuildIdPrompt`),
                 default: latestBuild.buildId === deployedBuildId
                     ? undefined
                     : latestBuild.buildId,
-                validate: buildId => validateBuildId(buildId, deployedBuildId, latestBuild.buildId, projectName, derivedAccountId),
+                validate: buildId => validateBuildId(buildId, deployedBuildId, latestBuild.buildId, projectName, targetAccountId),
             });
             buildIdToDeploy = deployBuildIdPromptResponse.buildId;
         }
         if (!buildIdToDeploy) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noBuildId`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.noBuildId`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
-        const { data: deployResp } = await (0, projects_1.deployProject)(derivedAccountId, projectName, buildIdToDeploy, (0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion));
+        const { data: deployResp } = await (0, projects_1.deployProject)(targetAccountId, projectName, buildIdToDeploy, (0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion));
         if (!deployResp) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.deploy`));
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.deploy`));
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
-        await (0, buildAndDeploy_2.pollDeployStatus)(derivedAccountId, projectName, Number(deployResp.id), buildIdToDeploy);
+        await (0, buildAndDeploy_2.pollDeployStatus)(targetAccountId, projectName, Number(deployResp.id), buildIdToDeploy);
     }
     catch (e) {
         if ((0, index_1.isHubSpotHttpError)(e) && e.status === 404) {
-            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.projectNotFound`, {
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.projectNotFound`, {
                 projectName: chalk_1.default.bold(projectName),
-                accountIdentifier: (0, ui_2.uiAccountDescription)(derivedAccountId),
+                accountIdentifier: (0, ui_2.uiAccountDescription)(targetAccountId),
                 command: (0, ui_2.uiCommandReference)('hs project upload'),
             }));
         }
@@ -106,7 +123,7 @@ async function handler(args) {
         }
         else {
             (0, index_2.logError)(e, new index_2.ApiErrorContext({
-                accountId: derivedAccountId,
+                accountId: targetAccountId,
                 request: 'project deploy',
             }));
         }
@@ -116,32 +133,45 @@ async function handler(args) {
 function projectDeployBuilder(yargs) {
     yargs.options({
         project: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.project.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.deploy.options.project.describe`),
             type: 'string',
         },
         build: {
             alias: ['build-id'],
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.build.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.deploy.options.build.describe`),
             type: 'number',
         },
+        profile: {
+            alias: ['p'],
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.deploy.options.profile.describe`),
+            type: 'string',
+            hidden: true,
+        },
     });
+    yargs.conflicts('profile', 'project');
+    yargs.conflicts('profile', 'account');
     yargs.example([
-        ['$0 project deploy', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
+        [
+            '$0 project deploy',
+            (0, lang_1.i18n)(`commands.project.subcommands.deploy.examples.default`),
+        ],
         [
             '$0 project deploy --project="my-project" --build=5',
-            (0, lang_1.i18n)(`${i18nKey}.examples.withOptions`),
+            (0, lang_1.i18n)(`commands.project.subcommands.deploy.examples.withOptions`),
         ],
     ]);
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(projectDeployBuilder, exports.command, exports.describe, {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectDeployBuilder, command, describe, {
+    useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
     useEnvironmentOptions: true,
 });
-module.exports = {
-    command: exports.command,
-    describe: exports.describe,
-    builder: exports.builder,
+const projectDeployCommand = {
+    command,
+    describe,
+    builder,
     handler,
 };
+exports.default = projectDeployCommand;

package/commands/project/dev/deprecatedFlow.js

@@ -13,12 +13,11 @@ 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';
+const ensureProjectExists_1 = require("../../../lib/projects/ensureProjectExists");
 async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, projectDir) {
     const { providedAccountId, derivedAccountId } = args;
     const env = (0, environment_1.getValidEnv)((0, config_1.getEnv)(derivedAccountId));
@@ -28,25 +27,34 @@ async function deprecatedProjectDevFlow(args, accountConfig, projectConfig, proj
     const hasPrivateApps = !!componentTypes[Projects_1.ComponentTypes.PrivateApp];
     const hasPublicApps = !!componentTypes[Projects_1.ComponentTypes.PublicApp];
     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 +62,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 +85,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 +124,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;