@hubspot/cli 7.4.4-experimental.0 → 7.4.5-beta.0

package/commands/project/add.js

@@ -12,7 +12,7 @@ const errorHandlers_1 = require("../../lib/errorHandlers");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const projectAddPrompt_1 = require("../../lib/prompts/projectAddPrompt");
-const projects_1 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const create_1 = require("../../lib/projects/create");
 const structure_1 = require("../../lib/projects/structure");
 const Projects_1 = require("../../types/Projects");
@@ -20,15 +20,14 @@ const ui_1 = require("../../lib/ui");
 const constants_1 = require("../../lib/constants");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-const i18nKey = 'commands.project.subcommands.add';
 exports.command = 'add';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.add.describe`), false);
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('project-add', undefined, derivedAccountId);
-    const { projectConfig, projectDir } = await (0, projects_1.getProjectConfig)();
+    const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
     if (!projectDir || !projectConfig) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.error.locationInProject`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.add.error.locationInProject`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     // We currently only support adding private apps to projects
@@ -41,11 +40,11 @@ async function handler(args) {
         (0, errorHandlers_1.debugError)(err);
     }
     if (projectContainsPublicApp) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.error.projectContainsPublicApp`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.add.error.projectContainsPublicApp`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     logger_1.logger.log('');
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.creatingComponent`, {
+    logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.add.creatingComponent`, {
         projectName: projectConfig.name,
     }));
     logger_1.logger.log('');
@@ -61,12 +60,12 @@ async function handler(args) {
         (0, errorHandlers_1.debugError)(err);
     }
     if (!latestRepoReleaseTag) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.error.failedToFetchComponentList`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.add.error.failedToFetchComponentList`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const components = await (0, create_1.getProjectComponentListFromRepo)(latestRepoReleaseTag);
     if (!components.length) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.error.failedToFetchComponentList`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.add.error.failedToFetchComponentList`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const projectAddPromptResponse = await (0, projectAddPrompt_1.projectAddPrompt)(components, args);
@@ -78,13 +77,13 @@ async function handler(args) {
             hideLogs: true,
         });
         logger_1.logger.log('');
-        logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success`, {
+        logger_1.logger.success((0, lang_1.i18n)(`commands.project.subcommands.add.success`, {
             componentName: projectAddPromptResponse.name,
         }));
     }
     catch (error) {
         (0, errorHandlers_1.debugError)(error);
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.error.failedToDownloadComponent`));
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.add.error.failedToDownloadComponent`));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
@@ -92,19 +91,24 @@ async function handler(args) {
 function projectAddBuilder(yargs) {
     yargs.options({
         type: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.type.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.add.options.type.describe`),
             type: 'string',
         },
         name: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.name.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.add.options.name.describe`),
             type: 'string',
         },
     });
-    yargs.example([['$0 project add', (0, lang_1.i18n)(`${i18nKey}.examples.default`)]]);
+    yargs.example([
+        [
+            '$0 project add',
+            (0, lang_1.i18n)(`commands.project.subcommands.add.examples.default`),
+        ],
+    ]);
     yargs.example([
         [
             '$0 project add --name="my-component" --type="components/example-app"',
-            (0, lang_1.i18n)(`${i18nKey}.examples.withFlags`),
+            (0, lang_1.i18n)(`commands.project.subcommands.add.examples.withFlags`),
         ],
     ]);
     return yargs;

package/commands/project/cloneApp.d.ts

@@ -1,8 +1,12 @@
 import { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
-import { CloneAppArgs } from '../../types/Yargs';
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs } from '../../types/Yargs';
 export declare const command = "clone-app";
 export declare const describe: string | undefined;
 export declare const deprecated = true;
+export type CloneAppArgs = ConfigArgs & EnvironmentArgs & AccountArgs & CommonArgs & {
+    dest: string;
+    appId: number;
+};
 export declare const handler: (options: ArgumentsCamelCase<CloneAppArgs>) => Promise<never>;
 export declare const builder: (yargs: Argv) => Argv<CloneAppArgs>;
 declare const cloneAppCommand: CommandModule<unknown, CloneAppArgs>;

package/commands/project/cloneApp.js

@@ -17,29 +17,29 @@ const ui_2 = require("../../lib/ui");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const accountTypes_1 = require("../../lib/accountTypes");
-const projects_1 = require("../../lib/projects");
+const config_1 = require("../../lib/projects/config");
 const constants_1 = require("../../lib/constants");
-const projects_2 = require("@hubspot/local-dev-lib/api/projects");
+const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 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 config_1 = require("@hubspot/local-dev-lib/config");
+const config_2 = require("@hubspot/local-dev-lib/config");
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const migrate_1 = require("../../lib/app/migrate");
-const i18nKey = 'commands.project.subcommands.cloneApp';
 exports.command = 'clone-app';
