@hubspot/cli 7.7.1-experimental.0 → 7.7.2-experimental.0

package/commands/account/auth.js

@@ -3,46 +3,48 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("@hubspot/local-dev-lib/config");
 const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
 const getAccountIdentifier_1 = require("@hubspot/local-dev-lib/config/getAccountIdentifier");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const personalAccessKey_1 = require("@hubspot/local-dev-lib/personalAccessKey");
 const environments_1 = require("@hubspot/local-dev-lib/constants/environments");
 const text_1 = require("@hubspot/local-dev-lib/text");
 const auth_1 = require("@hubspot/local-dev-lib/constants/auth");
-const config_2 = require("@hubspot/local-dev-lib/constants/config");
 const configMigrate_1 = require("../../lib/configMigrate");
 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 personalAccessKeyPrompt_1 = require("../../lib/prompts/personalAccessKeyPrompt");
 const accountNamePrompt_1 = require("../../lib/prompts/accountNamePrompt");
 const setAsDefaultAccountPrompt_1 = require("../../lib/prompts/setAsDefaultAccountPrompt");
 const index_2 = require("../../lib/errorHandlers/index");
-const usageTracking_2 = require("../../lib/usageTracking");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_1 = require("../../lib/ui");
 const yargsUtils_1 = require("../../lib/yargsUtils");
+const en_1 = require("../../lang/en");
+const logger_1 = require("../../lib/ui/logger");
 const TRACKING_STATUS = {
     STARTED: 'started',
     ERROR: 'error',
     COMPLETE: 'complete',
 };
-async function updateConfig(env, doesConfigExist, disableTracking, authType, account) {
+const authType = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
+async function updateConfigWithNewAccount(env, configAlreadyExists, accountId) {
     try {
         const { personalAccessKey } = await (0, personalAccessKeyPrompt_1.personalAccessKeyPrompt)({
             env,
-            account,
+            account: accountId,
         });
         const token = await (0, personalAccessKey_1.getAccessToken)(personalAccessKey, env);
-        const defaultName = token.hubName ? (0, text_1.toKebabCase)(token.hubName) : undefined;
-        const name = doesConfigExist
+        const defaultAccountName = token.hubName
+            ? (0, text_1.toKebabCase)(token.hubName)
+            : undefined;
+        const accountName = configAlreadyExists
             ? undefined
-            : (await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultName)).name;
-        const updatedConfig = await (0, personalAccessKey_1.updateConfigWithAccessToken)(token, personalAccessKey, env, name, !doesConfigExist);
+            : (await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultAccountName)).name;
+        const updatedConfig = await (0, personalAccessKey_1.updateConfigWithAccessToken)(token, personalAccessKey, env, accountName, !configAlreadyExists);
         if (!updatedConfig)
             return null;
-        if (doesConfigExist && !updatedConfig.name) {
-            updatedConfig.name = (await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultName)).name;
+        // Can happen if the user is re-authenticating an account with no name
+        if (configAlreadyExists && !updatedConfig.name) {
+            updatedConfig.name = (await (0, accountNamePrompt_1.cliAccountNamePrompt)(defaultAccountName)).name;
             (0, config_1.updateAccountConfig)({
                 ...updatedConfig,
             });
@@ -51,97 +53,81 @@ async function updateConfig(env, doesConfigExist, disableTracking, authType, acc
         return updatedConfig;
     }
     catch (e) {
-        if (!disableTracking) {
-            await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);
-        }
         (0, index_1.debugError)(e);
         return null;
     }
 }
-async function handleConfigMigration(providedAccountId) {
+async function handleConfigMigration() {
     const deprecatedConfigExists = (0, migrate_1.configFileExists)(false);
     const globalConfigExists = (0, migrate_1.configFileExists)(true);
+    // No deprecated config exists, so no migration is needed
     if (!deprecatedConfigExists) {
         return true;
     }
+    // Global config exists, so we need to merge the deprecated config with the global config
     if (globalConfigExists) {
         try {
-            const mergeConfirmed = await (0, configMigrate_1.handleMerge)(providedAccountId);
+            const mergeConfirmed = await (0, configMigrate_1.handleMerge)();
             if (!mergeConfirmed) {
-                logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.auth.errors.mergeNotConfirmed', {
-                    authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
-                    migrateCommand: (0, ui_1.uiCommandReference)('hs config migrate'),
-                }));
-                process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+                logger_1.uiLogger.log('');
+                logger_1.uiLogger.log(en_1.commands.account.subcommands.auth.errors.mergeNotConfirmed);
             }
             return mergeConfirmed;
         }
         catch (error) {
             (0, index_2.logError)(error);
-            (0, usageTracking_2.trackCommandMetadataUsage)('account-auth', {
-                command: 'hs account auth',
-                type: 'Merge configs',
-                successful: false,
-            }, providedAccountId);
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            return false;
         }
     }
