@hubspot/cli 7.6.0-beta.1 → 7.6.0-beta.2

package/bin/hs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
 
-require('./silenceErrors')
+require('./silenceErrors');
 
 require('./cli');

package/commands/account/auth.js

@@ -98,9 +98,9 @@ async function handleConfigMigration() {
 const describe = en_1.commands.account.subcommands.auth.describe;
 const command = 'auth';
 async function handler(args) {
-    const { providedAccountId, disableTracking, personalAccessKey: providedPersonalAccessKey, } = args;
+    const { disableTracking, personalAccessKey: providedPersonalAccessKey, derivedAccountId, } = args;
     if (!disableTracking) {
-        (0, usageTracking_1.trackCommandUsage)('account-auth', {}, providedAccountId);
+        (0, usageTracking_1.trackCommandUsage)('account-auth', {}, derivedAccountId);
         await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.STARTED);
     }
     const configMigrationSuccess = await handleConfigMigration();
@@ -114,7 +114,7 @@ async function handler(args) {
     }
     (0, config_1.loadConfig)('');
     (0, process_1.handleExit)(config_1.deleteEmptyConfigFile);
-    const updatedConfig = await updateConfigWithNewAccount(args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD, configAlreadyExists, providedPersonalAccessKey, providedAccountId);
+    const updatedConfig = await updateConfigWithNewAccount(args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD, configAlreadyExists, providedPersonalAccessKey, derivedAccountId);
     if (!updatedConfig) {
         if (!disableTracking) {
             await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);

package/commands/auth.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const git_1 = require("../lib/ui/git");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
 const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
 const config_1 = require("@hubspot/local-dev-lib/constants/config");
-const lang_1 = require("../lib/lang");
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const config_2 = require("@hubspot/local-dev-lib/config");
 const text_1 = require("@hubspot/local-dev-lib/text");
@@ -21,6 +19,8 @@ const exitCodes_1 = require("../lib/enums/exitCodes");
 const ui_1 = require("../lib/ui");
 const index_1 = require("../lib/errorHandlers/index");
 const en_1 = require("../lang/en");
+const logger_1 = require("../lib/ui/logger");
+const parsing_1 = require("../lib/parsing");
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -32,9 +32,19 @@ const ALLOWED_AUTH_METHODS = [
 ];
 const SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT = (0, text_1.commaSeparatedValues)(ALLOWED_AUTH_METHODS);
 const command = 'auth';
-const describe = (0, lang_1.i18n)('commands.auth.describe');
+const describe = en_1.commands.auth.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, config: configFlagValue, qa, providedAccountId, personalAccessKey: providedPersonalAccessKey, } = args;
+    const { authType: authTypeFlagValue, config: configFlagValue, qa, personalAccessKey: providedPersonalAccessKey, userProvidedAccount, } = args;
+    let parsedUserProvidedAccountId;
+    try {
+        if (userProvidedAccount) {
+            parsedUserProvidedAccountId = (0, parsing_1.parseStringToNumber)(userProvidedAccount);
+        }
+    }
+    catch (err) {
+        (0, index_1.logError)(en_1.commands.auth.errors.invalidAccountIdProvided);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     (0, commonOpts_1.setLogLevel)(args);
@@ -46,13 +56,11 @@ async function handler(args) {
         (0, git_1.checkAndWarnGitInclusion)(configPath);
     }
     if ((0, config_2.configFileExists)(true)) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.auth.errors.globalConfigFileExists`, {
-            accountAuthCommand: (0, ui_1.uiCommandReference)('hs account auth'),
-        }));
+        logger_1.uiLogger.error(en_1.commands.auth.errors.globalConfigFileExists('hs account auth'));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     (0, usageTracking_1.trackCommandUsage)('auth');
-    (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.STARTED, providedAccountId);
+    (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     let configData;
     let updatedConfig;
     let validName;
@@ -73,7 +81,7 @@ async function handler(args) {
                 ? { personalAccessKey: providedPersonalAccessKey }
                 : await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
                     env,
-                    account: providedAccountId,
+                    account: parsedUserProvidedAccountId,
                 });
             try {
                 token = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env);
@@ -101,24 +109,17 @@ async function handler(args) {
             successAuthMethod = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.name;
             break;
         default:
-            logger_1.logger.error((0, lang_1.i18n)('commands.auth.errors.unsupportedAuthType', {
-                supportedProtocols: SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT,
-                type: authType,
-            }));
+            logger_1.uiLogger.error(en_1.commands.auth.errors.unsupportedAuthType(authType, SUPPORTED_AUTHENTICATION_PROTOCOLS_TEXT));
             break;
     }
     if (!successAuthMethod) {
-        await (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.ERROR, providedAccountId);
+        await (0, usageTracking_1.trackAuthAction)('auth', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const nameFromConfigData = configData && 'name' in configData ? configData.name : undefined;
     const accountName = (updatedConfig && updatedConfig.name) || validName || nameFromConfigData;
     await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(accountName);
-    logger_1.logger.success((0, lang_1.i18n)('commands.auth.success.configFileUpdated', {
-        configFilename: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-        authType: successAuthMethod,
-        accountName,
-    }));
+    logger_1.uiLogger.success(en_1.commands.auth.success.configFileUpdated(accountName, config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, successAuthMethod));
     (0, ui_1.uiFeatureHighlight)([
         'accountsUseCommand',
         'accountOption',
@@ -131,7 +132,7 @@ async function handler(args) {
 function authBuilder(yargs) {
     yargs.options({
         'auth-type': {
-            describe: (0, lang_1.i18n)('commands.auth.options.authType.describe'),
+            describe: en_1.commands.auth.options.authType.describe,
             type: 'string',
             choices: [
                 `${auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
@@ -140,7 +141,7 @@ function authBuilder(yargs) {
             default: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         },
         account: {
-            describe: (0, lang_1.i18n)('commands.auth.options.account.describe'),
+            describe: en_1.commands.auth.options.account.describe,
             type: 'string',
             alias: 'a',
         },
@@ -153,10 +154,7 @@ function authBuilder(yargs) {
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, command, (0, lang_1.i18n)('commands.auth.verboseDescribe', {
-    authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-    configName: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-}), {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(authBuilder, command, en_1.commands.auth.verboseDescribe(auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value, config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME), {
     useGlobalOptions: true,
     useConfigOptions: true,
     useTestingOptions: true,

package/commands/getStarted.js

@@ -14,20 +14,25 @@ const usageTracking_1 = require("../lib/usageTracking");
 const exitCodes_1 = require("../lib/enums/exitCodes");
 const yargsUtils_1 = require("../lib/yargsUtils");
 const promptUtils_1 = require("../lib/prompts/promptUtils");
-const createProjectPrompt_1 = require("../lib/prompts/createProjectPrompt");
+const projectNameAndDestPrompt_1 = require("../lib/prompts/projectNameAndDestPrompt");
 const ui_1 = require("../lib/ui");
 const logger_1 = require("../lib/ui/logger");
 const errorHandlers_1 = require("../lib/errorHandlers");
 const upload_1 = require("../lib/projects/upload");
 const constants_1 = require("../lib/constants");
 const config_1 = require("../lib/projects/config");
+const dependencyManagement_1 = require("../lib/dependencyManagement");
 const buildAndDeploy_1 = require("../lib/projects/buildAndDeploy");
-const urls_1 = require("../lib/projects/urls");
 const links_1 = require("../lib/links");
+const urls_1 = require("../lib/app/urls");
+const config_2 = require("@hubspot/local-dev-lib/config");
+const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
+const appsDev_1 = require("@hubspot/local-dev-lib/api/appsDev");
 exports.command = 'get-started';
 exports.describe = undefined;
 async function handler(args) {
     const { derivedAccountId } = args;
+    const env = (0, config_2.getEnv)(derivedAccountId) === 'qa' ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
     // TODO: Put this in constants.ts once we have a defined place for the template before INBOUND
     const templateSource = 'robrown-hubspot/hubspot-project-components-ua-app-objects-beta';
     (0, usageTracking_1.trackCommandUsage)('get-started', {}, derivedAccountId);
@@ -73,10 +78,10 @@ async function handler(args) {
     }
     else {
         logger_1.uiLogger.log(' ');
-        logger_1.uiLogger.log(en_1.commands.getStarted.prompts.appSelected);
+        logger_1.uiLogger.log(en_1.commands.getStarted.logs.appSelected);
         // 1. Fetch project templates
         let latestRepoReleaseTag;
-        const { dest, name } = await (0, createProjectPrompt_1.createProjectPrompt)(args);
+        const { dest, name } = await (0, projectNameAndDestPrompt_1.projectNameAndDestPrompt)(args);
         // Specific template for get-started command
         const projectTemplate = {
             name: 'private-app-get-started-template',
@@ -122,7 +127,44 @@ async function handler(args) {
         logger_1.uiLogger.log(' ');
         logger_1.uiLogger.log(en_1.commands.getStarted.prompts.projectCreated.description);
         logger_1.uiLogger.log(' ');
-        // 5. Ask user if they want to upload the project
+        // 5. Install dependencies - Ask user if they want to install dependencies
+        const { shouldInstallDependencies } = await (0, promptUtils_1.promptUser)([
+            {
+                type: 'confirm',
+                name: 'shouldInstallDependencies',
+                message: en_1.commands.getStarted.prompts.installDependencies,
+                default: true,
+            },
+        ]);
+        if (shouldInstallDependencies) {
+            try {
+                // Change to the project directory to install dependencies
+                const originalCwd = process.cwd();
+                process.chdir(projectDest);
+                try {
+                    await (0, dependencyManagement_1.installPackages)({});
+                    logger_1.uiLogger.log(' ');
+                    logger_1.uiLogger.success(en_1.commands.getStarted.logs.dependenciesInstalled);
+                    logger_1.uiLogger.log(' ');
+                }
+                finally {
+                    // Always restore the original working directory
+                    process.chdir(originalCwd);
+                }
+            }
+            catch (err) {
+                logger_1.uiLogger.log(' ');
+                logger_1.uiLogger.error(en_1.commands.getStarted.errors.installDepsFailed);
+                console.log(err);
+                logger_1.uiLogger.log(' ');
+            }
+        }
+        else {
+            logger_1.uiLogger.log(' ');
+            logger_1.uiLogger.log(en_1.commands.getStarted.logs.dependenciesNotInstalled);
+            logger_1.uiLogger.log(' ');
+        }
+        // 6. Ask user if they want to upload the project
         const { shouldUpload } = await (0, promptUtils_1.promptUser)([
             {
                 type: 'confirm',
@@ -162,8 +204,9 @@ async function handler(args) {
                     (0, errorHandlers_1.debugError)(uploadError);
                 }
                 else if (result) {
-                    logger_1.uiLogger.log(' ');
                     logger_1.uiLogger.success(en_1.commands.getStarted.logs.uploadSuccess);
+                    const { data: { results }, } = await (0, appsDev_1.fetchPublicAppsForPortal)(derivedAccountId);
+                    const lastCreatedApp = results.sort((a, b) => b.createdAt - a.createdAt)[0];
                     if (process.env.BROWSER !== 'none') {
                         logger_1.uiLogger.log(' ');
                         logger_1.uiLogger.log(en_1.commands.getStarted.developerOverviewBrowserOpenPrep);
@@ -172,11 +215,15 @@ async function handler(args) {
                             {
                                 name: 'shouldOpenOverview',
                                 type: 'confirm',
-                                message: en_1.commands.getStarted.openDeveloperOverviewPrompt,
+                                message: en_1.commands.getStarted.openInstallUrl,
                             },
                         ]);
                         if (shouldOpenOverview) {
-                            (0, open_1.default)((0, urls_1.getProjectComponentDistributionUrl)(name, 'get_started_app', derivedAccountId), { url: true });
+                            (0, open_1.default)((0, urls_1.getStaticAuthAppInstallUrl)({
+                                targetAccountId: derivedAccountId,
+                                env: env,
+                                appId: lastCreatedApp.id,
+                            }), { url: true });
                             logger_1.uiLogger.log(' ');
                             logger_1.uiLogger.success(en_1.commands.getStarted.openedDeveloperOverview);
                         }

package/commands/init.js

@@ -13,13 +13,11 @@ const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const path_2 = require("@hubspot/local-dev-lib/path");
 const text_1 = require("@hubspot/local-dev-lib/text");
 const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
 const commonOpts_1 = require("../lib/commonOpts");
 const yargsUtils_1 = require("../lib/yargsUtils");
 const process_1 = require("../lib/process");
 const index_1 = require("../lib/errorHandlers/index");
-const lang_1 = require("../lib/lang");
 const usageTracking_1 = require("../lib/usageTracking");
 const promptUtils_1 = require("../lib/prompts/promptUtils");
 const personalAccessKeyPrompt_1 = require("../lib/prompts/personalAccessKeyPrompt");
@@ -27,6 +25,9 @@ const accountNamePrompt_1 = require("../lib/prompts/accountNamePrompt");
 const oauth_1 = require("../lib/oauth");
 const exitCodes_1 = require("../lib/enums/exitCodes");
 const ui_1 = require("../lib/ui");
+const logger_1 = require("../lib/ui/logger");
+const en_1 = require("../lang/en");
+const parsing_1 = require("../lib/parsing");
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
@@ -61,9 +62,19 @@ const AUTH_TYPE_NAMES = {
     [auth_1.OAUTH_AUTH_METHOD.value]: auth_1.OAUTH_AUTH_METHOD.name,
 };
 const command = 'init';
-const describe = (0, lang_1.i18n)(`commands.init.describe`);
+const describe = en_1.commands.init.describe;
 async function handler(args) {
-    const { authType: authTypeFlagValue, c: configFlagValue, providedAccountId, disableTracking, useHiddenConfig, } = args;
+    const { authType: authTypeFlagValue, c: configFlagValue, disableTracking, useHiddenConfig, userProvidedAccount, } = args;
+    let parsedUserProvidedAccountId;
+    try {
+        if (userProvidedAccount) {
+            parsedUserProvidedAccountId = (0, parsing_1.parseStringToNumber)(userProvidedAccount);
+        }
+    }
+    catch (err) {
+        logger_1.uiLogger.error(en_1.commands.init.errors.invalidAccountIdProvided);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     const authType = (authTypeFlagValue && authTypeFlagValue.toLowerCase()) ||
         auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     const configPath = (configFlagValue && path_1.default.join((0, path_2.getCwd)(), configFlagValue)) ||
@@ -76,28 +87,24 @@ async function handler(args) {
     }
     const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
     if ((0, config_1.configFileExists)(true)) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.globalConfigFileExists`, {
-            accountAuthCommand: (0, ui_1.uiCommandReference)('hs account auth'),
-        }));
+        logger_1.uiLogger.error(en_1.commands.init.errors.globalConfigFileExists);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (fs_extra_1.default.existsSync(configPath)) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.configFileExists`, {
-            configPath: configPath,
-        }));
-        logger_1.logger.info((0, lang_1.i18n)(`commands.init.logs.updateConfig`));
+        logger_1.uiLogger.error(en_1.commands.init.errors.configFileExists(configPath));
+        logger_1.uiLogger.info(en_1.commands.init.logs.updateConfig);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     if (!disableTracking) {
-        await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, providedAccountId);
+        await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     }
     const doesOtherConfigFileExist = (0, config_1.configFileExists)(!useHiddenConfig);
     if (doesOtherConfigFileExist) {
         const path = (0, config_1.getConfigPath)('', !useHiddenConfig);
-        logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.bothConfigFilesNotAllowed`, { path: path }));
+        logger_1.uiLogger.error(en_1.commands.init.errors.bothConfigFilesNotAllowed(path));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, providedAccountId);
+    (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
     (0, config_1.createEmptyConfigFile)({ path: configPath }, useHiddenConfig);
     //Needed to load deprecated config
     (0, config_1.loadConfig)(configPath, args);
@@ -106,7 +113,7 @@ async function handler(args) {
         let accountId;
         let name;
         if (authType === auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value) {
-            const personalAccessKeyResult = await personalAccessKeyConfigCreationFlow(env, providedAccountId);
+            const personalAccessKeyResult = await personalAccessKeyConfigCreationFlow(env, parsedUserProvidedAccountId);
             if (personalAccessKeyResult) {
                 accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(personalAccessKeyResult);
                 name = personalAccessKeyResult.name;
@@ -124,14 +131,9 @@ async function handler(args) {
         catch (e) {
             (0, index_1.debugError)(e);
         }
-        logger_1.logger.log('');
-        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileCreated`, {
-            configPath: configPath,
-        }));
-        logger_1.logger.success((0, lang_1.i18n)(`commands.init.success.configFileUpdated`, {
-            authType: AUTH_TYPE_NAMES[authType],
-            account: name || accountId,
-        }));
+        logger_1.uiLogger.log('');
+        logger_1.uiLogger.success(en_1.commands.init.success.configFileCreated(configPath));
+        logger_1.uiLogger.success(en_1.commands.init.success.configFileUpdated(AUTH_TYPE_NAMES[authType], name || accountId));
         (0, ui_1.uiFeatureHighlight)([
             'getStartedCommand',
             'helpCommand',
@@ -146,7 +148,7 @@ async function handler(args) {
     catch (err) {
         (0, index_1.logError)(err);
         if (!disableTracking) {
-            await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.ERROR, providedAccountId);
+            await (0, usageTracking_1.trackAuthAction)('init', authType, TRACKING_STATUS.ERROR, parsedUserProvidedAccountId);
         }
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
@@ -154,7 +156,7 @@ async function handler(args) {
 function initBuilder(yargs) {
     yargs.options({
         'auth-type': {
-            describe: (0, lang_1.i18n)(`commands.init.options.authType.describe`),
+            describe: en_1.commands.init.options.authType.describe,
             type: 'string',
             choices: [
                 `${auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value}`,
@@ -163,7 +165,7 @@ function initBuilder(yargs) {
             default: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
         },
         account: {
-            describe: (0, lang_1.i18n)(`commands.init.options.account.describe`),
+            describe: en_1.commands.init.options.account.describe,
             type: 'string',
             alias: 'a',
         },
@@ -176,11 +178,7 @@ function initBuilder(yargs) {
     yargs.conflicts('use-hidden-config', 'config');
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, command, (0, lang_1.i18n)(`commands.init.verboseDescribe`, {
-    command: (0, ui_1.uiCommandReference)('hs auth'),
-    configName: config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-    authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-}), {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(initBuilder, command, en_1.commands.init.verboseDescribe(config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, (0, ui_1.uiCommandReference)('hs auth'), auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value), {
     useGlobalOptions: true,
     useConfigOptions: true,
     useTestingOptions: true,

package/commands/project/cloneApp.js

@@ -8,7 +8,7 @@ const fs_1 = __importDefault(require("fs"));
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const selectPublicAppForMigrationPrompt_1 = require("../../lib/prompts/selectPublicAppForMigrationPrompt");
-const createProjectPrompt_1 = require("../../lib/prompts/createProjectPrompt");
+const projectNameAndDestPrompt_1 = require("../../lib/prompts/projectNameAndDestPrompt");
 const polling_1 = require("../../lib/polling");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
@@ -53,9 +53,9 @@ async function handler(args) {
             });
             appId = appIdResponse.appId;
         }
-        const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args);
-        projectName = createProjectPromptResponse.name;
-        projectDest = createProjectPromptResponse.dest;
+        const projectNameAndDestPromptResponse = await (0, projectNameAndDestPrompt_1.projectNameAndDestPrompt)(args);
+        projectName = projectNameAndDestPromptResponse.name;
+        projectDest = projectNameAndDestPromptResponse.dest;
     }
     catch (error) {
         (0, errorHandlers_1.logError)(error, new errorHandlers_1.ApiErrorContext({ accountId: derivedAccountId }));

package/commands/project/create.js

@@ -39,15 +39,15 @@ async function handler(args) {
         (0, errorHandlers_1.logError)(error);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const { authType, distribution, repoConfig, projectContents, createProjectPromptResponse, } = handleResult;
+    const { authType, distribution, repoConfig, projectContents, selectProjectTemplatePromptResponse, projectNameAndDestPromptResponse, } = handleResult;
     (0, usageTracking_1.trackCommandUsage)('project-create', {
-        type: createProjectPromptResponse.projectTemplate?.name ||
-            (createProjectPromptResponse.componentTemplates || [])
+        type: selectProjectTemplatePromptResponse.projectTemplate?.name ||
+            (selectProjectTemplatePromptResponse.componentTemplates || [])
                 // @ts-expect-error
                 .map((item) => item.label)
                 .join(','),
     }, derivedAccountId);
-    const projectDest = path_1.default.resolve((0, path_2.getCwd)(), createProjectPromptResponse.dest);
+    const projectDest = path_1.default.resolve((0, path_2.getCwd)(), projectNameAndDestPromptResponse.dest);
     const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await (0, config_1.getProjectConfig)(projectDest);
     // Exit if the target destination is within an existing project
     if (existingProjectConfig &&
@@ -57,7 +57,7 @@ async function handler(args) {
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const components = (0, v3_2.generateComponentPaths)({
-        createProjectPromptResponse,
+        selectProjectTemplatePromptResponse,
         platformVersion,
         repoConfig,
         projectContents,
@@ -66,7 +66,7 @@ async function handler(args) {
     });
     try {
         await (0, github_1.cloneGithubRepo)(repo, projectDest, {
-            sourceDir: createProjectPromptResponse.projectTemplate?.path || components,
+            sourceDir: selectProjectTemplatePromptResponse.projectTemplate?.path || components,
             hideLogs: true,
             branch: 'main',
         });
@@ -80,15 +80,15 @@ async function handler(args) {
     const parsedConfigFile = JSON.parse(fs_extra_1.default.readFileSync(projectConfigPath).toString());
     (0, config_1.writeProjectConfig)(projectConfigPath, {
         ...parsedConfigFile,
-        name: createProjectPromptResponse.name,
+        name: projectNameAndDestPromptResponse.name,
     });
     // If the template is 'no-template', we need to manually create a src directory
-    if (createProjectPromptResponse.projectTemplate?.name ===
+    if (selectProjectTemplatePromptResponse.projectTemplate?.name ===
         legacy_1.EMPTY_PROJECT_TEMPLATE_NAME ||
         projectContents === v3_1.EMPTY_PROJECT) {
         fs_extra_1.default.ensureDirSync(path_1.default.join(projectDest, 'src'));
     }
-    logger_1.uiLogger.success(en_1.commands.project.create.logs.success(createProjectPromptResponse.name, projectDest));
+    logger_1.uiLogger.success(en_1.commands.project.create.logs.success(projectNameAndDestPromptResponse.name, projectDest));
     logger_1.uiLogger.log(en_1.commands.project.create.logs.welcomeMessage);
     (0, ui_1.uiFeatureHighlight)([
         'projectCommandTip',

package/commands/project/dev/deprecatedFlow.js

@@ -19,7 +19,7 @@ const process_1 = require("../../../lib/process");
 const accountTypes_1 = require("../../../lib/accountTypes");
 const ensureProjectExists_1 = require("../../../lib/projects/ensureProjectExists");
 async function deprecatedProjectDevFlow({ args, accountId, projectConfig, projectDir, }) {
-    const { providedAccountId, derivedAccountId } = args;
+    const { userProvidedAccount, derivedAccountId } = args;
     const env = (0, environment_1.getValidEnv)((0, config_1.getEnv)(derivedAccountId));
     const components = await (0, structure_1.findProjectComponents)(projectDir);
     const runnableComponents = components.filter(component => component.runnable);
@@ -65,11 +65,11 @@ async function deprecatedProjectDevFlow({ args, accountId, projectConfig, projec
     }
     // 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;
+    let targetProjectAccountId = userProvidedAccount ? derivedAccountId : null;
     // The account that we are locally testing against
-    let targetTestingAccountId = providedAccountId ? derivedAccountId : null;
+    let targetTestingAccountId = userProvidedAccount ? derivedAccountId : null;
     // Check that the default account or flag option is valid for the type of app in this project
-    if (providedAccountId) {
+    if (userProvidedAccount) {
         (0, helpers_1.checkIfAccountFlagIsSupported)(accountConfig, hasPublicApps);
         if (hasPublicApps) {
             targetProjectAccountId = accountConfig.parentAccountId || null;

package/commands/project/dev/index.js

@@ -15,19 +15,19 @@ const en_1 = require("../../../lang/en");
 const logger_1 = require("../../../lib/ui/logger");
 const command = 'dev';
 const describe = (0, ui_1.uiBetaTag)(en_1.commands.project.dev.describe, false);
-function validateAccountFlags(testingAccount, projectAccount, providedAccountId, useV3) {
+function validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV3) {
     // Legacy projects do not support targetTestingAccount and targetProjectAccount
     if (testingAccount && projectAccount && !useV3) {
         logger_1.uiLogger.error(en_1.commands.project.dev.errors.unsupportedAccountFlagLegacy);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    if (providedAccountId && useV3) {
+    if (userProvidedAccount && useV3) {
         logger_1.uiLogger.error(en_1.commands.project.dev.errors.unsupportedAccountFlagV3);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
 }
 async function handler(args) {
-    const { derivedAccountId, providedAccountId, testingAccount, projectAccount, } = args;
+    const { derivedAccountId, userProvidedAccount, testingAccount, projectAccount, } = args;
     const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
     (0, config_2.validateProjectConfig)(projectConfig, projectDir);
     const useV3 = (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion);
@@ -35,9 +35,9 @@ async function handler(args) {
         logger_1.uiLogger.error(en_1.commands.project.dev.errors.noProjectConfig);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    validateAccountFlags(testingAccount, projectAccount, providedAccountId, useV3);
+    validateAccountFlags(testingAccount, projectAccount, userProvidedAccount, useV3);
     let targetProjectAccountId = (projectAccount && (0, config_1.getAccountId)(projectAccount)) ||
-        (providedAccountId && derivedAccountId);
+        (userProvidedAccount && derivedAccountId);
     let profile;
     if (!targetProjectAccountId && (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion)) {
         if (args.profile) {

package/commands/project/dev/unifiedFlow.js

@@ -58,6 +58,7 @@ async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTar
     }
     const accounts = (0, config_2.getConfigAccounts)();
     const accountIsCombined = await (0, accountTypes_1.isUnifiedAccount)(targetProjectAccountConfig);
+    const targetProjectAccountIsTestAccountOrSandbox = (0, accountTypes_1.isTestAccountOrSandbox)(targetProjectAccountConfig);
     if (!accountIsCombined && !profileConfig) {
         logger_1.uiLogger.error(en_1.commands.project.dev.errors.accountNotCombined);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
@@ -67,6 +68,12 @@ async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTar
         // 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) {
+        targetTestingAccountId = targetProjectAccountId;
+    }
     else if (!targetTestingAccountId) {
         logger_1.uiLogger.log('');
         (0, ui_1.uiLine)();
@@ -121,6 +128,7 @@ async function unifiedProjectDevFlow({ args, targetProjectAccountId, providedTar
         debug: args.debug,
         deployedBuild,
         isGithubLinked,
+        profile: args.profile,
         targetProjectAccountId,
         targetTestingAccountId: targetTestingAccountId,
         projectConfig,

package/commands/project/upload.d.ts

@@ -1,5 +1,5 @@
-import { CommonArgs, YargsCommandModule } from '../../types/Yargs';
-type ProjectUploadArgs = CommonArgs & {
+import { CommonArgs, JSONOutputArgs, YargsCommandModule } from '../../types/Yargs';
+type ProjectUploadArgs = CommonArgs & JSONOutputArgs & {
     forceCreate: boolean;
     message: string;
     m: string;

package/commands/project/upload.js

@@ -20,10 +20,12 @@ const constants_1 = require("../../lib/constants");
 const index_2 = require("../../lib/errorHandlers/index");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
+const logger_2 = require("../../lib/ui/logger");
 const command = 'upload';
 const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.upload.describe`), false);
 async function handler(args) {
-    const { forceCreate, message, derivedAccountId, skipValidation, profile } = args;
+    const { forceCreate, message, derivedAccountId, skipValidation, formatOutputAsJson, profile, } = args;
+    const jsonOutput = {};
     const { projectConfig, projectDir } = await (0, config_2.getProjectConfig)();
     (0, config_2.validateProjectConfig)(projectConfig, projectDir);
     let targetAccountId;
@@ -72,7 +74,12 @@ async function handler(args) {
             }));
             (0, ui_2.logFeedbackMessage)(result.buildId);
             await (0, buildAndDeploy_2.displayWarnLogs)(targetAccountId, projectConfig.name, result.buildId);
-            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        }
+        if (result && result.succeeded && formatOutputAsJson) {
+            jsonOutput.buildId = result.buildId;
+            if (result.deployResult) {
+                jsonOutput.deployId = result.deployResult.deployId;
+            }
         }
     }
     catch (e) {
@@ -82,6 +89,9 @@ async function handler(args) {
         }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    if (formatOutputAsJson) {
+        logger_2.uiLogger.json(jsonOutput);
+    }
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
 function projectUploadBuilder(yargs) {
@@ -123,6 +133,7 @@ const builder = (0, yargsUtils_1.makeYargsBuilder)(projectUploadBuilder, command
     useConfigOptions: true,
     useAccountOptions: true,
     useEnvironmentOptions: true,
+    useJSONOutputOptions: true,
 });
 const projectUploadCommand = {
     command,