-exports.describe = (0, ui_1.uiDeprecatedTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+exports.describe = (0, ui_1.uiDeprecatedTag)((0, lang_1.i18n)(`commands.project.subcommands.cloneApp.describe`), false);
 exports.deprecated = true;
 const handler = async (options) => {
     const { derivedAccountId } = options;
     await (0, usageTracking_1.trackCommandUsage)('clone-app', {}, derivedAccountId);
-    const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
+    const accountConfig = (0, config_2.getAccountConfig)(derivedAccountId);
     const accountName = (0, ui_2.uiAccountDescription)(derivedAccountId);
     if (!accountConfig) {
         throw new Error((0, lang_1.i18n)(`commands.projects.subcommands.cloneApp.errors.noAccountConfig`));
     }
-    if (!(0, accountTypes_1.isAppDeveloperAccount)(accountConfig)) {
-        (0, migrate_1.logInvalidAccountError)(i18nKey);
+    const defaultAccountIsUnified = await (0, accountTypes_1.isUnifiedAccount)(accountConfig);
+    if (!(0, accountTypes_1.isAppDeveloperAccount)(accountConfig) && !defaultAccountIsUnified) {
+        (0, migrate_1.logInvalidAccountError)();
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     let appId;
@@ -67,17 +67,17 @@ const handler = async (options) => {
     try {
         SpinniesManager_1.default.init();
         SpinniesManager_1.default.add('cloneApp', {
-            text: (0, lang_1.i18n)(`${i18nKey}.cloneStatus.inProgress`),
+            text: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.cloneStatus.inProgress`),
         });
-        const { data: { exportId }, } = await (0, projects_2.cloneApp)(derivedAccountId, appId);
-        const { status } = await (0, polling_1.poll)(() => (0, projects_2.checkCloneStatus)(derivedAccountId, exportId));
+        const { data: { exportId }, } = await (0, projects_1.cloneApp)(derivedAccountId, appId);
+        const { status } = await (0, polling_1.poll)(() => (0, projects_1.checkCloneStatus)(derivedAccountId, exportId));
         if (status === 'SUCCESS') {
             // Ensure correct project folder structure exists
             const baseDestPath = path_1.default.resolve((0, path_2.getCwd)(), projectDest);
             const absoluteDestPath = path_1.default.resolve(baseDestPath, 'src', 'app');
             fs_1.default.mkdirSync(absoluteDestPath, { recursive: true });
             // Extract zipped app files and place them in correct directory
-            const { data: zippedApp } = await (0, projects_2.downloadClonedProject)(derivedAccountId, exportId);
+            const { data: zippedApp } = await (0, projects_1.downloadClonedProject)(derivedAccountId, exportId);
             await (0, archive_1.extractZipArchive)(zippedApp, (0, path_2.sanitizeFileName)(projectName), absoluteDestPath, {
                 includesRootDir: true,
                 hideLogs: true,
@@ -89,17 +89,19 @@ const handler = async (options) => {
                 srcDir: 'src',
                 platformVersion: '2023.2',
             };
-            const success = (0, projects_1.writeProjectConfig)(configPath, configContent);
+            const success = (0, config_1.writeProjectConfig)(configPath, configContent);
             SpinniesManager_1.default.succeed('cloneApp', {
-                text: (0, lang_1.i18n)(`${i18nKey}.cloneStatus.done`),
+                text: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.cloneStatus.done`),
                 succeedColor: 'white',
             });
             if (!success) {
-                logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.couldNotWriteConfigPath`), configPath);
+                logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.cloneApp.errors.couldNotWriteConfigPath`), configPath);
             }
             logger_1.logger.log('');
             (0, ui_2.uiLine)();
-            logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.cloneStatus.success`, { dest: projectDest }));
+            logger_1.logger.success((0, lang_1.i18n)(`commands.project.subcommands.cloneApp.cloneStatus.success`, {
+                dest: projectDest,
+            }));
             logger_1.logger.log('');
             process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
@@ -107,7 +109,7 @@ const handler = async (options) => {
     catch (error) {
         await (0, usageTracking_1.trackCommandMetadataUsage)('clone-app', { successful: false }, derivedAccountId);
         SpinniesManager_1.default.fail('cloneApp', {
-            text: (0, lang_1.i18n)(`${i18nKey}.cloneStatus.failure`),
+            text: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.cloneStatus.failure`),
             failColor: 'white',
         });
         // Migrations endpoints return a response object with an errors property. The errors property contains an array of errors.