+    // Global config does not exist, so we only need to migrate the deprecated config
     try {
-        const migrationConfirmed = await (0, configMigrate_1.handleMigration)(providedAccountId);
+        const migrationConfirmed = await (0, configMigrate_1.handleMigration)();
         if (!migrationConfirmed) {
-            logger_1.logger.log((0, lang_1.i18n)('commands.account.subcommands.auth.errors.migrationNotConfirmed', {
-                authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-                deprecatedConfigPath: (0, migrate_1.getConfigPath)('', false),
-            }));
-            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+            logger_1.uiLogger.log('');
+            logger_1.uiLogger.log(en_1.commands.account.subcommands.auth.errors.migrationNotConfirmed);
         }
         return migrationConfirmed;
     }
     catch (error) {
         (0, index_2.logError)(error);
-        (0, usageTracking_2.trackCommandMetadataUsage)('account-auth', {
-            command: 'hs account auth',
-            type: 'Migrate a single config',
-            successful: false,
-        }, providedAccountId);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        return false;
     }
 }
-async function handleConfigUpdate(env, configAlreadyExists, disableTracking, authType, providedAccountId) {
+const describe = en_1.commands.account.subcommands.auth.describe;
+const command = 'auth';
+async function handler(args) {
+    const { providedAccountId, disableTracking } = args;
+    if (!disableTracking) {
+        (0, usageTracking_1.trackCommandUsage)('account-auth', {}, providedAccountId);
+        await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.STARTED);
+    }
+    const configMigrationSuccess = await handleConfigMigration();
+    if (!configMigrationSuccess) {
+        await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    const configAlreadyExists = (0, migrate_1.configFileExists)(true);
     if (!configAlreadyExists) {
         (0, config_1.createEmptyConfigFile)({}, true);
     }
     (0, config_1.loadConfig)('');
     (0, process_1.handleExit)(config_1.deleteEmptyConfigFile);
-    const updatedConfig = await updateConfig(env, configAlreadyExists, disableTracking, authType, providedAccountId);
+    const updatedConfig = await updateConfigWithNewAccount(args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD, configAlreadyExists, providedAccountId);
     if (!updatedConfig) {
-        logger_1.logger.error((0, lang_1.i18n)('commands.account.subcommands.auth.errors.failedToUpdateConfig'));
+        if (!disableTracking) {
+            await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.ERROR);
+        }
+        logger_1.uiLogger.error(en_1.commands.account.subcommands.auth.errors.failedToUpdateConfig);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const { name } = updatedConfig;
     const accountId = (0, getAccountIdentifier_1.getAccountIdentifier)(updatedConfig);
     if (!configAlreadyExists) {
-        logger_1.logger.log('');
-        logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.auth.success.configFileCreated', {
-            configPath: (0, migrate_1.getConfigPath)('', true),
-        }));
-        logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.auth.success.configFileUpdated', {
-            account: name || accountId?.toString() || '',
-        }));
+        logger_1.uiLogger.log('');
+        logger_1.uiLogger.success(en_1.commands.account.subcommands.auth.success.configFileCreated((0, migrate_1.getConfigPath)('', true)));
+        logger_1.uiLogger.success(en_1.commands.account.subcommands.auth.success.configFileUpdated(accountId));
     }
     else {
-        const setAsDefault = await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(name);
-        logger_1.logger.log('');
-        if (setAsDefault) {
-            logger_1.logger.success((0, lang_1.i18n)(`lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount`, {
-                accountName: name,
-            }));
-        }
-        else {
-            logger_1.logger.info((0, lang_1.i18n)(`lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault`, {
-                accountName: (0, config_1.getConfigDefaultAccount)(),
-            }));
-        }
+        await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(updatedConfig.name);
     }
     (0, ui_1.uiFeatureHighlight)([
         'helpCommand',
@@ -153,24 +139,10 @@ async function handleConfigUpdate(env, configAlreadyExists, disableTracking, aut
     }
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-const describe = (0, lang_1.i18n)('commands.account.subcommands.auth.describe');
-const command = 'auth';
-async function handler(args) {
-    const { providedAccountId, disableTracking } = args;
-    const authType = auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
-    await handleConfigMigration(providedAccountId);
-    if (!disableTracking) {
-        (0, usageTracking_1.trackCommandUsage)('account-auth', {}, providedAccountId);
-        await (0, usageTracking_1.trackAuthAction)('account-auth', authType, TRACKING_STATUS.STARTED);
-    }
-    const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
-    const configAlreadyExists = (0, migrate_1.configFileExists)(true);
-    await handleConfigUpdate(env, configAlreadyExists, disableTracking, authType, providedAccountId);
-}
 function accountAuthBuilder(yargs) {
     yargs.options({
         account: {
-            describe: (0, lang_1.i18n)('commands.account.subcommands.auth.options.account.describe'),
+            describe: en_1.commands.account.subcommands.auth.options.account,
             type: 'string',
             alias: 'a',
         },
@@ -182,10 +154,7 @@ function accountAuthBuilder(yargs) {
     });
     return yargs;
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(accountAuthBuilder, command, (0, lang_1.i18n)('commands.account.subcommands.auth.verboseDescribe', {
-    authMethod: auth_1.PERSONAL_ACCESS_KEY_AUTH_METHOD.value,
-    globalConfigPath: config_2.GLOBAL_CONFIG_PATH,
-}), {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(accountAuthBuilder, command, en_1.commands.account.subcommands.auth.verboseDescribe, {
     useGlobalOptions: true,
     useTestingOptions: true,
 });

package/commands/auth.js

@@ -45,10 +45,8 @@ async function handler(args) {
         (0, git_1.checkAndWarnGitInclusion)(configPath);
     }
     if ((0, config_2.configFileExists)(true)) {
-        const globalConfigPath = (0, config_2.getConfigPath)('', true);
         logger_1.logger.error((0, lang_1.i18n)(`commands.auth.errors.globalConfigFileExists`, {
-            configPath: globalConfigPath,
-            authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
+            accountAuthCommand: (0, ui_1.uiCommandReference)('hs account auth'),
         }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
@@ -112,18 +110,7 @@ async function handler(args) {
     }
     const nameFromConfigData = 'name' in configData ? configData.name : undefined;
     const accountName = (updatedConfig && updatedConfig.name) || validName || nameFromConfigData;
-    const setAsDefault = await (0, setAsDefaultAccountPrompt_1.setAsDefaultAccountPrompt)(accountName);
-    logger_1.logger.log('');
-    if (setAsDefault) {
-        logger_1.logger.success((0, lang_1.i18n)('lib.prompts.setAsDefaultAccountPrompt.setAsDefaultAccount', {
-            accountName,
-        }));
-    }
-    else {
-        logger_1.logger.info((0, lang_1.i18n)('lib.prompts.setAsDefaultAccountPrompt.keepingCurrentDefault', {
-            accountName: (0, config_2.getConfigDefaultAccount)(),
-        }));
-    }
+    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,

package/commands/config/migrate.js

@@ -4,54 +4,42 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_1 = __importDefault(require("fs"));
-const config_1 = require("@hubspot/local-dev-lib/constants/config");
 const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const configMigrate_1 = require("../../lib/configMigrate");
-const lang_1 = require("../../lib/lang");
-const usageTracking_1 = require("../../lib/usageTracking");
 const index_1 = require("../../lib/errorHandlers/index");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-const describe = (0, lang_1.i18n)('commands.config.subcommands.migrate.describe', {
-    deprecatedConfigPath: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-    globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
-});
+const usageTracking_1 = require("../../lib/usageTracking");
+const logger_1 = require("../../lib/ui/logger");
+const en_1 = require("../../lang/en");
+const describe = en_1.commands.config.subcommands.migrate.describe;
 const command = 'migrate';
 async function handler(args) {
-    const { config: configPath, force, derivedAccountId } = args;
+    const { derivedAccountId, config: configPath, force } = args;
+    (0, usageTracking_1.trackCommandUsage)('config-migrate', {}, derivedAccountId);
     if (configPath && !fs_1.default.existsSync(configPath)) {
-        logger_1.logger.log((0, lang_1.i18n)('commands.config.subcommands.migrate.errors.configNotFound', {
-            configPath,
-        }));
+        logger_1.uiLogger.error(en_1.commands.config.subcommands.migrate.errors.configNotFound(configPath));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const deprecatedConfigExists = (0, migrate_1.configFileExists)(false, configPath);
     const globalConfigExists = (0, migrate_1.configFileExists)(true);
     if (!deprecatedConfigExists) {
-        logger_1.logger.log((0, lang_1.i18n)('commands.config.subcommands.migrate.migrationAlreadyCompleted', {
-            deprecatedConfigPath: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-        }));
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        logger_1.uiLogger.error(en_1.commands.config.subcommands.migrate.errors.noConfigToMigrate);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    let success = false;
     try {
         if (!globalConfigExists) {
-            await (0, configMigrate_1.handleMigration)(derivedAccountId, configPath);
+            success = await (0, configMigrate_1.handleMigration)(configPath, true);
         }
         else {
-            await (0, configMigrate_1.handleMerge)(derivedAccountId, configPath, force);
+            success = await (0, configMigrate_1.handleMerge)(configPath, force, true);
         }
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
     catch (error) {
-        (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
-            command: 'hs config migrate',
-            type: 'Migration/merge',
-            successful: false,
-        }, derivedAccountId);
         (0, index_1.logError)(error);
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
+    process.exit(success ? exitCodes_1.EXIT_CODES.SUCCESS : exitCodes_1.EXIT_CODES.ERROR);
 }
 function configMigrateBuilder(yargs) {
     return yargs
@@ -60,28 +48,21 @@ function configMigrateBuilder(yargs) {
             alias: 'f',
             type: 'boolean',
             default: false,
-            description: (0, lang_1.i18n)('commands.config.subcommands.migrate.options.force'),
+            description: en_1.commands.config.subcommands.migrate.options.force,
         },
     })
         .example([
         [
             '$0 config migrate',
-            (0, lang_1.i18n)('commands.config.subcommands.migrate.examples.default', {
-                deprecatedConfigPath: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-                globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
-            }),
+            en_1.commands.config.subcommands.migrate.examples.default,
         ],
         [
             '$0 config migrate --config=/path/to/config.yml',
-            (0, lang_1.i18n)('commands.config.subcommands.migrate.examples.configFlag', {
-                globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
-            }),
+            en_1.commands.config.subcommands.migrate.examples.configFlag,
         ],
     ]);
 }
-const builder = (0, yargsUtils_1.makeYargsBuilder)(configMigrateBuilder, command, (0, lang_1.i18n)('commands.config.subcommands.migrate.verboseDescribe', {
-    archivedConfigPath: config_1.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME,
-}), {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(configMigrateBuilder, command, en_1.commands.config.subcommands.migrate.verboseDescribe, {
     useGlobalOptions: true,
     useConfigOptions: true,
 });

package/commands/init.js

@@ -76,9 +76,8 @@ async function handler(args) {
     }
     const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
     if ((0, config_1.configFileExists)(true)) {
-        const globalConfigPath = (0, config_1.getConfigPath)('', true);
         logger_1.logger.error((0, lang_1.i18n)(`commands.init.errors.globalConfigFileExists`, {
-            configPath: globalConfigPath,
+            accountAuthCommand: (0, ui_1.uiCommandReference)('hs account auth'),
         }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }

package/commands/module/marketplace-validate.js

@@ -6,32 +6,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const usageTracking_1 = require("../../lib/usageTracking");
 const marketplaceValidate_1 = require("../../lib/marketplaceValidate");
-const lang_1 = require("../../lib/lang");
+const en_1 = require("../../lang/en");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
 const command = 'marketplace-validate <src>';
-const describe = (0, lang_1.i18n)(`commands.module.subcommands.marketplaceValidate.describe`);
+const describe = en_1.commands.module.subcommands.marketplaceValidate.describe;
 async function handler(args) {
     const { src, derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('validate', undefined, derivedAccountId);
     SpinniesManager_1.default.init();
     SpinniesManager_1.default.add('marketplaceValidation', {
-        text: (0, lang_1.i18n)(`commands.module.subcommands.marketplaceValidate.logs.validatingModule`, {
-            path: src,
-        }),
+        text: en_1.commands.module.subcommands.marketplaceValidate.logs.validatingModule(src),
     });
     const assetType = 'MODULE';
     const validationId = await (0, marketplaceValidate_1.kickOffValidation)(derivedAccountId, assetType, src);
     await (0, marketplaceValidate_1.pollForValidationFinish)(derivedAccountId, validationId);
     SpinniesManager_1.default.remove('marketplaceValidation');
     const validationResults = await (0, marketplaceValidate_1.fetchValidationResults)(derivedAccountId, validationId);
-    (0, marketplaceValidate_1.processValidationErrors)('commands.module.subcommands.marketplaceValidate', validationResults);
-    (0, marketplaceValidate_1.displayValidationResults)('commands.module.subcommands.marketplaceValidate', validationResults);
+    (0, marketplaceValidate_1.processValidationErrors)(en_1.commands.module.subcommands.marketplaceValidate.errors.invalidPath, validationResults);
+    (0, marketplaceValidate_1.displayValidationResults)(en_1.commands.module.subcommands.marketplaceValidate.results, validationResults);
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
 function marketplaceValidateBuilder(yargs) {
     yargs.positional('src', {
-        describe: (0, lang_1.i18n)(`commands.module.subcommands.marketplaceValidate.positionals.src.describe`),
+        describe: en_1.commands.module.subcommands.marketplaceValidate.positionals.src,
         type: 'string',
     });
     return yargs;

package/commands/module.js

@@ -4,9 +4,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const marketplace_validate_1 = __importDefault(require("./module/marketplace-validate"));
+const en_1 = require("../lang/en");
 const yargsUtils_1 = require("../lib/yargsUtils");
 const command = 'module';
-const describe = undefined;
+const describe = en_1.commands.module.describe;
 function moduleBuilder(yargs) {
     yargs.command(marketplace_validate_1.default).demandCommand(1, '');
     return yargs;

package/commands/project/add.d.ts

@@ -1,7 +1,10 @@
 import { YargsCommandModule, CommonArgs } from '../../types/Yargs';
 type ProjectAddArgs = CommonArgs & {
-    type: string;
-    name: string;
+    type?: string;
+    name?: string;
+    features?: string[];
+    distribution?: string;
+    auth?: string;
 };
 declare const projectAddCommand: YargsCommandModule<unknown, ProjectAddArgs>;
 export default projectAddCommand;

package/commands/project/add.js

@@ -1,87 +1,38 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const github_1 = require("@hubspot/local-dev-lib/github");
 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 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");
 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 en_1 = require("../../lang/en");
+const buildAndDeploy_1 = require("../../lib/projects/buildAndDeploy");
+const legacyAddComponent_1 = require("../../lib/projects/add/legacyAddComponent");
+const v3AddComponent_1 = require("../../lib/projects/add/v3AddComponent");
+const constants_1 = require("../../lib/constants");
+const logger_1 = require("../../lib/ui/logger");
 const command = 'add';
-const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.add.describe`), false);
+const describe = (0, ui_1.uiBetaTag)(en_1.commands.project.add.describe, false);
 async function handler(args) {
-    const { derivedAccountId } = args;
-    (0, usageTracking_1.trackCommandUsage)('project-add', undefined, derivedAccountId);
-    const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
-    if (!projectDir || !projectConfig) {
-        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
-    let projectContainsPublicApp = false;
-    try {
-        const components = await (0, structure_1.findProjectComponents)(projectDir);
-        projectContainsPublicApp = components.some(c => c.type === Projects_1.ComponentTypes.PublicApp);
-    }
-    catch (err) {
-        (0, errorHandlers_1.debugError)(err);
-    }
-    if (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)(`commands.project.subcommands.add.creatingComponent`, {
-        projectName: projectConfig.name,
-    }));
-    logger_1.logger.log('');
-    let latestRepoReleaseTag;
     try {
-        // We want the tag_name from the latest release of the components repo
-        const repoReleaseData = await (0, github_1.fetchReleaseData)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH);
-        if (repoReleaseData) {
-            latestRepoReleaseTag = repoReleaseData.tag_name;
+        const { derivedAccountId } = args;
+        (0, usageTracking_1.trackCommandUsage)('project-add', undefined, derivedAccountId);
+        const { projectConfig, projectDir } = await (0, config_1.getProjectConfig)();
+        if (!projectDir || !projectConfig) {
+            logger_1.uiLogger.error(en_1.commands.project.add.error.locationInProject);
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+        const isV3ProjectCreate = (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion);
+        if (isV3ProjectCreate) {
+            await (0, v3AddComponent_1.v3AddComponent)(args, projectDir, projectConfig);
+        }
+        else {
+            await (0, legacyAddComponent_1.legacyAddComponent)(args, projectDir, projectConfig);
         }
     }
-    catch (err) {
-        (0, errorHandlers_1.debugError)(err);
-    }
-    if (!latestRepoReleaseTag) {
-        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)(`commands.project.subcommands.add.error.failedToFetchComponentList`));
-        process.exit(exitCodes_1.EXIT_CODES.ERROR);
-    }
-    const projectAddPromptResponse = await (0, projectAddPrompt_1.projectAddPrompt)(components, args);
-    try {
-        const componentPath = path_1.default.join(projectDir, projectConfig.srcDir, projectAddPromptResponse.componentTemplate.insertPath, projectAddPromptResponse.name);
-        await (0, github_1.cloneGithubRepo)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, componentPath, {
-            sourceDir: projectAddPromptResponse.componentTemplate.path,
-            tag: latestRepoReleaseTag,
-            hideLogs: true,
-        });
-        logger_1.logger.log('');
-        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)(`commands.project.subcommands.add.error.failedToDownloadComponent`));
+    catch (e) {
+        (0, errorHandlers_1.logError)(e);
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
@@ -89,24 +40,36 @@ async function handler(args) {
 function projectAddBuilder(yargs) {
     yargs.options({
         type: {
-            describe: (0, lang_1.i18n)(`commands.project.subcommands.add.options.type.describe`),
+            describe: en_1.commands.project.add.options.type.describe,
             type: 'string',
         },
         name: {
-            describe: (0, lang_1.i18n)(`commands.project.subcommands.add.options.name.describe`),
+            describe: en_1.commands.project.add.options.name.describe,
+            type: 'string',
+        },
+        distribution: {
+            describe: en_1.commands.project.add.options.distribution.describe,
+            hidden: true,
             type: 'string',
+            choices: [constants_1.privateDistribution, constants_1.marketplaceDistribution],
+        },
+        auth: {
+            describe: en_1.commands.project.add.options.auth.describe,
+            hidden: true,
+            type: 'string',
+            choices: [constants_1.oAuth, constants_1.staticAuth],
+        },
+        features: {
+            describe: en_1.commands.project.add.options.features.describe,
+            hidden: true,
+            type: 'array',
         },
     });
-    yargs.example([
-        [
-            '$0 project add',
-            (0, lang_1.i18n)(`commands.project.subcommands.add.examples.default`),
-        ],
-    ]);
+    yargs.example([['$0 project add', en_1.commands.project.add.examples.default]]);
     yargs.example([
         [
             '$0 project add --name="my-component" --type="components/example-app"',
-            (0, lang_1.i18n)(`commands.project.subcommands.add.examples.withFlags`),
+            en_1.commands.project.add.examples.withFlags,
         ],
     ]);
     return yargs;

package/commands/project/create.d.ts

@@ -1,10 +1,4 @@
-import { RepoPath } from '@hubspot/local-dev-lib/types/Github';
-import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
-type ProjectCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
-    name?: string;
-    dest?: string;
-    templateSource?: RepoPath;
-    template?: string;
-};
+import { YargsCommandModule } from '../../types/Yargs';
+import { ProjectCreateArgs } from '../../lib/projects/create';
 declare const projectCreateCommand: YargsCommandModule<unknown, ProjectCreateArgs>;
 export default projectCreateCommand;