@hubspot/cli 7.4.0-experimental.0 → 7.4.0

package/commands/project/upload.js

@@ -1,83 +1,88 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { useV3Api } = require('../../lib/projects/buildAndDeploy');
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const chalk = require('chalk');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { uiBetaTag, uiCommandReference } = require('../../lib/ui');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { ensureProjectExists, getProjectConfig, logFeedbackMessage, validateProjectConfig, } = require('../../lib/projects');
-const { handleProjectUpload } = require('../../lib/projects/upload');
-const { displayWarnLogs, pollProjectBuildAndDeploy, } = require('../../lib/projects/buildAndDeploy');
-const { i18n } = require('../../lib/lang');
-const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const { isSpecifiedError } = require('@hubspot/local-dev-lib/errors/index');
-const { PROJECT_ERROR_TYPES } = require('../../lib/constants');
-const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+exports.builder = exports.describe = exports.command = void 0;
+exports.handler = handler;
+const chalk_1 = __importDefault(require("chalk"));
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const config_1 = require("@hubspot/local-dev-lib/config");
+const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const buildAndDeploy_1 = require("../../lib/projects/buildAndDeploy");
+const ui_1 = require("../../lib/ui");
+const usageTracking_1 = require("../../lib/usageTracking");
+const projects_1 = require("../../lib/projects");
+const upload_1 = require("../../lib/projects/upload");
+const buildAndDeploy_2 = require("../../lib/projects/buildAndDeploy");
+const lang_1 = require("../../lib/lang");
+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 i18nKey = 'commands.project.subcommands.upload';
 exports.command = 'upload';
-exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
-exports.handler = async (options) => {
-    const { forceCreate, message, derivedAccountId, skipValidation } = options;
-    const accountConfig = getAccountConfig(derivedAccountId);
+exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`${i18nKey}.describe`), false);
+async function handler(args) {
+    const { forceCreate, message, derivedAccountId, skipValidation } = args;
+    const accountConfig = (0, config_1.getAccountConfig)(derivedAccountId);
     const accountType = accountConfig && accountConfig.accountType;
-    const { projectConfig, projectDir } = await getProjectConfig();
-    trackCommandUsage('project-upload', { type: accountType }, derivedAccountId);
-    validateProjectConfig(projectConfig, projectDir);
-    await ensureProjectExists(derivedAccountId, projectConfig.name, {
+    const { projectConfig, projectDir } = await (0, projects_1.getProjectConfig)();
+    (0, usageTracking_1.trackCommandUsage)('project-upload', { type: accountType }, derivedAccountId);
+    (0, projects_1.validateProjectConfig)(projectConfig, projectDir);
+    await (0, projects_1.ensureProjectExists)(derivedAccountId, projectConfig.name, {
         forceCreate,
         uploadCommand: true,
     });
     try {
-        const { result, uploadError } = await handleProjectUpload(derivedAccountId, projectConfig, projectDir, pollProjectBuildAndDeploy, message, useV3Api(projectConfig?.platformVersion), skipValidation);
+        const { result, uploadError } = await (0, upload_1.handleProjectUpload)(derivedAccountId, projectConfig, projectDir, buildAndDeploy_2.pollProjectBuildAndDeploy, message, (0, buildAndDeploy_1.useV3Api)(projectConfig.platformVersion), skipValidation);
         if (uploadError) {
-            if (isSpecifiedError(uploadError, {
-                subCategory: PROJECT_ERROR_TYPES.PROJECT_LOCKED,
+            if ((0, index_1.isSpecifiedError)(uploadError, {
+                subCategory: constants_1.PROJECT_ERROR_TYPES.PROJECT_LOCKED,
             })) {
-                logger.log();
-                logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
-                logger.log();
+                logger_1.logger.log();
+                logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.projectLockedError`));
+                logger_1.logger.log();
             }
             else {
-                logError(uploadError, new ApiErrorContext({
+                (0, index_2.logError)(uploadError, new index_2.ApiErrorContext({
                     accountId: derivedAccountId,
                     request: 'project upload',
                 }));
             }
-            process.exit(EXIT_CODES.ERROR);
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
-        if (result.succeeded && !result.buildResult.isAutoDeployEnabled) {
-            logger.log(chalk.bold(i18n(`${i18nKey}.logs.buildSucceeded`, {
+        if (result && result.succeeded && !result.buildResult.isAutoDeployEnabled) {
+            logger_1.logger.log(chalk_1.default.bold((0, lang_1.i18n)(`${i18nKey}.logs.buildSucceeded`, {
                 buildId: result.buildId,
             })));
-            logger.log(i18n(`${i18nKey}.logs.autoDeployDisabled`, {
-                deployCommand: uiCommandReference(`hs project deploy --build=${result.buildId}`),
+            logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.logs.autoDeployDisabled`, {
+                deployCommand: (0, ui_1.uiCommandReference)(`hs project deploy --build=${result.buildId}`),
             }));
-            logFeedbackMessage(result.buildId);
-            await displayWarnLogs(derivedAccountId, projectConfig.name, result.buildId);
-            process.exit(EXIT_CODES.SUCCESS);
+            (0, projects_1.logFeedbackMessage)(result.buildId);
+            await (0, buildAndDeploy_2.displayWarnLogs)(derivedAccountId, projectConfig.name, result.buildId);
+            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
         }
     }
     catch (e) {
-        logError(e, new ApiErrorContext({
+        (0, index_2.logError)(e, new index_2.ApiErrorContext({
             accountId: derivedAccountId,
             request: 'project upload',
         }));
-        process.exit(EXIT_CODES.ERROR);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-};
-exports.builder = yargs => {
+    process.exit(exitCodes_1.EXIT_CODES.ERROR);
+}
+function projectUploadBuilder(yargs) {
     yargs.options({
         'force-create': {
-            describe: i18n(`${i18nKey}.options.forceCreate.describe`),
+            describe: (0, lang_1.i18n)(`${i18nKey}.options.forceCreate.describe`),
             type: 'boolean',
             default: false,
         },
         message: {
             alias: 'm',
-            describe: i18n(`${i18nKey}.options.message.describe`),
+            describe: (0, lang_1.i18n)(`${i18nKey}.options.message.describe`),
             type: 'string',
             default: '',
         },
@@ -87,9 +92,17 @@ exports.builder = yargs => {
             default: false,
         },
     });
-    yargs.example([['$0 project upload', i18n(`${i18nKey}.examples.default`)]]);
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
+    yargs.example([['$0 project upload', (0, lang_1.i18n)(`${i18nKey}.examples.default`)]]);
     return yargs;
+}
+exports.builder = (0, yargsUtils_1.makeYargsBuilder)(projectUploadBuilder, exports.command, exports.describe, {
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
+module.exports = {
+    command: exports.command,
+    describe: exports.describe,
+    builder: exports.builder,
+    handler,
 };

package/commands/project/watch.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const { uiLink } = require('../../lib/ui');
+const { useV3Api } = require('../../lib/projects/buildAndDeploy');
+const { uiCommandReference } = require('../../lib/ui');
 const { i18n } = require('../../lib/lang');
 const { createWatcher } = require('../../lib/projects/watch');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
@@ -61,6 +64,15 @@ exports.handler = async (options) => {
     const { initialUpload, derivedAccountId } = options;
     trackCommandUsage('project-watch', null, derivedAccountId);
     const { projectConfig, projectDir } = await getProjectConfig();
+    if (useV3Api(projectConfig?.platformVersion)) {
+        logger.error(i18n(`commands.project.subcommands.watch.errors.v3ApiError`, {
+            command: uiCommandReference('hs project watch'),
+            newCommand: uiCommandReference('hs project dev'),
+            platformVersion: projectConfig.platformVersion,
+            linkToDocs: uiLink('How to develop locally.', 'https://developers.hubspot.com/docs/guides/crm/ui-extensions/local-development'),
+        }));
+        return process.exit(EXIT_CODES.ERROR);
+    }
     validateProjectConfig(projectConfig, projectDir);
     await ensureProjectExists(derivedAccountId, projectConfig.name);
     try {

package/lang/en.js

@@ -11,8 +11,6 @@ export const commands = {
     },
     srcIsProject: (src, command) =>
       `"${src}" is in a project folder. Did you mean "hs project ${command}"?`,
-    setDefaultAccountMoved:
-      'This command has moved. Try `hs accounts use` instead',
     handleDeprecatedEnvVariables: {
       portalEnvVarDeprecated:
         'The HUBSPOT_PORTAL_ID environment variable is deprecated. Please use HUBSPOT_ACCOUNT_ID instead.',
@@ -2818,6 +2816,11 @@ export const lib = {
       fileFiltered: filename => `Ignore rule triggered for "${filename}"`,
     },
   },
+  middleware: {
+    fireAlarm: {
+      failedToLoadBoxen: 'Failed to load boxen util.',
+    },
+  },
   ui: {
     betaTag: chalk.bold('[BETA]'),
     betaWarning: {
@@ -2841,7 +2844,7 @@ export const lib = {
     disabledUrlText: 'See all HubSpot CLI commands here.',
     featureHighlight: {
       defaultTitle: "What's next?",
-      commandKeys: {
+      featureKeys: {
         accountOption: {
           command: '--account',
           message: command =>
@@ -2895,6 +2898,11 @@ export const lib = {
           message: command =>
             `Run ${command} to set up your test environment and start local development`,
         },
+        projectInstallDepsCommand: {
+          command: 'hs project install-deps',
+          message: command =>
+            `Run ${command} to install dependencies for your project components`,
+        },
         sampleProjects: {
           linkText: "HubSpot's sample projects",
           url: 'https://developers.hubspot.com/docs/platform/sample-projects?utm_source=cli&utm_content=project_create_whats_next',

package/lang/en.lyaml

@@ -6,11 +6,13 @@ en:
         cmsUpdateNotification: "{{#bold}}The CMS CLI is now the HubSpot CLI{{/bold}}\n\nTo upgrade, uninstall {{#bold}}{{ packageName }}{{/bold}}\nand then run {{ updateCommand }}"
         cliUpdateNotification: "HubSpot CLI version {{#cyan}}{{#bold}}{currentVersion}{{/bold}}{{/cyan}} is outdated.\nRun {{ updateCommand }} to upgrade to version {{#cyan}}{{#bold}}{latestVersion}{{/bold}}{{/cyan}}"
       srcIsProject: "\"{{ src }}\" is in a project folder. Did you mean \"hs project {{command}}\"?"
-      setDefaultAccountMoved: "This command has moved. Try `hs accounts use` instead"
       handleDeprecatedEnvVariables:
         portalEnvVarDeprecated: "The HUBSPOT_PORTAL_ID environment variable is deprecated. Please use HUBSPOT_ACCOUNT_ID instead."
       loadConfigMiddleware:
         configFileExists: "A configuration file already exists at {{ configPath }}. To specify a new configuration file, delete the existing one and try again."
+      injectAccountIdMiddleware:
+        invalidAccountId: "In the default override file ({{ hsAccountFileName }}), the account ID must be a number. Please delete the current file and generate a new one using {{ overrideCommand }}."
+        accountNotFound: "The account in the default override file ({{ hsAccountFileName }}) wasn't found in your configured accounts. You can authorize this account using {{ authCommand }}."
     completion:
       describe: "Enable bash completion shortcuts for commands. Concat the generated script to your .bashrc, .bash_profile, or .zshrc file."
       examples:
@@ -18,11 +20,51 @@ en:
     account:
       describe: "Commands for managing configured accounts."
       subcommands:
+        auth:
+          describe: "Configure authentication for your HubSpot account."
+          options:
+            account:
+              describe: "HubSpot account to authenticate"
+          errors:
+            failedToUpdateConfig: "Failed to update the configuration file. Please try again."
+            bothConfigFilesNotAllowed: "Unable to create config file, because there is an existing \"{{ deprecatedConfig }}\" file. To create a new config file, delete the existing one and try again."
+          success:
+            configFileCreated: "Created config file \"{{ configPath }}\""
+            configFileUpdated: "Connected account \"{{ account }}\" and set it as the default account"
+        createOverride:
+          describe: "Create a new default account override file ({{ hsAccountFileName }}) in the current working directory."
+          success: "Default account override file created at {{ overrideFilePath }}"
+          accountOverride: "An account override file already exists at {{ overrideFilePath }} associated with account \"{{ accountOverride }}\"."
+          prompts:
+            replaceOverrideFile: "Replace existing account override file?"
+          errors:
+            accountNotFound: "The specified account could not be found in the config file {{ configPath }}"
+          options:
+            account:
+              describe: "Name or ID of the account to create an override file for."
+          examples:
+            default: "Create a new default account override file ({{ hsAccountFileName }}) in the current working directory"
+            idBased: "Create a new default account override file ({{ hsAccountFileName }}) in the current working directory, using the account with accountId \"1234567\""
+            nameBased: "Create a new default account override file ({{ hsAccountFileName }}) in the current working directory, using the account with name \"MyAccount\""
+        removeOverride:
+          describe: "Remove the default account override file ({{ overrideFile }}) from the current working directory."
+          accountOverride: "There is an account override file at {{ overrideFilePath }} associated with account \"{{ accountOverride }}\"."
+          prompts:
+            deleteOverrideFile: "Delete account override file?"
+          success: "Removed the default account override file."
+          noOverrideFile: "No default account override file found in the current working directory. No action required."
+          options:
+            force:
+              describe: "Skip confirmation prompt when removing the override file"
         list:
-          accounts: "{{#bold}}Accounts{{/bold}}:"
-          defaultAccount: "{{#bold}}Default account{{/bold}}: {{ account }}"
           describe: "List names of accounts defined in config."
-          configPath: "{{#bold}}Config path{{/bold}}: {{ configPath }}"
+          accounts: "{{#bold}}Accounts{{/bold}}:"
+          defaultAccountTitle: "{{#bold}}Default Account{{/bold}}"
+          defaultAccount: "Account: {{ account }}"
+          configPath: "Source: {{ configPath }}"
+          overrideFilePathTitle: "{{#bold}}Default Account Override{{/bold}}"
+          overrideFilePath: "Source: {{ overrideFilePath }}"
+          overrideAccount: "Account: {{ account }}"
           labels:
             accountId: "Account ID"
             authType: "Auth Type"
@@ -40,6 +82,8 @@ en:
           describe: "Set the Hubspot account to use as the default account. The default account can be overridden with the \"--account\" option."
           errors:
             accountNotFound: "The account \"{{ specifiedAccount }}\" could not be found in {{ configPath }}"
+          accountOverride: "This project currently has an account override set: \"{{ accountOverride }}\". Account \"{{accountOverride}}\" will continue to act as the default account for this project."
+          accountOverrideCommands: "Use {{ createOverrideCommand }} to change override accounts, or {{ removeOverrideCommand }} to remove the override and use your default account."
           examples:
             default: "Select a HubSpot account to use as the default account"
             idBased: "Set the default account to the account in the config with accountId equal to \"1234567\""
@@ -55,6 +99,7 @@ en:
           logs:
             replaceDefaultAccount: "The removed account was the default account."
           prompts:
+            deleteOverrideFile: "Delete the override file ({{ overrideFilePath }}) associated with {{ accountName }}?"
             selectAccountToRemove: "Select an account to remove from the config"
           errors:
             accountNotFound: "The account \"{{ specifiedAccount }}\" could not be found in {{ configPath }}"
@@ -70,6 +115,12 @@ en:
         info:
           accountId: "{{#bold}}Account ID{{/bold}}: {{ accountId }}"
           describe: "Print information about the default account, or about the account specified with the \"account\" option."
+          defaultAccountTitle: "{{#bold}}Default Account{{/bold}}"
+          defaultAccount: "Account: {{ account }}"
+          configPath: "Source: {{ configPath }}"
+          overrideFilePathTitle: "{{#bold}}Default Account Override{{/bold}}"
+          overrideFilePath: "Source: {{ overrideFilePath }}"
+          overrideAccount: "Account: {{ account }}"
           errors:
             notUsingPersonalAccessKey: "This command currently only supports fetching scopes for the personal access key auth type."
           options:
@@ -92,13 +143,15 @@ en:
           confirm:
             one: "Remove 1 inactive account from the CLI config?"
             other: "Remove {{ count }} inactive accounts from the CLI config?"
+          defaultAccountOverride: "\n(This will also delete the default account override file at {{ overrideFilePath }})"
+          replaceDefaultAccount: "The default account was removed."
           removeSuccess: "Removed {{ accountName }} from the CLI config."
     auth:
       describe: "Configure authentication for your HubSpot account."
       verboseDescribe: "Configure authentication for a HubSpot account. This will update the {{ configName }} file that stores your account information.\n\nThe recommended authentication method is {{#bold}}{{ authMethod }}{{/bold}}, which uses an access token tied to a specific user account."
       errors:
-        noConfigFileFound: "No config file was found. To create a new config file, use the \"hs init\" command."
         unsupportedAuthType: "Unsupported auth type: {{ type }}. The only supported authentication protocols are {{ supportedProtocols }}."
+        globalConfigFileExists: "A global config file exists at {{ configPath }}. To authorize an account, please use {{ authCommand }}."
       options:
         authType:
           describe: "Authentication method"
@@ -109,6 +162,16 @@ en:
     config:
       describe: "Commands for managing the CLI config file."
       subcommands:
+        migrate:
+          describe: "Migrate from the deprecated {{ deprecatedConfigPath }} file to the new global config file at {{ globalConfigPath }}."
+          migrationAlreadyCompleted: "No {{ deprecatedConfigPath }} deprecated configuration file found. No migration necessary."
+          errors:
+            configNotFound: "A configuration file at {{ configPath }} could not be found. Please try again with a valid file path."
+          options:
+            force: "When merging a deprecated configuration file with an existing global configuration file, overwrite any conflicting values in the global config with the deprecated config values."
+          examples:
+            default: "Migrate from the deprecated {{ deprecatedConfigPath }} file to the new global config file at {{ globalConfigPath }}"
+            configFlag: "Migrate a specific config file (specified with the config flag) to the new global config file at {{ globalConfigPath }}"
         set:
           describe: "Set various configuration options within the hubspot.config.yml file."
           promptMessage: "Select a config option to update"
@@ -456,8 +519,6 @@ en:
           describe: "Authentication method"
         account:
           describe: "HubSpot account to authenticate"
-        useHiddenConfig:
-          describe: "Use the new HubSpot configuration file located in a hidden file in the user's home directory"
       success:
         configFileCreated: "Created config file \"{{ configPath }}\""
         configFileUpdated: "Connected account \"{{ account }}\" using \"{{ authType }}\" and set it as the default account"
@@ -465,7 +526,7 @@ en:
         updateConfig: "To update an existing config file, use the \"hs auth\" command."
       errors:
         configFileExists: "The config file {{ configPath }} already exists."
-        bothConfigFilesNotAllowed: "Unable to create config file, because there is an existing one at \"{{ path }}\". To create a new config file, delete the existing one and try again."
+        globalConfigFileExists: "A global config file already exists at {{ configPath }}. To specify a new local config file, delete the existing one and try again."
     lint:
       issuesFound: "{{ count }} issues found."
       groupName: "Linting {{ path }}"
@@ -589,7 +650,6 @@ en:
           componentsToBeMigrated: "The following component types will be migrated: {{ components }}"
           componentsThatWillNotBeMigrated: "[NOTE] These component types are not yet supported for migration but will be available later: {{ components }}"
           errors:
-            noApps: "No apps found in account {{ accountId }}"
             noAppsEligible: "No apps in account {{ accountId }} are currently migratable"
             noAccountConfig: "There is no account associated with {{ accountId }} in the config file. Please choose another account and try again, or authenticate {{ accountId }} using {{ authCommand }}."
             invalidAccountTypeTitle: "{{#bold}}Developer account not targeted{{/bold}}"
@@ -597,6 +657,7 @@ en:
             projectAlreadyExists: "A project with name {{ projectName }} already exists. Please choose another name."
             invalidApp: "Could not migrate appId {{ appId }}. This app cannot be migrated at this time. Please choose another public app."
             appWithAppIdNotFound: "Could not find an app with the id {{ appId }} "
+            migrationFailed: 'Migration Failed'
           prompt:
             chooseApp: 'Which app would you like to migrate?'
             inputName: '[--name] What would you like to name the project?'
@@ -605,7 +666,6 @@ en:
             proceed: 'Would you like to proceed?'
           spinners:
             beginningMigration: "Beginning migration"
-            migrationStarted: "Migration started"
             unableToStartMigration: "Unable to begin migration"
             finishingMigration: "Wrapping up migration"
             migrationComplete: "Migration completed"
@@ -773,6 +833,7 @@ en:
             uploadFailed: "Failed to upload file \"{{ filePath }}\" to \"{{ remotePath }}\""
             deleteFileFailed: "Failed to delete file \"{{ remotePath }}\""
             deleteFolderFailed: "Failed to delete folder \"{{ remotePath }}\""
+            v3ApiError: "{{ command }} is not supported for platform version '{{ platformVersion}}', use {{ newCommand }} instead to develop locally. {{ linkToDocs }}"
         download:
           describe: "Download your project files from HubSpot."
           examples:
@@ -1109,6 +1170,7 @@ en:
         missingComponents: "Couldn't find the following components in the deployed build for this project: {{#bold}}'{{ missingComponents }}'{{/bold}}. This may cause issues in local development."
         defaultWarning: "{{#bold}}Changing project configuration requires a new project build.{{/bold}}"
         defaultPublicAppWarning: "{{#bold}}Changing project configuration requires a new project build.{{/bold}}\n\nThis will affect your public app's {{#bold}}{{ installCount }} existing {{ installText }}{{/bold}}. If your app has users in production, we strongly recommend creating a copy of this app to test your changes before proceding."
+        defaultMarketplaceAppWarning: "{{#bold}}Changing project configuration requires creating a new project build.{{/bold}}\n\nYour marketplace app is currently installed in {{#bold}}{{ installCount }} {{ accountText }}{{/bold}}. Any uploaded changes will impact your app's users. We strongly recommend creating a copy of this app to test your changes before proceding."
         header: "{{ warning }} To reflect these changes and continue testing:"
         stopDev: "  * Stop {{ command }}"
         runUpload: "  * Run {{ command }}"
@@ -1195,6 +1257,9 @@ en:
         compressed: "Project files compressed: {{ byteCount }} bytes"
         compressing: "Compressing build files to \"{{ path }}\""
         fileFiltered: "Ignore rule triggered for \"{{ filename }}\""
+    middleware:
+      fireAlarm:
+        failedToLoadBoxen: "Failed to load boxen util."
     ui:
       betaTag: "{{#bold}}[BETA]{{/bold}}"
       betaWarning:
@@ -1215,11 +1280,14 @@ en:
             command: "--account"
             message: "Use the {{ command }} option with any command to override the default account"
           accountsListCommand:
-            command: hs accounts list
+            command: "hs account list"
             message: "Run {{ command }} to see a list of configured HubSpot accounts"
           accountsUseCommand:
-            command: "hs accounts use"
+            command: "hs account use"
             message: "Run {{ command }} to set the Hubspot account that the CLI will target by default"
+          accountAuthCommand:
+            command: "hs account auth"
+            message: "Run {{ command }} to connect the CLI to additional HubSpot accounts"
           authCommand:
             command: "hs auth"
             message: "Run {{ command }} to connect the CLI to additional HubSpot accounts"
@@ -1244,6 +1312,9 @@ en:
           projectDevCommand:
             command: "hs project dev"
             message: "Run {{ command }} to set up your test environment and start local development"
+          projectInstallDepsCommand:
+            command: "hs project install-deps"
+            message: "Run {{ command }} to install dependencies for your project components"
           projectCommandTip:
             message: "Tip: All project commands must be run from within a project directory"
           sampleProjects:
@@ -1281,6 +1352,13 @@ en:
           describe: "Use environment variable config"
         debug:
           describe: "Set log level to debug"
+    configMigrate:
+      migrateConfigPrompt: "Migrate config?\n From deprecated config file: {{ deprecatedConfigPath }}\n To new global config file: {{ globalConfigPath }}\n (This action will delete the deprecated config file).\n"
+      mergeConfigConflictPrompt: "Change the {{ property }} property in the global config from {{ newValue }} to {{ oldValue }}?"
+      mergeConfigsPrompt: "Two config files detected. Merge them?\n Deprecated config file: {{ deprecatedConfigPath }}\n Global config: {{ globalConfigPath }}\n (This action will delete the deprecated config file).\n"
+      migrationSuccess: "The deprecated config file has been migrated to the new global config file at {{ globalConfigPath }}."
+      mergeSuccess: "The deprecated config file has been merged with the global config file at {{ globalConfigPath }}."
+      skippedExistingAccounts: "\nThe following accounts were not merged, because they already exist in the global config: {{ skippedAccountIds }}.\n"
     prompts:
       projectDevTargetAccountPrompt:
         createNewSandboxOption: "<Test on a new development sandbox>"
@@ -1567,6 +1645,9 @@ en:
     doctor:
       runningDiagnostics: "Running diagnostics..."
       diagnosticsComplete: "Diagnostics complete"
+      defaultAccountOverrideFileChecks:
+        overrideActive: "Default account override file active: {{ defaultAccountOverrideFile }}"
+        overrideAccountId: "Active account ID: {{ overrideAccountId }}"
       accountChecks:
         active: "Default account active"
         inactive: "Default account isn't active"
@@ -1618,6 +1699,8 @@ en:
           settings:
             httpUseLocalhost: "The setting {{#bold}}httpUseLocalhost{{/bold}} is enabled"
             httpUseLocalhostSecondary: "This setting causes all CLI requests to route to localhost"
+        defaultAccountOverrideFile:
+          header: "Default account override file path:"
         projectConfig:
           header: "Project configuration"
           projectDirSubHeader: "Project dir: {{#bold}}{{ projectDir }}{{/bold}}"

package/lib/DevServerManagerV2.d.ts

@@ -12,11 +12,10 @@ declare class DevServerManagerV2 {
     private devServers;
     constructor();
     iterateDevServers(callback: (serverInterface: DevServerInterface) => Promise<void>): Promise<void>;
-    setup({ projectNodes, onUploadRequired, accountId, setActiveApp, }: {
+    setup({ projectNodes, accountId, setActiveApp, }: {
         projectNodes: {
             [key: string]: IntermediateRepresentationNodeLocalDev;
         };
-        onUploadRequired: () => void;
         accountId: number;
         setActiveApp: (appUid: string | undefined) => Promise<void>;
     }): Promise<void>;

package/lib/DevServerManagerV2.js

@@ -20,7 +20,7 @@ class DevServerManagerV2 {
     async iterateDevServers(callback) {
         await Promise.all(this.devServers.map(devServer => callback(devServer)));
     }
-    async setup({ projectNodes, onUploadRequired, accountId, setActiveApp, }) {
+    async setup({ projectNodes, accountId, setActiveApp, }) {
         let env;
         const accountConfig = (0, config_1.getAccountConfig)(accountId);
         if (accountConfig) {
@@ -31,7 +31,6 @@ class DevServerManagerV2 {
             if (serverInterface.setup) {
                 await serverInterface.setup({
                     components: projectNodes,
-                    onUploadRequired,
                     promptUser: promptUtils_1.promptUser,
                     logger: logger_1.logger,
                     urls: {

package/lib/LocalDevManagerV2.js

@@ -10,6 +10,7 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const localDevAuth_1 = require("@hubspot/local-dev-lib/api/localDevAuth");
 const appsDev_1 = require("@hubspot/local-dev-lib/api/appsDev");
 const config_1 = require("@hubspot/local-dev-lib/config");
+const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
 const constants_1 = require("./constants");
 const SpinniesManager_1 = __importDefault(require("./ui/SpinniesManager"));
 const DevServerManagerV2_1 = __importDefault(require("./DevServerManagerV2"));
@@ -212,16 +213,13 @@ class LocalDevManagerV2 {
             : (0, ui_1.uiCommandReference)('hs project upload');
     }
     logUploadWarning(reason) {
-        let warning;
-        if (reason) {
-            warning = reason;
-        }
-        else {
+        let warning = reason;
+        if (!warning) {
             warning =
                 this.publicAppActiveInstalls && this.publicAppActiveInstalls > 0
-                    ? (0, lang_1.i18n)(`${i18nKey}.uploadWarning.defaultPublicAppWarning`, {
+                    ? (0, lang_1.i18n)(`${i18nKey}.uploadWarning.defaultMarketplaceAppWarning`, {
                         installCount: this.publicAppActiveInstalls,
-                        installText: this.publicAppActiveInstalls === 1 ? 'install' : 'installs',
+                        accountText: this.publicAppActiveInstalls === 1 ? 'account' : 'accounts',
                     })
                     : (0, lang_1.i18n)(`${i18nKey}.uploadWarning.defaultWarning`);
         }
@@ -268,10 +266,10 @@ class LocalDevManagerV2 {
         const deployedComponentNames = this.deployedBuild.subbuildStatuses.map(subbuildStatus => subbuildStatus.buildName);
         const missingProjectNodes = [];
         Object.values(this.projectNodes).forEach(node => {
-            if ((0, structure_1.isAppIRNode)(node) || (0, structure_1.isCardIRNode)(node)) {
-                if (!deployedComponentNames.includes(node.uid)) {
-                    missingProjectNodes.push(`${(0, lang_1.i18n)(`${i18nKey}.uploadWarning.appLabel`)} ${node.uid}`);
-                }
+            if (!deployedComponentNames.includes(node.uid)) {
+                const userFriendlyName = (0, project_parsing_lib_1.mapToUserFriendlyName)(node.componentType);
+                const label = userFriendlyName ? `[${userFriendlyName}] ` : '';
+                missingProjectNodes.push(`${label}${node.uid}`);
             }
         });
         if (missingProjectNodes.length) {
@@ -284,9 +282,7 @@ class LocalDevManagerV2 {
         this.watcher = chokidar_1.default.watch(this.projectDir, {
             ignoreInitial: true,
         });
-        const configPaths = Object.values(this.projectNodes)
-            .filter(structure_1.isAppIRNode)
-            .map(component => component.localDev.componentConfigPath);
+        const configPaths = Object.values(this.projectNodes).map(component => component.localDev.componentConfigPath);
         const projectConfigPath = path_1.default.join(this.projectDir, constants_1.PROJECT_CONFIG_FILE);
         configPaths.push(projectConfigPath);
         this.watcher.on('add', filePath => {
@@ -317,7 +313,6 @@ class LocalDevManagerV2 {
         try {
             await DevServerManagerV2_1.default.setup({
                 projectNodes: this.projectNodes,
-                onUploadRequired: this.logUploadWarning.bind(this),
                 accountId: this.targetTestingAccountId,
                 setActiveApp: this.setActiveApp.bind(this),
             });

package/lib/app/migrate.d.ts

@@ -1,7 +1,5 @@
-import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { ArgumentsCamelCase } from 'yargs';
 import { MigrateAppOptions } from '../../types/Yargs';
 export declare function downloadProjectFiles(derivedAccountId: number, projectName: string, buildId: number, projectDest: string): Promise<void>;
 export declare function migrateApp2025_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppOptions>): Promise<void>;
 export declare function logInvalidAccountError(i18nKey: string): void;
-export declare function migrateApp2023_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppOptions>, accountConfig: CLIAccount): Promise<void>;