@hubspot/cli 7.2.5-experimental.0 → 7.3.0-beta.0

package/lang/en.lyaml

@@ -11,9 +11,6 @@ en:
         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:
@@ -21,51 +18,11 @@ 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:
-          describe: "List names of accounts defined in config."
           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 }}"
+          defaultAccount: "{{#bold}}Default account{{/bold}}: {{ account }}"
+          describe: "List names of accounts defined in config."
+          configPath: "{{#bold}}Config path{{/bold}}: {{ configPath }}"
           labels:
             accountId: "Account ID"
             authType: "Auth Type"
@@ -83,8 +40,6 @@ 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\""
@@ -100,7 +55,6 @@ 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 }}"
@@ -116,12 +70,6 @@ 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:
@@ -144,15 +92,13 @@ 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"
@@ -163,16 +109,6 @@ 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"
@@ -520,6 +456,8 @@ 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"
@@ -527,7 +465,7 @@ en:
         updateConfig: "To update an existing config file, use the \"hs auth\" command."
       errors:
         configFileExists: "The config file {{ configPath }} already exists."
-        globalConfigFileExists: "A global config file already exists at {{ configPath }}. To specify a new local config file, delete the existing one and try again."
+        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."
     lint:
       issuesFound: "{{ count }} issues found."
       groupName: "Linting {{ path }}"
@@ -693,7 +631,7 @@ en:
           debug:
             deploying: "Deploying project at path: {{ path }}"
           errors:
-            deploy: "Deploy error: {{ details }}"
+            deploy: "Deploy error: an unknown error occurred."
             noBuilds: "Deploy error: no builds for this project were found."
             noBuildId: "You must specify a build to deploy"
             projectNotFound: "The project {{ projectName }} does not exist in account {{ accountIdentifier }}. Run {{ command }} to upload your project files to HubSpot."
@@ -812,7 +750,7 @@ en:
             downloadSucceeded: "Downloaded build \"{{ buildId }}\" from project \"{{ projectName }}\""
           errors:
             downloadFailed: "Something went wrong downloading the project"
-            projectNotFound: "Your project {{ projectName }} could not be found in {{ accountId }}"
+            noBuildIdToDownload: "This project is empty. There is no build content to download"
           warnings:
             cannotDownloadWithinProject: "Cancelling project download. Please run the command again outside the context of an existing project."
           options:
@@ -1139,6 +1077,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 }}"
@@ -1245,14 +1184,11 @@ en:
             command: "--account"
             message: "Use the {{ command }} option with any command to override the default account"
           accountsListCommand:
-            command: "hs account list"
+            command: hs accounts list
             message: "Run {{ command }} to see a list of configured HubSpot accounts"
           accountsUseCommand:
-            command: "hs account use"
+            command: "hs accounts 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"
@@ -1277,6 +1213,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:
@@ -1314,13 +1253,6 @@ 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>"
@@ -1586,6 +1518,8 @@ en:
         errorContext: "Context: {{ context }}"
         errorCause: "Cause: {{ cause }}"
         unknownErrorOccurred: "An unknown error has occurred."
+        configTimeoutErrorOccurred: "This error occurred because a request exceeded the default HTTP timeout of {{ timeout }}ms. To increase the default HTTP timeout, run {{ configSetCommand }}."
+        genericTimeoutErrorOccurred: "This error occurred because an HTTP request timed out. Re-running the command may resolve this issue."
       suppressErrors:
         platformVersionErrors:
           header: "Platform version update required"
@@ -1605,9 +1539,6 @@ 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"
@@ -1659,8 +1590,6 @@ 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/dependencyManagement.js

@@ -20,10 +20,9 @@ const SpinniesManager_1 = __importDefault(require("./ui/SpinniesManager"));
 const fs_2 = __importDefault(require("fs"));
 const package_json_1 = __importDefault(require("../package.json"));
 const DEFAULT_PACKAGE_MANAGER = 'npm';
