@hubspot/cli 6.2.2-experimental.1 → 6.2.2-experimental.2

package/bin/cli.js

@@ -38,6 +38,7 @@ const accountsCommand = require('../commands/accounts');
 const sandboxesCommand = require('../commands/sandbox');
 const cmsCommand = require('../commands/cms');
 const feedbackCommand = require('../commands/feedback');
+const doctorCommand = require('../commands/doctor');
 const notifier = updateNotifier({
     pkg: { ...pkg, name: '@hubspot/cli' },
     distTag: 'latest',
@@ -167,6 +168,7 @@ const argv = yargs
     .command(accountsCommand)
     .command(sandboxesCommand)
     .command(feedbackCommand)
+    .command(doctorCommand)
     .help()
     .recommendCommands()
     .demandCommand(1, '')

package/commands/auth.js

@@ -15,7 +15,6 @@ const { personalAccessKeyPrompt, OAUTH_FLOW, } = require('../lib/prompts/persona
 const { cliAccountNamePrompt } = require('../lib/prompts/accountNamePrompt');
 const { setAsDefaultAccountPrompt, } = require('../lib/prompts/setAsDefaultAccountPrompt');
 const { addConfigOptions, setLogLevel, getAccountId, addTestingOptions, } = require('../lib/commonOpts');
-const { logDebugInfo } = require('../lib/debugInfo');
 const { trackAuthAction, trackCommandUsage } = require('../lib/usageTracking');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
@@ -40,7 +39,6 @@ exports.handler = async (options) => {
     const { type, config: c, qa, account } = options;
     const authType = (type && type.toLowerCase()) || PERSONAL_ACCESS_KEY_AUTH_METHOD.value;
     setLogLevel(options);
-    logDebugInfo(options);
     if (!getConfigPath(c)) {
         logger.error(i18n(`${i18nKey}.errors.noConfigFileFound`));
         process.exit(EXIT_CODES.ERROR);

package/commands/create/api-sample.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const { createApiSamplePrompt, } = require('../../lib/prompts/createApiSamplePrompt');
-const { folderOverwritePrompt, } = require('../../lib/prompts/folderOverwritePrompt');
+const { confirmPrompt } = require('../../lib/prompts/promptUtils');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const path = require('path');
 const fs = require('fs-extra');
@@ -22,7 +22,7 @@ module.exports = {
     execute: async ({ dest, name, assetType, options }) => {
         const filePath = path.join(dest, name);
         if (fs.existsSync(filePath)) {
-            const { overwrite } = await folderOverwritePrompt(filePath);
+            const overwrite = await confirmPrompt(i18n(`${i18nKey}.folderOverwritePrompt`, { folderName: filePath }), { defaultAnswer: false });
             if (overwrite) {
                 fs.rmdirSync(filePath, { recursive: true });
             }

package/commands/create.js

@@ -28,7 +28,6 @@ const fs = require('fs-extra');
 const { logError } = require('../lib/errorHandlers/index');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { setLogLevel, getAccountId } = require('../lib/commonOpts');
-const { logDebugInfo } = require('../lib/debugInfo');
 const { resolveLocalPath } = require('../lib/filesystem');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const assets = require('./create/index');
@@ -45,7 +44,6 @@ exports.handler = async (options) => {
     let { type: assetType, dest } = options;
     const { name, internal: getInternalVersion } = options;
     setLogLevel(options);
-    logDebugInfo(options);
     assetType = typeof assetType === 'string' && assetType.toLowerCase();
     if (assetType === 'global-partial') {
         logger.error(i18n(`${i18nKey}.errors.deprecatedAssetType`, {

package/commands/doctor.d.ts

@@ -0,0 +1,8 @@
+import { ArgumentsCamelCase, BuilderCallback } from 'yargs';
+export interface DoctorOptions {
+    'output-dir'?: string;
+}
+export declare const command = "doctor";
+export declare const describe: any;
+export declare const handler: ({ outputDir, }: ArgumentsCamelCase<DoctorOptions>) => Promise<never>;
+export declare const builder: BuilderCallback<DoctorOptions, DoctorOptions>;

package/commands/doctor.js

@@ -0,0 +1,60 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.builder = exports.handler = exports.describe = exports.command = void 0;
+const usageTracking_1 = require("../lib/usageTracking");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const fs_1 = __importDefault(require("fs"));
+const Doctor_1 = require("../lib/doctor/Doctor");
+const exitCodes_1 = require("../lib/enums/exitCodes");
+const path_1 = __importDefault(require("path"));
+const path_2 = require("@hubspot/local-dev-lib/path");
+const { i18n } = require('../lib/lang');
+const i18nKey = 'commands.doctor';
+exports.command = 'doctor';
+exports.describe = i18n(`${i18nKey}.describe`);
+const handler = async ({ outputDir, }) => {
+    const doctor = new Doctor_1.Doctor();
+    (0, usageTracking_1.trackCommandUsage)(exports.command, undefined, doctor.accountId);
+    const output = await doctor.diagnose();
+    const totalCount = (output?.errorCount || 0) + (output?.warningCount || 0);
+    if (totalCount > 0) {
+        (0, usageTracking_1.trackCommandMetadataUsage)(exports.command, { success: false, type: totalCount }, doctor.accountId);
+    }
+    if (!outputDir) {
+        if (output?.diagnosis) {
+            logger_1.logger.log(output.diagnosis);
+        }
+        else {
+            logger_1.logger.error(i18n(`${i18nKey}.errors.generatingDiagnosis`));
+            return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+        }
+        return process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    }
+    if (!path_1.default.isAbsolute(outputDir)) {
+        outputDir = path_1.default.join((0, path_2.getCwd)(), outputDir);
+    }
+    const outputFile = path_1.default.join(outputDir, `hubspot-doctor-${new Date().toISOString()}.json`);
+    try {
+        fs_1.default.writeFileSync(outputFile, JSON.stringify(output, null, 4));
+        logger_1.logger.success(i18n(`${i18nKey}.outputWritten`, { filename: outputFile }));
+    }
+    catch (e) {
+        logger_1.logger.error(i18n(`${i18nKey}.errors.unableToWriteOutputFile`, {
+            file: outputFile,
+            errorMessage: e instanceof Error ? e.message : e,
+        }));
+        return process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    return process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+};
+exports.handler = handler;
+const builder = yargs => {
+    yargs.option('output-dir', {
+        describe: i18n(`${i18nKey}.options.outputDir`),
+        type: 'string',
+    });
+};
+exports.builder = builder;

package/commands/feedback.js

@@ -3,17 +3,32 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
 const open = require('open');
 const { i18n } = require('../lib/lang');
-const { FEEDBACK_URLS } = require('../lib/constants');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { feedbackTypePrompt, shouldOpenBrowserPrompt, } = require('../lib/prompts/feedbackPrompt');
+const { confirmPrompt, listPrompt } = require('../lib/prompts/promptUtils');
 const i18nKey = 'commands.project.subcommands.feedback';
+const FEEDBACK_OPTIONS = {
+    BUG: 'bug',
+    GENERAL: 'general',
+};
+const FEEDBACK_URLS = {
+    BUG: 'https://github.com/HubSpot/hubspot-cli/issues/new',
+    GENERAL: 'https://docs.google.com/forms/d/e/1FAIpQLSejZZewYzuH3oKBU01tseX-cSWOUsTHLTr-YsiMGpzwcvgIMg/viewform?usp=sf_link',
+};
 exports.command = 'feedback';
 exports.describe = i18n(`${i18nKey}.describe`);
 exports.handler = async (options) => {
     const { bug: bugFlag, general: generalFlag } = options;
     const usedTypeFlag = bugFlag !== generalFlag;
-    const { type } = await feedbackTypePrompt(usedTypeFlag);
-    const { shouldOpen } = await shouldOpenBrowserPrompt(type, usedTypeFlag);
+    await listPrompt(i18n(`${i18nKey}.feedbackType.prompt`), {
+        choices: Object.values(FEEDBACK_OPTIONS).map(option => ({
+            name: i18n(`${i18nKey}.feedbackType.${option}`),
+            value: option,
+        })),
+        when: !usedTypeFlag,
+    });
+    const shouldOpen = await confirmPrompt(i18n(`${i18nKey}.openPrompt`), {
+        when: !usedTypeFlag,
+    });
     if (shouldOpen || usedTypeFlag) {
         // NOTE: for now, all feedback should go to the hubspot-cli repository
         const url = FEEDBACK_URLS.BUG;

package/commands/functions/list.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 // @ts-nocheck
+const moment = require('moment');
 const { getRoutes } = require('@hubspot/local-dev-lib/api/functions');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const moment = require('moment');
 const { logError, ApiErrorContext } = require('../../lib/errorHandlers/index');
 const { getTableContents, getTableHeader } = require('../../lib/ui/table');
 const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');

package/commands/init.js

@@ -21,7 +21,6 @@ const { setLogLevel, addTestingOptions } = require('../lib/commonOpts');
 const { promptUser } = require('../lib/prompts/promptUtils');
 const { OAUTH_FLOW, personalAccessKeyPrompt, } = require('../lib/prompts/personalAccessKeyPrompt');
 const { cliAccountNamePrompt } = require('../lib/prompts/accountNamePrompt');
-const { logDebugInfo } = require('../lib/debugInfo');
 const { authenticateWithOauth } = require('../lib/oauth');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const { uiFeatureHighlight } = require('../lib/ui');
@@ -68,13 +67,14 @@ exports.describe = i18n(`${i18nKey}.describe`, {
     configName: DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
 });
 exports.handler = async (options) => {
-    const { auth: authType = PERSONAL_ACCESS_KEY_AUTH_METHOD.value, c, account: optionalAccount, } = options;
+    const { auth: authType = PERSONAL_ACCESS_KEY_AUTH_METHOD.value, c, account: optionalAccount, disableTracking, } = options;
     const configPath = (c && path.join(getCwd(), c)) || getConfigPath();
     setLogLevel(options);
-    logDebugInfo(options);
-    trackCommandUsage('init', {
-        authType,
-    });
+    if (!disableTracking) {
+        trackCommandUsage('init', {
+            authType,
+        });
+    }
     const env = options.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD;
     if (fs.existsSync(configPath)) {
         logger.error(i18n(`${i18nKey}.errors.configFileExists`, {
@@ -83,7 +83,9 @@ exports.handler = async (options) => {
         logger.info(i18n(`${i18nKey}.logs.updateConfig`));
         process.exit(EXIT_CODES.ERROR);
     }
-    trackAuthAction('init', authType, TRACKING_STATUS.STARTED);
+    if (!disableTracking) {
+        await trackAuthAction('init', authType, TRACKING_STATUS.STARTED);
+    }
     createEmptyConfigFile({ path: configPath });
     handleExit(deleteEmptyConfigFile);
     try {
@@ -104,12 +106,16 @@ exports.handler = async (options) => {
             account: name || accountId,
         }));
         uiFeatureHighlight(['helpCommand', 'authCommand', 'accountsListCommand']);
-        await trackAuthAction('init', authType, TRACKING_STATUS.COMPLETE, accountId);
+        if (!disableTracking) {
+            await trackAuthAction('init', authType, TRACKING_STATUS.COMPLETE, accountId);
+        }
         process.exit(EXIT_CODES.SUCCESS);
     }
     catch (err) {
         logError(err);
-        await trackAuthAction('init', authType, TRACKING_STATUS.ERROR);
+        if (!disableTracking) {
+            await trackAuthAction('init', authType, TRACKING_STATUS.ERROR);
+        }
         process.exit(EXIT_CODES.ERROR);
     }
 };
@@ -131,6 +137,11 @@ exports.builder = yargs => {
             describe: i18n(`${i18nKey}.options.account.describe`),
             type: 'string',
         },
+        'disable-tracking': {
+            type: 'boolean',
+            hidden: true,
+            default: false,
+        },
     });
     addConfigOptions(yargs);
     addTestingOptions(yargs);

package/commands/lint.d.ts

@@ -1 +1,4 @@
-export {};
+export declare const command = "lint <path>";
+export declare const describe: null;
+export declare const handler: (options: any) => Promise<void>;
+export declare const builder: (yargs: any) => any;

package/commands/lint.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.builder = exports.handler = exports.describe = exports.command = void 0;
 // @ts-nocheck
 const { lint } = require('@hubspot/local-dev-lib/cms/validate');
-const { printHublValidationResult } = require('../lib/hublValidate');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { logError } = require('../lib/errorHandlers/index');
 const { addConfigOptions, addAccountOptions, getAccountId, } = require('../lib/commonOpts');
@@ -15,7 +15,35 @@ const { EXIT_CODES } = require('../lib/enums/exitCodes');
 exports.command = 'lint <path>';
 // Hiding since this command is still experimental
 exports.describe = null; //'Lint a file or folder for HubL syntax';
-exports.handler = async (options) => {
+function getErrorsFromHublValidationObject(validation) {
+    return ((validation && validation.meta && validation.meta.template_errors) || []);
+}
+function printHublValidationError(err) {
+    const { severity, message, lineno, startPosition } = err;
+    const method = severity === 'FATAL' ? 'error' : 'warn';
+    logger[method]('[%d, %d]: %s', lineno, startPosition, message);
+}
+function printHublValidationResult({ file, validation }) {
+    let count = 0;
+    if (!validation) {
+        return count;
+    }
+    const errors = getErrorsFromHublValidationObject(validation);
+    if (!errors.length) {
+        return count;
+    }
+    logger.group(file);
+    errors.forEach(err => {
+        if (err.reason !== 'SYNTAX_ERROR') {
+            return;
+        }
+        ++count;
+        printHublValidationError(err);
+    });
+    logger.groupEnd();
+    return count;
+}
+const handler = async (options) => {
     const { path: lintPath } = options;
     await loadAndValidateOptions(options);
     const accountId = getAccountId(options);
@@ -41,7 +69,8 @@ exports.handler = async (options) => {
         count,
     }));
 };
-exports.builder = yargs => {
+exports.handler = handler;
+const builder = yargs => {
     addConfigOptions(yargs);
     addAccountOptions(yargs);
     yargs.positional('path', {
@@ -50,3 +79,10 @@ exports.builder = yargs => {
     });
     return yargs;
 };
+exports.builder = builder;
+module.exports = {
+    builder: exports.builder,
+    handler: exports.handler,
+    command: exports.command,
+    describe: exports.describe,
+};

package/commands/module/marketplace-validate.js

@@ -5,7 +5,7 @@ const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplace-validate');
+const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplaceValidate');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.module.subcommands.marketplaceValidate';
 exports.command = 'marketplace-validate <src>';

package/commands/project/deploy.js

@@ -10,14 +10,14 @@ const { deployProject, fetchProject, } = require('@hubspot/local-dev-lib/api/pro
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { getProjectConfig, pollDeployStatus, getProjectDetailUrl, } = require('../../lib/projects');
 const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
-const { deployBuildIdPrompt, } = require('../../lib/prompts/deployBuildIdPrompt');
+const { promptUser } = require('../../lib/prompts/promptUtils');
 const { i18n } = require('../../lib/lang');
 const { uiBetaTag, uiLink } = require('../../lib/ui');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const i18nKey = 'commands.project.subcommands.deploy';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { uiCommandReference, uiAccountDescription } = require('../../lib/ui');
 const { isHubSpotHttpError } = require('@hubspot/local-dev-lib/errors/index');
+const i18nKey = 'commands.project.subcommands.deploy';
 exports.command = 'deploy';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 const validateBuildId = (buildId, deployedBuildId, latestBuildId, projectName, accountId) => {
@@ -69,7 +69,14 @@ exports.handler = async (options) => {
             }
         }
         else {
-            const deployBuildIdPromptResponse = await deployBuildIdPrompt(latestBuild.buildId, deployedBuildId, buildId => validateBuildId(buildId, deployedBuildId, latestBuild.buildId, projectName, accountId));
+            const deployBuildIdPromptResponse = await promptUser({
+                name: 'buildId',
+                message: i18n(`${i18nKey}.deployBuildIdPrompt`),
+                default: latestBuild.buildId === deployedBuildId
+                    ? undefined
+                    : latestBuild.buildId,
+                validate: () => validateBuildId(buildId, deployedBuildId, latestBuild.buildId, projectName, accountId),
+            });
             buildIdToDeploy = deployBuildIdPromptResponse.buildId;
         }
         if (!buildIdToDeploy) {

package/commands/project/installDeps.js

@@ -10,14 +10,14 @@ const path = require('path');
 const { i18n } = require('../../lib/lang');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { getAccountId } = require('../../lib/commonOpts');
+const { uiBetaTag } = require('../../lib/ui');
 const i18nKey = `commands.project.subcommands.installDeps`;
 exports.command = 'install-deps [packages..]';
-// Intentionally making this null to hide command
-exports.describe = null;
-// exports.describe = uiBetaTag(i18n(`${i18nKey}.help.describe`), false);
-exports.handler = async ({ packages }) => {
+exports.describe = uiBetaTag(i18n(`${i18nKey}.help.describe`), false);
+exports.handler = async (options) => {
+    const { packages } = options || {};
     try {
-        const accountId = getAccountId();
+        const accountId = getAccountId(options);
         trackCommandUsage('project-install-deps', null, accountId);
         const projectConfig = await getProjectConfig();
         if (!projectConfig || !projectConfig.projectDir) {

package/commands/project/logs.js

@@ -14,7 +14,7 @@ const { uiBetaTag, uiLine, uiLink } = require('../../lib/ui');
 const { projectLogsPrompt } = require('../../lib/prompts/projectsLogsPrompt');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const ProjectLogsManager = require('../../lib/projectLogsManager');
+const ProjectLogsManager = require('../../lib/ProjectLogsManager');
 const i18nKey = 'commands.project.subcommands.logs';
 const getPrivateAppsUrl = accountId => {
     const baseUrl = getHubSpotWebsiteOrigin(getEnv(accountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD);
@@ -65,7 +65,7 @@ exports.handler = async (options) => {
     }
     catch (e) {
         logError(e, {
-            accountId: getAccountId(),
+            accountId,
             projectName: ProjectLogsManager.projectName,
         });
         return process.exit(EXIT_CODES.ERROR);

package/commands/sandbox/delete.js

@@ -11,7 +11,7 @@ const { deleteSandbox } = require('@hubspot/local-dev-lib/api/sandboxHubs');
 const { i18n } = require('../../lib/lang');
 const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const { getConfig, getEnv, removeSandboxAccountFromConfig, updateDefaultAccount, } = require('@hubspot/local-dev-lib/config');
-const { selectAndSetAsDefaultAccountPrompt, } = require('../../lib/prompts/accountsPrompt');
+const { selectAccountFromConfig } = require('../../lib/prompts/accountsPrompt');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
@@ -113,7 +113,8 @@ exports.handler = async (options) => {
         logger.log('');
         const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
         if (promptDefaultAccount && !force) {
-            await selectAndSetAsDefaultAccountPrompt(getConfig());
+            const newDefaultAccount = await selectAccountFromConfig(getConfig());
+            updateDefaultAccount(newDefaultAccount);
         }
         else {
             // If force is specified, skip prompt and set the parent account id as the default account
@@ -155,7 +156,8 @@ exports.handler = async (options) => {
             logger.log('');
             const promptDefaultAccount = removeSandboxAccountFromConfig(sandboxAccountId);
             if (promptDefaultAccount && !force) {
-                await selectAndSetAsDefaultAccountPrompt(getConfig());
+                const newDefaultAccount = await selectAccountFromConfig(getConfig());
+                updateDefaultAccount(newDefaultAccount);
             }
             else {
                 // If force is specified, skip prompt and set the parent account id as the default account

package/commands/theme/generate-selectors.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require('fs');
 const { i18n } = require('../../lib/lang');
 const { logger } = require('@hubspot/local-dev-lib/logger');
-const { findFieldsJsonPath, combineThemeCss, setPreviewSelectors, generateInheritedSelectors, generateSelectorsMap, getMaxFieldsDepth, } = require('../../lib/generate-selectors');
+const { findFieldsJsonPath, combineThemeCss, setPreviewSelectors, generateInheritedSelectors, generateSelectorsMap, getMaxFieldsDepth, } = require('../../lib/generateSelectors');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const HUBL_EXPRESSION_REGEX = new RegExp(/{%\s*(.*)\s*%}/, 'g');
 const HUBL_VARIABLE_NAME_REGEX = new RegExp(/{%\s*set\s*(\w*)/, 'i');

package/commands/theme/marketplace-validate.js

@@ -5,7 +5,7 @@ const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const { addConfigOptions, addAccountOptions, addUseEnvironmentOptions, getAccountId, } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { trackCommandUsage } = require('../../lib/usageTracking');
-const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplace-validate');
+const { kickOffValidation, pollForValidationFinish, fetchValidationResults, processValidationErrors, displayValidationResults, } = require('../../lib/marketplaceValidate');
 const { i18n } = require('../../lib/lang');
 const i18nKey = 'commands.theme.subcommands.marketplaceValidate';
 exports.command = 'marketplace-validate <src>';

package/lang/en.lyaml

@@ -178,6 +178,7 @@ en:
           describe: "Type of asset"
       subcommands:
         apiSample:
+          folderOverwritePrompt: "The folder with name \"{{ folderName }}\" already exists. Overwrite?"
           errors:
             nameRequired: "The \"name\" argument is required when creating an API Sample."
             noSamples: "Currently there are no samples available, please, try again later."
@@ -274,6 +275,14 @@ en:
               success:
                 update: "Your schema has been updated in account \"{{ accountId }}\""
                 viewAtUrl: "Schema can be viewed at {{ url }}"
+    doctor:
+      describe: "Retrieve diagnostic information about your local HubSpot configurations."
+      options:
+        outputDir: "Directory to save a detailed diagnosis JSON file in"
+      errors:
+        generatingDiagnosis: "Error generating diagnosis"
+        unableToWriteOutputFile: "Unable to write output to {{#bold}}{{ file }}{{/bold}}, {{ errorMessage }}"
+      outputWritten: "Output written to {{#bold}}{{ filename }}{{/bold}}"
     fetch:
       describe: "Fetch a file, directory or module from HubSpot and write to a path on your computer."
       errors:
@@ -570,6 +579,7 @@ en:
             withFlags: "Use --name and --type flags to bypass the prompt."
         deploy:
           describe: "Deploy a project build"
+          deployBuildIdPrompt: "[--build] Deploy which build?"
           debug:
             deploying: "Deploying project at path: {{ path }}"
           errors:
@@ -702,6 +712,11 @@ en:
           success: "Successfully opened \"{{ projectName }}\""
         feedback:
           describe: "Leave feedback on HubSpot projects or file a bug report"
+          feedbackType:
+            prompt: "What type of feedback would you like to leave?"
+            bug: "[--bug] Report a bug"
+            general: "[--general] Tell us about your experience with HubSpot's developer tools"
+          openPrompt: "Create a Github issue in your browser?"
           success: "We opened {{ url }} in your browser."
           options:
             bug:
@@ -999,6 +1014,7 @@ en:
         installCount: "{{#bold}}The app {{ appName }} has {{ installCount }} production {{ installText }}{{/bold}}"
         explanation: "Some changes made during local development may need to be synced to HubSpot, which will impact those existing installs. We strongly recommend creating a copy of this app to use instead."
         confirmation: "You will always be asked to confirm any permanent changes to your app’s configuration before uploading them."
+        confirmationPrompt: "Proceed with local development of this {{#bold}}production{{/bold}} app?"
       devServer:
         cleanupError: "Failed to cleanup local dev server: {{ message }}"
         setupError: "Failed to setup local dev server: {{ message }}"
@@ -1193,8 +1209,6 @@ en:
           invalidOauthClientSecretCopy: "Please copy the actual OAuth2 client secret rather than the asterisks that mask it."
           invalidPersonalAccessKey: "You did not enter a valid access key. Please try again."
           invalidPersonalAccessKeyCopy: "Please copy the actual access key rather than the bullets that mask it."
-      folderOverwritePrompt:
-        overwriteConfirm: "The folder with name \"{{ folderName }}\" already exists. Overwrite?"
       createTemplatePrompt:
         selectTemplate: "Select the type of template to create"
       createModulePrompt:
@@ -1276,15 +1290,6 @@ en:
         errors:
           invalidName: "You entered an invalid name. Please try again."
           projectDoesNotExist: "Project {{#bold}}{{ projectName }}{{/bold}} could not be found in \"{{ accountIdentifier }}\""
-      feedbackPrompt:
-        feedbackType:
-          message: "What type of feedback would you like to leave?"
-          bug: "[--bug] Report a bug"
-          general: "[--general] Tell us about your experience with HubSpot's developer tools"
-        bugPrompt: "Create an issue on Github in your browser?"
-        generalPrompt: "Create an issue on Github in your browser?"
-      deployBuildIdPrompt:
-        enterBuildId: "[--build] Deploy which build?"
       previewPrompt:
         enterSrc: "[--src] Enter a local theme directory to preview."
         enterDest: "[--dest] Enter the destination path for the src theme in HubSpot Design Tools."
@@ -1300,8 +1305,6 @@ en:
         prompt: "Open hubspot.com to install this app?"
         reinstallPrompt: "Open hubspot.com to reinstall this app?"
         decline: "To continue local development of this app, install it in your target test account and re-run {{#bold}}`hs project dev`{{/bold}}"
-      activeInstallConfirmationPrompt:
-        message: "Proceed with local development of this {{#bold}}production{{/bold}} app?"
     convertFields:
       positionals:
         src:
@@ -1423,3 +1426,62 @@ en:
         portalMissingScope: "Your account does not have access to this action. Talk to an account admin to request it."
         userMissingScope: "You don't have access to this action. Ask an account admin to change your permissions in Users & Teams settings."
         genericMissingScope: "Your access key does not allow this action. Please generate a new access key by running `hs auth personalaccesskey`."
+    doctor:
+      runningDiagnostics: "Running diagnostics..."
+      diagnosticsComplete: "Diagnostics complete"
+      accountChecks:
+        active: "Default account active"
+        inactive: "Default account isn't active"
+        inactiveSecondary: "Run {{ command }} to remove inactive accounts from your CLI config"
+        unableToDetermine: "Unable to determine if the portal is active"
+        pak:
+          invalid: "Personal access key is invalid"
+          invalidSecondary: "To get a new key, run {{ command }}, deactivate your access key, and generate a new one. Then use that new key to authenticate your account."
+          valid: "Personal Access Key is valid. {{ link }}"
+          viewScopes: "View selected scopes"
+      nodeChecks:
+        unableToDetermine: "Unable to determine what version of node is installed"
+        minimumNotMet: "Minimum Node version is not met. Upgrade to {{ nodeVersion }} or higher"
+        success: "node v{{ nodeVersion }} is installed"
+      npmChecks:
+        notInstalled: "npm is not installed"
+        installed: "npm v{{ npmVersion }} is installed"
+        unableToDetermine: "Unable to determine if npm is installed"
+      hsChecks:
+        notLatest: "Version {{ hsVersion }} outdated"
+        notLatestSecondary: "Run {{ command }} to upgrade to the latest version {{ hsVersion }}"
+        latest: "HubSpot CLI v{{ hsVersion }} up to date"
+        unableToDetermine: "Unable to determine if HubSpot CLI is up to date."
+        unableToDetermineSecondary: "Run {{ command }} to check your installed version; then visit the {{ link }} to validate whether you have the latest version"
+        unableToDetermineSecondaryLink: "npm HubSpot CLI version history"
+      projectDependenciesChecks:
+        missingDependencies: "missing dependencies in {{#bold}}{{ dir }}{{/bold}}"
+        missingDependenciesSecondary: "Run {{ command }} to install all project dependencies locally"
+        unableToDetermine: "Unable to determine if dependencies are installed {{ dir }}"
+        success: "App dependencies are installed and up to date"
+      files:
+        invalidJson: "invalid JSON in {{#bold}}{{ filename }}{{/bold}}"
+        validJson: "JSON files valid"
+      port:
+        inUse: "Port {{ port }} is in use"
+        inUseSecondary: "Make sure it is available if before running {{ command }}"
+        available: "Port {{ port }} available for local development"
+      diagnosis:
+        cli:
+          header: "HubSpot CLI install"
+        cliConfig:
+          header: "CLI configuration"
+          configFileSubHeader: "Config File: {{#bold}}{{ filename }}{{/bold}}"
+          defaultAccountSubHeader: "Default Account: {{accountDetails}}"
+          noConfigFile: "CLI configuration not found"
+          noConfigFileSecondary: "Run {{command}} and follow the prompts to create your CLI configuration file and connect it to your HubSpot account"
+        projectConfig:
+          header: "Project configuration"
+          projectDirSubHeader: "Project dir: {{#bold}}{{ projectDir }}{{/bold}}"
+          projectNameSubHeader: "Project name: {{#bold}}{{ projectName }}{{/bold}}"
+        counts:
+          errors: '{{#bold}}Errors:{{/bold}} {{ count }}'
+          warnings: "{{#bold}}Warning:{{/bold}} {{ count }}"
+
+
+

package/lib/DevServerManager.js

@@ -6,7 +6,7 @@ const { COMPONENT_TYPES } = require('./projectStructure');
 const { i18n } = require('./lang');
 const { promptUser } = require('./prompts/promptUtils');
 const { DevModeInterface } = require('@hubspot/ui-extensions-dev-server');
-const { startPortManagerServer, portManagerHasActiveServers, stopPortManagerServer, requestPorts, } = require('@hubspot/local-dev-lib/portManager');
+const { startPortManagerServer, stopPortManagerServer, requestPorts, } = require('@hubspot/local-dev-lib/portManager');
 const { getHubSpotApiOrigin, getHubSpotWebsiteOrigin, } = require('@hubspot/local-dev-lib/urls');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const i18nKey = 'lib.DevServerManager';
@@ -109,10 +109,7 @@ class DevServerManager {
                     await serverInterface.cleanup();
                 }
             });
-            const hasActiveServers = await portManagerHasActiveServers();
-            if (!hasActiveServers) {
-                await stopPortManagerServer();
-            }
+            await stopPortManagerServer();
         }
     }
 }