@@ -128,16 +130,19 @@ exports.handler = handler;
 const builder = (yargs) => {
     yargs.options({
         dest: {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.dest.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.options.dest.describe`),
             type: 'string',
         },
         'app-id': {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.appId.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.options.appId.describe`),
             type: 'number',
         },
     });
     yargs.example([
-        ['$0 project clone-app', (0, lang_1.i18n)(`${i18nKey}.examples.default`)],
+        [
+            '$0 project clone-app',
+            (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.examples.default`),
+        ],
     ]);
     (0, commonOpts_1.addConfigOptions)(yargs);
     (0, commonOpts_1.addAccountOptions)(yargs);

package/commands/project/create.js

@@ -10,16 +10,15 @@ 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 { writeProjectConfig, getProjectConfig, } = require('../../lib/projects/config');
 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.describe = uiBetaTag(i18n(`commands.project.subcommands.create.describe`), false);
 exports.handler = async (options) => {
     const { derivedAccountId } = options;
     let latestRepoReleaseTag;
@@ -33,13 +32,13 @@ exports.handler = async (options) => {
             }
         }
         catch (err) {
-            logger.error(i18n(`${i18nKey}.error.failedToFetchProjectList`));
+            logger.error(i18n(`commands.project.subcommands.create.error.failedToFetchProjectList`));
             process.exit(EXIT_CODES.ERROR);
         }
     }
     const projectTemplates = await getProjectTemplateListFromRepo(templateSource, latestRepoReleaseTag || DEFAULT_PROJECT_TEMPLATE_BRANCH);
     if (!projectTemplates.length) {
-        logger.error(i18n(`${i18nKey}.error.failedToFetchProjectList`));
+        logger.error(i18n(`commands.project.subcommands.create.error.failedToFetchProjectList`));
         process.exit(EXIT_CODES.ERROR);
     }
     const createProjectPromptResponse = await createProjectPrompt(options, projectTemplates);
@@ -48,7 +47,7 @@ exports.handler = async (options) => {
     const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await getProjectConfig(projectDest);
     // Exit if the target destination is within an existing project
     if (existingProjectConfig && projectDest.startsWith(existingProjectDir)) {
-        logger.error(i18n(`${i18nKey}.errors.cannotNestProjects`, {
+        logger.error(i18n(`commands.project.subcommands.create.errors.cannotNestProjects`, {
             projectDir: existingProjectDir,
         }));
         process.exit(EXIT_CODES.ERROR);
@@ -62,7 +61,7 @@ exports.handler = async (options) => {
     }
     catch (err) {
         debugError(err);
-        logger.error(i18n(`${i18nKey}.errors.failedToDownloadProject`));
+        logger.error(i18n(`commands.project.subcommands.create.errors.failedToDownloadProject`));
         process.exit(EXIT_CODES.ERROR);
     }
     const projectConfigPath = path.join(projectDest, PROJECT_CONFIG_FILE);
@@ -77,12 +76,12 @@ exports.handler = async (options) => {
         fs.ensureDirSync(path.join(projectDest, 'src'));
     }
     logger.log('');
-    logger.success(i18n(`${i18nKey}.logs.success`, {
+    logger.success(i18n(`commands.project.subcommands.create.logs.success`, {
         projectName: createProjectPromptResponse.name,
         projectDest,
     }));
     logger.log('');
-    logger.log(chalk.bold(i18n(`${i18nKey}.logs.welcomeMessage`)));
+    logger.log(chalk.bold(i18n(`commands.project.subcommands.create.logs.welcomeMessage`)));
     uiFeatureHighlight([
         'projectCommandTip',
         'projectUploadCommand',
@@ -97,27 +96,32 @@ exports.handler = async (options) => {
 exports.builder = yargs => {
     yargs.options({
         name: {
-            describe: i18n(`${i18nKey}.options.name.describe`),
+            describe: i18n(`commands.project.subcommands.create.options.name.describe`),
             type: 'string',
         },
         dest: {
-            describe: i18n(`${i18nKey}.options.dest.describe`),
+            describe: i18n(`commands.project.subcommands.create.options.dest.describe`),
             type: 'string',
         },
         template: {
-            describe: i18n(`${i18nKey}.options.template.describe`),
+            describe: i18n(`commands.project.subcommands.create.options.template.describe`),
             type: 'string',
         },
         'template-source': {
-            describe: i18n(`${i18nKey}.options.templateSource.describe`),
+            describe: i18n(`commands.project.subcommands.create.options.templateSource.describe`),
             type: 'string',
         },
     });
-    yargs.example([['$0 project create', i18n(`${i18nKey}.examples.default`)]]);
+    yargs.example([
+        [
+            '$0 project create',
+            i18n(`commands.project.subcommands.create.examples.default`),
+        ],
+    ]);
     yargs.example([
         [
             '$0 project create --template-source HubSpot/ui-extensions-examples',
-            i18n(`${i18nKey}.examples.templateSource`),
+            i18n(`commands.project.subcommands.create.examples.templateSource`),
         ],
     ]);
     addConfigOptions(yargs);

package/commands/project/deploy.js

@@ -13,7 +13,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,21 +23,20 @@ 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);
+exports.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;
@@ -48,7 +47,7 @@ async function handler(args) {
     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)();
+    const { projectConfig } = await (0, config_2.getProjectConfig)();
     let projectName = projectOption;
     if (!projectOption && projectConfig) {
         projectName = projectConfig.name;
@@ -61,7 +60,7 @@ async function handler(args) {
     try {
         const { data: { latestBuild, deployedBuildId }, } = await (0, projects_1.fetchProject)(derivedAccountId, 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) {
@@ -74,7 +73,7 @@ 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,
@@ -83,19 +82,19 @@ async function handler(args) {
             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));
         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);
     }
     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),
                 command: (0, ui_2.uiCommandReference)('hs project upload'),
@@ -116,20 +115,23 @@ 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',
         },
     });
     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;

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,