-const i18nKey = `commands.project.subcommands.installDeps`;
 class NoPackageJsonFilesError extends Error {
     constructor(projectName) {
-        super((0, lang_1.i18n)(`${i18nKey}.noPackageJsonInProject`, {
+        super((0, lang_1.i18n)(`commands.project.subcommands.installDeps.noPackageJsonInProject`, {
             projectName,
             link: (0, ui_1.uiLink)('Learn how to create a project from scratch.', 'https://developers.hubspot.com/beta-docs/guides/crm/intro/create-a-project'),
         }));
@@ -57,11 +56,11 @@ async function installPackagesInDirectory(directory, packages) {
     SpinniesManager_1.default.init();
     SpinniesManager_1.default.add(spinner, {
         text: packages && packages.length
-            ? (0, lang_1.i18n)(`${i18nKey}.addingDependenciesToLocation`, {
+            ? (0, lang_1.i18n)(`commands.project.subcommands.installDeps.addingDependenciesToLocation`, {
                 dependencies: `[${packages.join(', ')}]`,
                 directory: relativeDir,
             })
-            : (0, lang_1.i18n)(`${i18nKey}.installingDependencies`, {
+            : (0, lang_1.i18n)(`commands.project.subcommands.installDeps.installingDependencies`, {
                 directory: relativeDir,
             }),
     });
@@ -74,18 +73,18 @@ async function installPackagesInDirectory(directory, packages) {
         const exec = util_1.default.promisify(child_process_1.exec);
         await exec(installCommand, { cwd: directory });
         SpinniesManager_1.default.succeed(spinner, {
-            text: (0, lang_1.i18n)(`${i18nKey}.installationSuccessful`, {
+            text: (0, lang_1.i18n)(`commands.project.subcommands.installDeps.installationSuccessful`, {
                 directory: relativeDir,
             }),
         });
     }
     catch (e) {
         SpinniesManager_1.default.fail(spinner, {
-            text: (0, lang_1.i18n)(`${i18nKey}.installingDependenciesFailed`, {
+            text: (0, lang_1.i18n)(`commands.project.subcommands.installDeps.installingDependenciesFailed`, {
                 directory: relativeDir,
             }),
         });
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.installingDependenciesFailed`, {
+        throw new Error((0, lang_1.i18n)(`commands.project.subcommands.installDeps.installingDependenciesFailed`, {
             directory: relativeDir,
         }), {
             cause: e,
@@ -97,11 +96,11 @@ async function getProjectPackageJsonLocations() {
     if (!projectConfig ||
         !projectConfig.projectDir ||
         !projectConfig.projectConfig) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.noProjectConfig`));
+        throw new Error((0, lang_1.i18n)(`commands.project.subcommands.installDeps.noProjectConfig`));
     }
     const { projectDir, projectConfig: { srcDir, name }, } = projectConfig;
     if (!(await isGloballyInstalled(DEFAULT_PACKAGE_MANAGER))) {
-        throw new Error((0, lang_1.i18n)(`${i18nKey}.packageManagerNotInstalled`, {
+        throw new Error((0, lang_1.i18n)(`commands.project.subcommands.installDeps.packageManagerNotInstalled`, {
             packageManager: DEFAULT_PACKAGE_MANAGER,
             link: (0, ui_1.uiLink)(DEFAULT_PACKAGE_MANAGER, 'https://docs.npmjs.com/downloading-and-installing-node-js-and-npm'),
         }));

package/lib/doctor/Diagnosis.d.ts

@@ -11,15 +11,16 @@ interface Section {
 export declare class Diagnosis {
     private readonly prefixes;
     private readonly diagnosis;
+    private readonly indentation;
     private errorCount;
     private warningCount;
     constructor({ diagnosticInfo, accountId }: DiagnosisOptions);
+    private indent;
     getErrorCount(): number;
     getWarningCount(): number;
     addCliSection(section: Section): void;
     addProjectSection(section: Section): void;
     addCLIConfigSection(section: Section): void;
-    addDefaultAccountOverrideFileSection(section: Section): void;
     toString(): string;
     private generateSections;
 }

package/lib/doctor/Diagnosis.js

@@ -5,12 +5,12 @@ const spinniesUtils_1 = require("../ui/spinniesUtils");
 const chalk_1 = require("chalk");
 const interpolation_1 = require("../interpolation");
 const ui_1 = require("../ui");
-const index_1 = require("../ui/index");
 const { i18n } = require('../lang');
 const i18nKey = `lib.doctor.diagnosis`;
 class Diagnosis {
     prefixes;
     diagnosis;
+    indentation = '  ';
     errorCount = 0;
     warningCount = 0;
     constructor({ diagnosticInfo, accountId }) {
@@ -29,10 +29,6 @@ class Diagnosis {
                 header: i18n(`${i18nKey}.cliConfig.header`),
                 sections: [],
             },
-            defaultAccountOverrideFile: {
-                header: i18n(`${i18nKey}.defaultAccountOverrideFile.header`),
-                sections: [],
-            },
             project: {
                 header: i18n(`${i18nKey}.projectConfig.header`),
                 subheaders: [
@@ -57,6 +53,9 @@ class Diagnosis {
             ];
         }
     }
+    indent(level) {
+        return this.indentation.repeat(level);
+    }
     getErrorCount() {
         return this.errorCount;
     }
@@ -72,9 +71,6 @@ class Diagnosis {
     addCLIConfigSection(section) {
         this.diagnosis.cliConfig.sections.push(section);
     }
-    addDefaultAccountOverrideFileSection(section) {
-        this.diagnosis.defaultAccountOverrideFile.sections.push(section);
-    }
     toString() {
         const output = [];
         for (const value of Object.values(this.diagnosis)) {
@@ -112,9 +108,9 @@ class Diagnosis {
             else if (section.type === 'warning') {
                 this.warningCount++;
             }
-            output.push(`${(0, index_1.indent)(1)}${this.prefixes[section.type]} ${section.message}`);
+            output.push(`${this.indent(1)}${this.prefixes[section.type]} ${section.message}`);
             if (section.secondaryMessaging) {
-                output.push(`${(0, index_1.indent)(2)}- ${section.secondaryMessaging}`);
+                output.push(`${this.indent(2)}- ${section.secondaryMessaging}`);
             }
         });
         return output.join('\n');

package/lib/doctor/DiagnosticInfoBuilder.d.ts

@@ -21,7 +21,6 @@ export interface DiagnosticInfo extends FilesInfo {
         npm: string | null;
     };
     config: string | null;
-    defaultAccountOverrideFile: string | null | undefined;
     configSettings: {
         [key: string]: unknown;
     };

package/lib/doctor/DiagnosticInfoBuilder.js

@@ -64,7 +64,6 @@ class DiagnosticInfoBuilder {
             arch,
             path: mainModule?.path,
             config: (0, config_2.getConfigPath)(),
-            defaultAccountOverrideFile: (0, config_1.getDefaultAccountOverrideFilePath)(),
             configSettings: this.configSettings,
             versions: {
                 [hubspotCli]: package_json_1.default.version,

package/lib/doctor/Doctor.d.ts

@@ -10,7 +10,6 @@ export declare class Doctor {
     private performCliChecks;
     private performProjectChecks;
     private performCliConfigChecks;
-    private performDefaultAccountOverrideFileChecks;
     private performCliConfigSettingsChecks;
     private checkIfAccessTokenValid;
     private checkIfNodeIsInstalled;

package/lib/doctor/Doctor.js

@@ -51,7 +51,6 @@ class Doctor {
             ...this.performCliConfigChecks(),
             ...(this.projectConfig?.projectConfig ? this.performProjectChecks() : []),
         ]);
-        this.performDefaultAccountOverrideFileChecks();
         this.performCliConfigSettingsChecks();
         SpinniesManager_1.default.succeed('runningDiagnostics', {
             text: i18n(`${i18nKey}.diagnosticsComplete`),
@@ -89,23 +88,6 @@ class Doctor {
         }
         return [this.checkIfAccessTokenValid()];
     }
-    performDefaultAccountOverrideFileChecks() {
-        const localI18nKey = `${i18nKey}.defaultAccountOverrideFileChecks`;
-        if (this.diagnosticInfo?.defaultAccountOverrideFile) {
-            this.diagnosis?.addDefaultAccountOverrideFileSection({
-                type: 'warning',
-                message: i18n(`${localI18nKey}.overrideActive`, {
-                    defaultAccountOverrideFile: this.diagnosticInfo.defaultAccountOverrideFile,
-                }),
-            });
-            this.diagnosis?.addDefaultAccountOverrideFileSection({
-                type: 'warning',
-                message: i18n(`${localI18nKey}.overrideAccountId`, {
-                    overrideAccountId: (0, config_1.getCWDAccountOverride)(),
-                }),
-            });
-        }
-    }
     performCliConfigSettingsChecks() {
         if (this.diagnosticInfo?.configSettings.httpUseLocalhost) {
             this.diagnosis?.addCLIConfigSection({

package/lib/errorHandlers/index.js

@@ -8,9 +8,11 @@ exports.logError = logError;
 exports.debugError = debugError;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const index_1 = require("@hubspot/local-dev-lib/errors/index");
+const config_1 = require("@hubspot/local-dev-lib/config");
 const suppressError_1 = require("./suppressError");
 const lang_1 = require("../lang");
 const util_1 = __importDefault(require("util"));
+const ui_1 = require("../ui");
 const i18nKey = 'lib.errorHandlers.index';
 function logError(error, context) {
     debugError(error, context);
@@ -41,6 +43,21 @@ function logError(error, context) {
         // Unknown errors
         logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.unknownErrorOccurred`));
     }
+    if ((0, index_1.isHubSpotHttpError)(error) && error.code === 'ETIMEDOUT') {
+        const config = (0, config_1.getConfig)();
+        const defaultTimeout = config?.httpTimeout;
+        // Timeout was caused by the default timeout
+        if (error.timeout && defaultTimeout === error.timeout) {
+            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.configTimeoutErrorOccurred`, {
+                timeout: error.timeout,
+                configSetCommand: (0, ui_1.uiCommandReference)('hs config set'),
+            }));
+        }
+        // Timeout was caused by a custom timeout set by the CLI or LDL
+        else {
+            logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.genericTimeoutErrorOccurred`));
+        }
+    }
 }
 function debugError(error, context) {
     if ((0, index_1.isHubSpotHttpError)(error)) {

package/lib/projects/buildAndDeploy.d.ts

@@ -3,7 +3,7 @@ import { Build } from '@hubspot/local-dev-lib/types/Build';
 import { Deploy } from '@hubspot/local-dev-lib/types/Deploy';
 import { ProjectConfig, ProjectTask, ProjectPollResult } from '../../types/Projects';
 export declare function useV3Api(platformVersion?: string | null): boolean;
-type PollTaskStatusFunction<T extends ProjectTask> = (accountId: number, taskName: string, taskId: number, deployedBuildId: number | null, silenceLogs: boolean) => Promise<T>;
+type PollTaskStatusFunction<T extends ProjectTask> = (accountId: number, taskName: string, taskId: number, deployedBuildId: number | null, silenceLogs?: boolean) => Promise<T>;
 export declare const pollBuildStatus: PollTaskStatusFunction<Build>;
 export declare const pollDeployStatus: PollTaskStatusFunction<Deploy>;
 export declare function displayWarnLogs(accountId: number, projectName: string, taskId: number, isDeploy?: boolean): Promise<void>;

package/lib/projects/buildAndDeploy.js

@@ -59,7 +59,7 @@ function handleTaskStatusError(statusText) {
     process.exit(exitCodes_1.EXIT_CODES.ERROR);
 }
 function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrings, linkToHubSpot, }) {
-    return async function (accountId, taskName, taskId, deployedBuildId = null, silenceLogs = false) {
+    return async function (accountId, taskName, taskId, deployedBuildId, silenceLogs = false) {
         const displayId = deployedBuildId || taskId;
         if (linkToHubSpot && !silenceLogs) {
             logger_1.logger.log(`\n${linkToHubSpot(accountId, taskName, taskId, deployedBuildId)}\n`);

package/lib/projects/index.d.ts

@@ -6,7 +6,7 @@ export declare function getProjectConfig(dir?: string): Promise<{
     projectDir: string | null;
     projectConfig: ProjectConfig | null;
 }>;
-export declare function validateProjectConfig(projectConfig: ProjectConfig, projectDir: string): void;
+export declare function validateProjectConfig(projectConfig: ProjectConfig | null, projectDir: string | null): void;
 export declare function ensureProjectExists(accountId: number, projectName: string, { forceCreate, allowCreate, noLogs, withPolling, uploadCommand, }?: {
     forceCreate?: boolean | undefined;
     allowCreate?: boolean | undefined;

package/lib/projects/index.js

@@ -67,7 +67,7 @@ async function getProjectConfig(dir) {
     }
 }
 function validateProjectConfig(projectConfig, projectDir) {
-    if (!projectConfig) {
+    if (!projectConfig || !projectDir) {
         logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.validateProjectConfig.configNotFound`, {
             createCommand: (0, ui_1.uiCommandReference)('hs project create'),
         }));

package/lib/projects/structure.d.ts

@@ -1,6 +1,6 @@
 import { ComponentTypes, Component, GenericComponentConfig, PublicAppComponentConfig, PrivateAppComponentConfig, AppCardComponentConfig } from '../../types/Projects';
 import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
-import { AppIRNode, CardIRNode } from '../../types/ProjectComponents';
+import { AppIRNode } from '../../types/ProjectComponents';
 export declare const CONFIG_FILES: {
     [k in ComponentTypes]: string;
 };
@@ -16,4 +16,3 @@ export declare function getComponentUid(component?: Component | null): string |
 export declare function componentIsApp(component?: Component | null): component is Component<PublicAppComponentConfig | PrivateAppComponentConfig>;
 export declare function componentIsPublicApp(component?: Component | null): component is Component<PublicAppComponentConfig>;
 export declare function isAppIRNode(component: IntermediateRepresentationNodeLocalDev): component is AppIRNode;
-export declare function isCardIRNode(component: IntermediateRepresentationNodeLocalDev): component is CardIRNode;

package/lib/projects/structure.js

@@ -44,7 +44,6 @@ exports.getComponentUid = getComponentUid;
 exports.componentIsApp = componentIsApp;
 exports.componentIsPublicApp = componentIsPublicApp;
 exports.isAppIRNode = isAppIRNode;
-exports.isCardIRNode = isCardIRNode;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const fs_1 = require("@hubspot/local-dev-lib/fs");
@@ -175,6 +174,3 @@ function componentIsPublicApp(component) {
 function isAppIRNode(component) {
     return component.componentType === constants_1.IR_COMPONENT_TYPES.APPLICATION;
 }
-function isCardIRNode(component) {
-    return component.componentType === constants_1.IR_COMPONENT_TYPES.CARD;
-}