@hubspot/cli 7.6.0-beta.4 → 7.6.0-beta.5

package/commands/__tests__/getStarted.test.js

@@ -108,9 +108,6 @@ describe('commands/get-started', () => {
                 promptUtils_1.promptUser
                     .mockResolvedValueOnce({
                     default: constants_1.GET_STARTED_OPTIONS.APP,
-                })
-                    .mockResolvedValueOnce({
-                    shouldInstallDependencies: true,
                 })
                     .mockResolvedValueOnce({
                     shouldUpload: true,
@@ -149,13 +146,6 @@ describe('commands/get-started', () => {
                     }),
                 ]);
             });
-            it('should skip upload when user declines', async () => {
-                promptUtils_1.promptUser
-                    .mockResolvedValueOnce({ shouldInstallDependencies: false })
-                    .mockResolvedValueOnce({ shouldUpload: false });
-                await getStarted_1.default.handler(mockArgs);
-                expect(process.exit).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.SUCCESS);
-            });
         });
         describe('tracking', () => {
             it('should track command usage', async () => {

package/commands/getStarted.js

@@ -127,35 +127,20 @@ async function handler(args) {
         logger_1.uiLogger.log(' ');
         logger_1.uiLogger.log(en_1.commands.getStarted.prompts.projectCreated.description);
         logger_1.uiLogger.log(' ');
-        // 5. Install dependencies - Ask user if they want to install dependencies
+        // 5. Install dependencies
         const installLocations = await (0, dependencyManagement_1.getProjectPackageJsonLocations)(projectDest);
-        const { shouldInstallDependencies } = await (0, promptUtils_1.promptUser)([
-            {
-                type: 'confirm',
-                name: 'shouldInstallDependencies',
-                message: en_1.commands.getStarted.prompts.installDependencies,
-                default: true,
-            },
-        ]);
-        if (shouldInstallDependencies) {
-            try {
-                await (0, dependencyManagement_1.installPackages)({
-                    installLocations: installLocations,
-                });
-                logger_1.uiLogger.log(' ');
-                logger_1.uiLogger.success(en_1.commands.getStarted.logs.dependenciesInstalled);
-                logger_1.uiLogger.log(' ');
-            }
-            catch (err) {
-                logger_1.uiLogger.log(' ');
-                logger_1.uiLogger.error(en_1.commands.getStarted.errors.installDepsFailed);
-                (0, errorHandlers_1.logError)(err);
-                logger_1.uiLogger.log(' ');
-            }
+        try {
+            await (0, dependencyManagement_1.installPackages)({
+                installLocations: installLocations,
+            });
+            logger_1.uiLogger.log(' ');
+            logger_1.uiLogger.success(en_1.commands.getStarted.logs.dependenciesInstalled);
+            logger_1.uiLogger.log(' ');
         }
-        else {
+        catch (err) {
             logger_1.uiLogger.log(' ');
-            logger_1.uiLogger.log(en_1.commands.getStarted.logs.dependenciesNotInstalled);
+            logger_1.uiLogger.error(en_1.commands.getStarted.errors.installDepsFailed);
+            (0, errorHandlers_1.logError)(err);
             logger_1.uiLogger.log(' ');
         }
         // 6. Ask user if they want to upload the project
@@ -217,7 +202,7 @@ async function handler(args) {
                                 targetAccountId: derivedAccountId,
                                 env: env,
                                 appId: lastCreatedApp.id,
-                            }), { url: true });
+                            }) + '&tourId=get-started', { url: true });
                             logger_1.uiLogger.log(' ');
                             logger_1.uiLogger.success(en_1.commands.getStarted.openedDeveloperOverview);
                         }

package/commands/project/__tests__/deploy.test.js

@@ -39,8 +39,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const axios_1 = require("axios");
 const yargs_1 = __importDefault(require("yargs"));
 const chalk_1 = __importDefault(require("chalk"));
-const configUtils = __importStar(require("@hubspot/local-dev-lib/config"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
+const configUtils = __importStar(require("@hubspot/local-dev-lib/config"));
 const projectApiUtils = __importStar(require("@hubspot/local-dev-lib/api/projects"));
 const ui = __importStar(require("../../../lib/ui"));
 const commonOpts_1 = require("../../../lib/commonOpts");
@@ -54,7 +54,7 @@ const exitCodes_1 = require("../../../lib/enums/exitCodes");
 const exampleProject_json_1 = __importDefault(require("./fixtures/exampleProject.json"));
 const testUtils_1 = require("../../../lib/testUtils");
 const deploy_1 = __importDefault(require("../deploy"));
-vi.mock('@hubspot/local-dev-lib/logger');
+const logger_2 = require("../../../lib/ui/logger");
 vi.mock('@hubspot/local-dev-lib/api/projects');
 vi.mock('@hubspot/local-dev-lib/config');
 vi.mock('../../../lib/commonOpts');
@@ -65,8 +65,9 @@ vi.mock('../../../lib/projects/buildAndDeploy');
 vi.mock('../../../lib/prompts/projectNamePrompt');
 vi.mock('../../../lib/prompts/promptUtils');
 vi.mock('../../../lib/usageTracking');
+vi.mock('../../../lib/ui/logger');
+vi.mock('@hubspot/local-dev-lib/logger');
 vi.spyOn(ui, 'uiLine');
-const uiLinkSpy = vi.spyOn(ui, 'uiLink').mockImplementation(text => text);
 const uiCommandReferenceSpy = vi.spyOn(ui, 'uiCommandReference');
 const uiAccountDescriptionSpy = vi.spyOn(ui, 'uiAccountDescription');
 const getProjectConfigSpy = vi.spyOn(projectUtils, 'getProjectConfig');
@@ -139,6 +140,8 @@ describe('commands/project/deploy', () => {
             expect(commonOpts_1.addAccountOptions).toHaveBeenCalledWith(yargs_1.default);
             expect(commonOpts_1.addUseEnvironmentOptions).toHaveBeenCalledTimes(1);
             expect(commonOpts_1.addUseEnvironmentOptions).toHaveBeenCalledWith(yargs_1.default);
+            expect(commonOpts_1.addJSONOutputOptions).toHaveBeenCalledTimes(1);
+            expect(commonOpts_1.addJSONOutputOptions).toHaveBeenCalledWith(yargs_1.default);
         });
         it('should provide examples', () => {
             deploy_1.default.builder(yargs_1.default);
@@ -152,9 +155,9 @@ describe('commands/project/deploy', () => {
         const projectNameFromPrompt = 'project name from prompt';
         const deployDetails = {
             id: 123,
+            buildResultType: 'DEPLOY_QUEUED',
         };
         const projectDetailUrl = 'http://project-details-page-url.com';
-        const viewProjectsInHubSpot = 'View project builds in HubSpot';
         beforeEach(() => {
             args = {
                 project: 'project name from options',
@@ -174,9 +177,6 @@ describe('commands/project/deploy', () => {
                 projectName: projectNameFromPrompt,
             });
             getProjectDetailUrlSpy.mockReturnValue(projectDetailUrl);
-            uiLinkSpy.mockImplementation(text => {
-                return text;
-            });
             getAccountConfigSpy.mockReturnValue({ accountType, env: 'qa' });
             fetchProjectSpy.mockReturnValue((0, testUtils_1.mockHubSpotHttpResponse)(exampleProject_json_1.default));
             deployProjectSpy.mockReturnValue((0, testUtils_1.mockHubSpotHttpResponse)(deployDetails));
@@ -239,28 +239,24 @@ describe('commands/project/deploy', () => {
         it('should log an error and exit when latest build is not defined', async () => {
             fetchProjectSpy.mockReturnValue((0, testUtils_1.mockHubSpotHttpResponse)({}));
             await deploy_1.default.handler(args);
-            expect(logger_1.logger.error).toHaveBeenCalledTimes(1);
-            expect(logger_1.logger.error).toHaveBeenCalledWith('Deploy error: no builds for this project were found.');
+            expect(logger_2.uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(logger_2.uiLogger.error).toHaveBeenCalledWith('Deploy error: no builds for this project were found.');
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
         });
         it('should log an error and exit when buildId option is not a valid build', async () => {
             args.buildId = exampleProject_json_1.default.latestBuild.buildId + 1;
             await deploy_1.default.handler(args);
-            expect(uiLinkSpy).toHaveBeenCalledTimes(1);
-            expect(uiLinkSpy).toHaveBeenCalledWith(viewProjectsInHubSpot, projectDetailUrl);
-            expect(logger_1.logger.error).toHaveBeenCalledTimes(1);
-            expect(logger_1.logger.error).toHaveBeenCalledWith(`Build ${args.buildId} does not exist for project ${projectNameFromPrompt}. ${viewProjectsInHubSpot}`);
+            expect(logger_2.uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(logger_2.uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(`Build ${args.buildId} does not exist for project`));
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
         });
         it('should log an error and exit when buildId option is already deployed', async () => {
             args.buildId = exampleProject_json_1.default.deployedBuildId;
             await deploy_1.default.handler(args);
-            expect(uiLinkSpy).toHaveBeenCalledTimes(1);
-            expect(uiLinkSpy).toHaveBeenCalledWith(viewProjectsInHubSpot, projectDetailUrl);
-            expect(logger_1.logger.error).toHaveBeenCalledTimes(1);
-            expect(logger_1.logger.error).toHaveBeenCalledWith(`Build ${args.buildId} is already deployed. ${viewProjectsInHubSpot}`);
+            expect(logger_2.uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(logger_2.uiLogger.error).toHaveBeenCalledWith(expect.stringMatching(`Build ${args.buildId} is already deployed. View project builds in HubSpot.`));
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
         });
@@ -277,8 +273,8 @@ describe('commands/project/deploy', () => {
             promptUserSpy.mockResolvedValue({});
             await deploy_1.default.handler(args);
             expect(promptUserSpy).toHaveBeenCalledTimes(1);
-            expect(logger_1.logger.error).toHaveBeenCalledTimes(1);
-            expect(logger_1.logger.error).toHaveBeenCalledWith('You must specify a build to deploy');
+            expect(logger_2.uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(logger_2.uiLogger.error).toHaveBeenCalledWith('You must specify a build to deploy');
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
         });
@@ -291,8 +287,8 @@ describe('commands/project/deploy', () => {
             // @ts-expect-error Testing an edge case where the response is empty
             deployProjectSpy.mockResolvedValue({});
             await deploy_1.default.handler(args);
-            expect(logger_1.logger.error).toHaveBeenCalledTimes(1);
-            expect(logger_1.logger.error).toHaveBeenCalledWith(`Deploy error: an unknown error occurred.`);
+            expect(logger_2.uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(logger_2.uiLogger.error).toHaveBeenCalledWith(`Deploy error: an unknown error occurred.`);
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
         });
@@ -313,8 +309,8 @@ describe('commands/project/deploy', () => {
                 });
             });
             await deploy_1.default.handler(args);
-            expect(logger_1.logger.error).toHaveBeenCalledTimes(1);
-            expect(logger_1.logger.error).toHaveBeenCalledWith(`The project ${chalk_1.default.bold(projectNameFromPrompt)} does not exist in account ${accountDescription}. Run ${commandReference} to upload your project files to HubSpot.`);
+            expect(logger_2.uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(logger_2.uiLogger.error).toHaveBeenCalledWith(`The project ${chalk_1.default.bold(projectNameFromPrompt)} does not exist in account ${accountDescription}. Run ${commandReference} to upload your project files to HubSpot.`);
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
         });
@@ -327,8 +323,8 @@ describe('commands/project/deploy', () => {
                 });
             });
             await deploy_1.default.handler(args);
-            expect(logger_1.logger.error).toHaveBeenCalledTimes(1);
-            expect(logger_1.logger.error).toHaveBeenCalledWith('The request was bad.');
+            expect(logger_2.uiLogger.error).toHaveBeenCalledTimes(1);
+            expect(logger_2.uiLogger.error).toHaveBeenCalledWith('The request was bad.');
             expect(processExitSpy).toHaveBeenCalledTimes(1);
             expect(processExitSpy).toHaveBeenCalledWith(exitCodes_1.EXIT_CODES.ERROR);
         });

package/commands/project/__tests__/devUnifiedFlow.test.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const path_1 = __importDefault(require("path"));
 const config_1 = require("@hubspot/local-dev-lib/constants/config");
 const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
+// import { HsProfileFile } from '@hubspot/project-parsing-lib/src/lib/types';
 const config_2 = require("@hubspot/local-dev-lib/config");
 const environment_1 = require("@hubspot/local-dev-lib/environment");
 const errorHandlers_1 = require("../../../lib/errorHandlers");
@@ -69,9 +70,9 @@ describe('unifiedProjectDevFlow', () => {
     const mockProjectDir = '/test/project';
     const mockTargetProjectAccountId = 123;
     const mockProvidedTargetTestingAccountId = 456;
-    const mockProfileConfig = {
-        accountId: 789,
-    };
+    // const mockProfileConfig: HsProfileFile = {
+    //   accountId: 789,
+    // };
     const mockAccountConfig = {
         accountId: 123,
         name: 'test-account',
@@ -157,18 +158,21 @@ describe('unifiedProjectDevFlow', () => {
             expect(mockLocalDevWatcher.start).toHaveBeenCalled();
             expect(mockWebsocketServer.start).toHaveBeenCalled();
         });
-        it('should complete successfully with profile config', async () => {
-            await (0, unifiedFlow_1.unifiedProjectDevFlow)({
-                args: mockArgs,
-                targetProjectAccountId: mockTargetProjectAccountId,
-                projectConfig: mockProjectConfig,
-                projectDir: mockProjectDir,
-                profileConfig: mockProfileConfig,
-            });
-            expect(LocalDevProcess_1.default).toHaveBeenCalledWith(expect.objectContaining({
-                targetTestingAccountId: mockProfileConfig.accountId,
-            }));
-        });
+        // TODO: Restore test once we've switched back to using profile account for testing
+        // it('should complete successfully with profile config', async () => {
+        //   await unifiedProjectDevFlow({
+        //     args: mockArgs,
+        //     targetProjectAccountId: mockTargetProjectAccountId,
+        //     projectConfig: mockProjectConfig,
+        //     projectDir: mockProjectDir,
+        //     profileConfig: mockProfileConfig,
+        //   });
+        //   expect(LocalDevProcess).toHaveBeenCalledWith(
+        //     expect.objectContaining({
+        //       targetTestingAccountId: mockProfileConfig.accountId,
+        //     })
+        //   );
+        // });
         it('should use target project account as testing account when it is a test account', async () => {
             accountTypes_1.isTestAccountOrSandbox.mockReturnValue(true);
             await (0, unifiedFlow_1.unifiedProjectDevFlow)({
@@ -258,7 +262,7 @@ describe('unifiedProjectDevFlow', () => {
                 projectConfig: mockProjectConfig,
                 projectDir: mockProjectDir,
             });
-            expect(helpers_1.createDeveloperTestAccountForLocalDev).toHaveBeenCalledWith(mockTargetProjectAccountId, mockAccountConfig, environments_1.ENVIRONMENTS.PROD);
+            expect(helpers_1.createDeveloperTestAccountForLocalDev).toHaveBeenCalledWith(mockTargetProjectAccountId, mockAccountConfig, environments_1.ENVIRONMENTS.PROD, true);
             expect(LocalDevProcess_1.default).toHaveBeenCalledWith(expect.objectContaining({
                 targetTestingAccountId: 999,
             }));

package/commands/project/deploy.d.ts

@@ -1,5 +1,5 @@
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
-export type ProjectDeployArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs';
+export type ProjectDeployArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & JSONOutputArgs & {
     project?: string;
     build?: number;
     buildId?: number;

package/commands/project/deploy.js

@@ -1,65 +1,50 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-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");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 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 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");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
-const lang_1 = require("../../lib/lang");
 const ui_1 = require("../../lib/ui");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
-const ui_2 = require("../../lib/ui");
+const logger_1 = require("../../lib/ui/logger");
 const yargsUtils_1 = require("../../lib/yargsUtils");
 const projectProfiles_1 = require("../../lib/projectProfiles");
 const constants_1 = require("../../lib/constants");
+const en_1 = require("../../lang/en");
 const command = 'deploy';
-const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.deploy.describe`), false);
+const describe = (0, ui_1.uiBetaTag)(en_1.commands.project.deploy.describe, false);
 function validateBuildId(buildId, deployedBuildId, latestBuildId, projectName, accountId) {
     if (Number(buildId) > latestBuildId) {
-        return (0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.buildIdDoesNotExist`, {
-            buildId: buildId,
-            projectName: projectName,
-            linkToProject: (0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.viewProjectsBuilds`), (0, urls_1.getProjectDetailUrl)(projectName, accountId)),
-        });
+        return en_1.commands.project.deploy.errors.buildIdDoesNotExist(accountId, buildId, projectName);
     }
     if (Number(buildId) === deployedBuildId) {
-        return (0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.buildAlreadyDeployed`, {
-            buildId: buildId,
-            linkToProject: (0, ui_1.uiLink)((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.viewProjectsBuilds`), (0, urls_1.getProjectDetailUrl)(projectName, accountId)),
-        });
+        return en_1.commands.project.deploy.errors.buildAlreadyDeployed(accountId, buildId, projectName);
     }
     return true;
 }
 function logDeployErrors(errorData) {
-    logger_1.logger.error(errorData.message);
+    logger_1.uiLogger.error(errorData.message);
     errorData.errors.forEach(err => {
         if (err.subCategory === constants_1.PROJECT_ERROR_TYPES.DEPLOY_CONTAINS_REMOVALS) {
-            logger_1.logger.log((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.deployContainsRemovals`, {
-                componentName: err.context.COMPONENT_NAME,
-                forceFlag: (0, ui_2.uiCommandReference)('--force'),
-            }));
+            logger_1.uiLogger.log(en_1.commands.project.deploy.errors.deployContainsRemovals(err.context.COMPONENT_NAME));
         }
         else {
-            logger_1.logger.log(err.message);
+            logger_1.uiLogger.log(err.message);
         }
     });
 }
 async function handler(args) {
-    const { derivedAccountId, project: projectOption, buildId: buildIdOption, force: forceOption, deployLatestBuild: deployLatestBuildOption, } = args;
+    const { derivedAccountId, project: projectOption, buildId: buildIdOption, force: forceOption, deployLatestBuild: deployLatestBuildOption, json: formatOutputAsJson, } = args;
     const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
     let targetAccountId;
+    const jsonOutput = {};
     const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
     if ((0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion)) {
         if (args.profile) {
@@ -90,16 +75,17 @@ async function handler(args) {
     });
     projectName = namePromptResponse.projectName;
     let buildIdToDeploy = buildIdOption;
+    let deploySuccess = false;
     try {
         const { data: { latestBuild, deployedBuildId }, } = await (0, projects_1.fetchProject)(targetAccountId, projectName);
         if (!latestBuild || !latestBuild.buildId) {
-            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.noBuilds`));
+            logger_1.uiLogger.error(en_1.commands.project.deploy.errors.noBuilds);
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         if (buildIdToDeploy) {
             const validationResult = validateBuildId(buildIdToDeploy, deployedBuildId, latestBuild.buildId, projectName, targetAccountId);
             if (validationResult !== true) {
-                logger_1.logger.error(validationResult);
+                logger_1.uiLogger.error(validationResult.toString());
                 return process.exit(exitCodes_1.EXIT_CODES.ERROR);
             }
         }
@@ -110,7 +96,7 @@ async function handler(args) {
             else {
                 const deployBuildIdPromptResponse = await (0, promptUtils_1.promptUser)({
                     name: 'buildId',
-                    message: (0, lang_1.i18n)(`commands.project.subcommands.deploy.deployBuildIdPrompt`),
+                    message: en_1.commands.project.deploy.deployBuildIdPrompt,
                     default: latestBuild.buildId === deployedBuildId
                         ? undefined
                         : latestBuild.buildId,
@@ -120,30 +106,32 @@ async function handler(args) {
             }
         }
         if (!buildIdToDeploy) {
-            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.noBuildId`));
+            logger_1.uiLogger.error(en_1.commands.project.deploy.errors.noBuildId);
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
         const { data: deployResp } = await (0, projects_1.deployProject)(targetAccountId, projectName, buildIdToDeploy, (0, buildAndDeploy_1.useV3Api)(projectConfig?.platformVersion), forceOption);
-        if (!deployResp) {
-            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.deploy`));
+        if (!deployResp || deployResp.buildResultType !== 'DEPLOY_QUEUED') {
+            logger_1.uiLogger.error(en_1.commands.project.deploy.errors.deploy);
             return process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
-        await (0, buildAndDeploy_2.pollDeployStatus)(targetAccountId, projectName, Number(deployResp.id), buildIdToDeploy);
+        else if (formatOutputAsJson) {
+            jsonOutput.deployId = Number(deployResp.id);
+        }
+        const deployResult = await (0, buildAndDeploy_2.pollDeployStatus)(targetAccountId, projectName, Number(deployResp.id), buildIdToDeploy);
+        if (deployResult.status === constants_1.PROJECT_DEPLOY_TEXT.STATES.SUCCESS) {
+            deploySuccess = true;
+        }
     }
     catch (e) {
         if ((0, index_1.isHubSpotHttpError)(e) && e.status === 404) {
-            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)(targetAccountId),
-                command: (0, ui_2.uiCommandReference)('hs project upload'),
-            }));
+            logger_1.uiLogger.error(en_1.commands.project.deploy.errors.projectNotFound(targetAccountId, projectName));
         }
         else if ((0, index_1.isHubSpotHttpError)(e) && e.status === 400) {
             if (e.data?.message && e.data?.errors) {
                 logDeployErrors(e.data);
             }
             else {
-                logger_1.logger.error(e.message);
+                logger_1.uiLogger.error(e.message);
             }
         }
         else {
@@ -154,33 +142,42 @@ async function handler(args) {
         }
         return process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    if (formatOutputAsJson) {
+        logger_1.uiLogger.json(jsonOutput);
+    }
+    if (deploySuccess) {
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    }
+    else {
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
 }
 function projectDeployBuilder(yargs) {
     yargs.options({
         project: {
-            describe: (0, lang_1.i18n)(`commands.project.subcommands.deploy.options.project.describe`),
+            describe: en_1.commands.project.deploy.options.project,
             type: 'string',
         },
         build: {
             alias: ['build-id'],
-            describe: (0, lang_1.i18n)(`commands.project.subcommands.deploy.options.build.describe`),
+            describe: en_1.commands.project.deploy.options.build,
             type: 'number',
         },
         deployLatestBuild: {
             alias: ['deploy-latest-build'],
-            describe: (0, lang_1.i18n)(`commands.project.subcommands.deploy.options.deployLatestBuild.describe`),
+            describe: en_1.commands.project.deploy.options.deployLatestBuild,
             default: false,
             type: 'boolean',
         },
         profile: {
             alias: ['p'],
-            describe: (0, lang_1.i18n)(`commands.project.subcommands.deploy.options.profile.describe`),
+            describe: en_1.commands.project.deploy.options.profile,
             type: 'string',
             hidden: true,
         },
         force: {
             alias: ['f'],
-            describe: (0, lang_1.i18n)(`commands.project.subcommands.deploy.options.force.describe`),
+            describe: en_1.commands.project.deploy.options.force,
             default: false,
             type: 'boolean',
         },
@@ -188,13 +185,10 @@ function projectDeployBuilder(yargs) {
     yargs.conflicts('profile', 'project');
     yargs.conflicts('profile', 'account');
     yargs.example([
-        [
-            '$0 project deploy',
-            (0, lang_1.i18n)(`commands.project.subcommands.deploy.examples.default`),
-        ],
+        ['$0 project deploy', en_1.commands.project.deploy.examples.default],
         [
             '$0 project deploy --project="my-project" --build=5',
-            (0, lang_1.i18n)(`commands.project.subcommands.deploy.examples.withOptions`),
+            en_1.commands.project.deploy.examples.withOptions,
         ],
     ]);
     return yargs;
@@ -204,6 +198,7 @@ const builder = (0, yargsUtils_1.makeYargsBuilder)(projectDeployBuilder, command
     useConfigOptions: true,
     useAccountOptions: true,
     useEnvironmentOptions: true,
+    useJSONOutputOptions: true,
 });
 const projectDeployCommand = {
     command,

package/commands/project/dev/unifiedFlow.js

@@ -64,11 +64,12 @@ async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTar
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     let targetTestingAccountId = providedTargetTestingAccountId;
-    if (profileConfig) {
-        // Bypass the prompt for the testing account if the user has a profile configured
-        targetTestingAccountId = profileConfig.accountId;
-    }
-    else if (
+    // Temporarily removing logic to use profile account as testing account
+    // if (profileConfig) {
+    //   // Bypass the prompt for the testing account if the user has a profile configured
+    //   targetTestingAccountId = profileConfig.accountId;
+    // } else
+    if (
     // Bypass the prompt for the testing account if default account is already a test account
     !targetTestingAccountId &&
         targetProjectAccountIsTestAccountOrSandbox) {
@@ -93,7 +94,7 @@ async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTar
             }
             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);
+                targetTestingAccountId = await (0, helpers_1.createDeveloperTestAccountForLocalDev)(targetProjectAccountId, targetProjectAccountConfig, env, true);
             }
         }
         else if (accountType === config_1.HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX) {

package/commands/testAccount/create.js

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
-const developerTestAccounts_1 = require("@hubspot/local-dev-lib/api/developerTestAccounts");
 const path_2 = require("@hubspot/local-dev-lib/path");
 const yargsUtils_1 = require("../../lib/yargsUtils");
 const promptUtils_1 = require("../../lib/prompts/promptUtils");
@@ -16,8 +15,8 @@ const validation_1 = require("../../lib/validation");
 const en_1 = require("../../lang/en");
 const createDeveloperTestAccountConfigPrompt_1 = require("../../lib/prompts/createDeveloperTestAccountConfigPrompt");
 const errorHandlers_1 = require("../../lib/errorHandlers");
-const polling_1 = require("../../lib/polling");
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
+const buildAccount_1 = require("../../lib/buildAccount");
 const command = 'create';
 const describe = en_1.commands.testAccount.create.describe;
 async function handler(args) {
@@ -73,45 +72,20 @@ async function handler(args) {
         text: en_1.commands.testAccount.create.polling.start(testAccountConfig.accountName),
     });
     try {
-        const { data } = await (0, developerTestAccounts_1.createDeveloperTestAccount)(derivedAccountId, testAccountConfig);
+        const result = await (0, buildAccount_1.createDeveloperTestAccountV3)(derivedAccountId, testAccountConfig);
         if (formatOutputAsJson) {
-            jsonOutput.accountName = data.accountName;
-            jsonOutput.accountId = data.id;
+            jsonOutput.accountName = result.accountName;
+            jsonOutput.accountId = result.accountId;
+            jsonOutput.personalAccessKey = result.personalAccessKey;
         }
-        testAccountId = data.id;
+        testAccountId = result.accountId;
     }
     catch (err) {
         (0, errorHandlers_1.logError)(err);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    SpinniesManager_1.default.update('createTestAccount', {
-        text: en_1.commands.testAccount.create.polling.syncing,
-    });
-    try {
-        await (0, polling_1.poll)(() => (0, developerTestAccounts_1.fetchDeveloperTestAccountGateSyncStatus)(derivedAccountId, testAccountId), {
-            successStates: ['SUCCESS'],
-            errorStates: [],
-        });
-    }
-    catch (err) {
-        (0, errorHandlers_1.debugError)(err);
         SpinniesManager_1.default.fail('createTestAccount', {
-            text: en_1.commands.testAccount.create.polling.failure,
-        });
-    }
-    // HACK: The status endpoint sometimes returns an early success status.
-    // Sleep for an extra 5 seconds to make sure the sync is actually complete.
-    await new Promise(resolve => setTimeout(resolve, 5000));
-    try {
-        // Attempt to generate a new personal access key for the test account now that gate sync is complete.
-        const { data } = await (0, developerTestAccounts_1.generateDeveloperTestAccountPersonalAccessKey)(derivedAccountId, testAccountId);
-        jsonOutput.personalAccessKey = data.personalAccessKey;
-    }
-    catch (err) {
-        (0, errorHandlers_1.debugError)(err);
-        SpinniesManager_1.default.fail('createTestAccount', {
-            text: en_1.commands.testAccount.create.polling.failure,
+            text: en_1.commands.testAccount.create.polling.createFailure,
         });
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     SpinniesManager_1.default.succeed('createTestAccount', {
         text: en_1.commands.testAccount.create.polling.success(testAccountConfig.accountName, testAccountId),