@hubspot/cli 7.5.11-experimental.0 → 7.6.0-beta.1

package/lib/configMigrate.js

@@ -4,54 +4,44 @@ exports.handleMigration = handleMigration;
 exports.handleMerge = handleMerge;
 const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
 const config_1 = require("@hubspot/local-dev-lib/constants/config");
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const promptUtils_1 = require("./prompts/promptUtils");
-const lang_1 = require("./lang");
-const usageTracking_1 = require("./usageTracking");
-async function handleMigration(accountId, configPath) {
+const en_1 = require("../lang/en");
+const logger_1 = require("./ui/logger");
+async function handleMigration(deprecatedConfigPath, hideWarning) {
+    if (!hideWarning) {
+        logger_1.uiLogger.warn(en_1.lib.configMigrate.deprecatedConfigWarning(deprecatedConfigPath || (0, migrate_1.getConfigPath)(undefined, false)));
+        logger_1.uiLogger.log('');
+    }
+    logger_1.uiLogger.log(en_1.lib.configMigrate.handleMigration.description(config_1.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME));
+    logger_1.uiLogger.log('');
     const { shouldMigrateConfig } = await (0, promptUtils_1.promptUser)({
         name: 'shouldMigrateConfig',
         type: 'confirm',
-        message: (0, lang_1.i18n)('lib.configMigrate.migrateConfigPrompt', {
-            deprecatedConfigPath: (0, migrate_1.getConfigPath)(configPath, false) ||
-                config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-            globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
-        }),
+        message: en_1.lib.configMigrate.handleMigration.confirmPrompt,
     });
     if (!shouldMigrateConfig) {
-        (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
-            command: 'hs config migrate',
-            type: 'migration',
-            step: 'Reject migration via prompt',
-        }, accountId);
         return false;
     }
-    const deprecatedConfig = (0, migrate_1.getDeprecatedConfig)(configPath);
+    const deprecatedConfig = (0, migrate_1.getDeprecatedConfig)(deprecatedConfigPath);
     (0, migrate_1.migrateConfig)(deprecatedConfig);
-    (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
-        command: 'hs config migrate',
-        type: 'migration',
-        step: 'Confirm migration via prompt',
-        successful: true,
-    }, accountId);
-    logger_1.logger.success((0, lang_1.i18n)('lib.configMigrate.migrationSuccess', {
-        globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
-    }));
+    logger_1.uiLogger.success(en_1.lib.configMigrate.handleMigration.success);
     return true;
 }
-async function mergeConfigProperties(globalConfig, deprecatedConfig, force) {
+async function handleMergeConfigProperties(globalConfig, deprecatedConfig, force) {
     const { initialConfig, conflicts, } = (0, migrate_1.mergeConfigProperties)(globalConfig, deprecatedConfig, force);
     if (conflicts.length > 0) {
+        const properties = conflicts.map(c => c.property);
+        const propertyList = properties.length <= 2
+            ? properties.join(' and ')
+            : `${properties.slice(0, -1).join(', ')}, and ${properties.at(-1)}`;
+        logger_1.uiLogger.log('');
+        logger_1.uiLogger.warn(en_1.lib.configMigrate.handleMergeConfigProperties.mergeConflictMessage(conflicts.length, propertyList));
         for (const conflict of conflicts) {
             const { property, newValue, oldValue } = conflict;
             const { shouldOverwrite } = await (0, promptUtils_1.promptUser)({
                 name: 'shouldOverwrite',
                 type: 'confirm',
-                message: (0, lang_1.i18n)('lib.configMigrate.mergeConfigConflictPrompt', {
-                    property,
-                    oldValue: `${oldValue}`,
-                    newValue: `${newValue}`,
-                }),
+                message: en_1.lib.configMigrate.handleMergeConfigProperties.mergeConfigConflictPrompt(property, newValue.toString(), oldValue.toString()),
             });
             if (shouldOverwrite) {
                 // @ts-expect-error Cannot reconcile CLIConfig_NEW and CLIConfig_DEPRECATED
@@ -61,44 +51,33 @@ async function mergeConfigProperties(globalConfig, deprecatedConfig, force) {
     }
     return initialConfig;
 }
-async function handleMerge(accountId, configPath, force) {
+async function handleMerge(deprecatedConfigPath, force, hideWarning) {
+    if (!hideWarning) {
+        logger_1.uiLogger.warn(en_1.lib.configMigrate.deprecatedConfigWarning(deprecatedConfigPath || (0, migrate_1.getConfigPath)(undefined, false)));
+        logger_1.uiLogger.log('');
+    }
+    logger_1.uiLogger.log(en_1.lib.configMigrate.handleMerge.description(config_1.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME));
+    logger_1.uiLogger.log('');
     const { shouldMergeConfigs } = await (0, promptUtils_1.promptUser)({
         name: 'shouldMergeConfigs',
         type: 'confirm',
-        message: (0, lang_1.i18n)('lib.configMigrate.mergeConfigsPrompt', {
-            deprecatedConfigPath: (0, migrate_1.getConfigPath)(configPath, false) ||
-                config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-            globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
-        }),
+        message: en_1.lib.configMigrate.handleMerge.confirmPrompt,
     });
     if (!shouldMergeConfigs) {
-        (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
-            command: 'hs config migrate',
-            type: 'merge',
-            step: 'Reject merge via prompt',
-        }, accountId);
         return false;
     }
-    const deprecatedConfig = (0, migrate_1.getDeprecatedConfig)(configPath);
+    const deprecatedConfig = (0, migrate_1.getDeprecatedConfig)(deprecatedConfigPath);
     const globalConfig = (0, migrate_1.getGlobalConfig)();
     if (!deprecatedConfig || !globalConfig) {
         return true;
     }
-    const mergedConfig = await mergeConfigProperties(globalConfig, deprecatedConfig, force);
+    const mergedConfig = await handleMergeConfigProperties(globalConfig, deprecatedConfig, force);
     const { skippedAccountIds } = (0, migrate_1.mergeExistingConfigs)(mergedConfig, deprecatedConfig);
     if (skippedAccountIds.length > 0) {
-        logger_1.logger.log((0, lang_1.i18n)('lib.configMigrate.skippedExistingAccounts', {
-            skippedAccountIds: skippedAccountIds.join(', '),
-        }));
+        logger_1.uiLogger.log('');
+        logger_1.uiLogger.log(en_1.lib.configMigrate.handleMerge.skippedExistingAccounts(skippedAccountIds));
+        logger_1.uiLogger.log('');
     }
-    logger_1.logger.success((0, lang_1.i18n)('lib.configMigrate.mergeSuccess', {
-        globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
-    }));
-    (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
-        command: 'hs config migrate',
-        type: 'merge',
-        step: 'Confirm merge via prompt',
-        successful: true,
-    }, accountId);
+    logger_1.uiLogger.success(en_1.lib.configMigrate.handleMerge.success);
     return true;
 }

package/lib/configOptions.d.ts

@@ -3,6 +3,10 @@ export declare function setAllowUsageTracking({ accountId, allowUsageTracking, }
     accountId: number;
     allowUsageTracking?: boolean;
 }): Promise<void>;
+export declare function setAllowAutoUpdates({ accountId, allowAutoUpdates, }: {
+    accountId: number;
+    allowAutoUpdates?: boolean;
+}): Promise<void>;
 export declare function setDefaultCmsPublishMode({ accountId, defaultCmsPublishMode, }: {
     accountId: number;
     defaultCmsPublishMode?: CmsPublishMode;

package/lib/configOptions.js

@@ -1,35 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.setAllowUsageTracking = setAllowUsageTracking;
+exports.setAllowAutoUpdates = setAllowAutoUpdates;
 exports.setDefaultCmsPublishMode = setDefaultCmsPublishMode;
 exports.setHttpTimeout = setHttpTimeout;
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const files_1 = require("@hubspot/local-dev-lib/constants/files");
 const text_1 = require("@hubspot/local-dev-lib/text");
 const usageTracking_1 = require("./usageTracking");
 const promptUtils_1 = require("./prompts/promptUtils");
-const lang_1 = require("../lib/lang");
-async function enableOrDisableUsageTracking() {
-    const { isEnabled } = await (0, promptUtils_1.promptUser)([
-        {
-            type: 'list',
-            name: 'isEnabled',
-            pageSize: 20,
-            message: (0, lang_1.i18n)(`commands.config.subcommands.set.options.allowUsageTracking.promptMessage`),
-            choices: [
-                {
-                    name: (0, lang_1.i18n)(`commands.config.subcommands.set.options.allowUsageTracking.labels.enabled`),
-                    value: true,
-                },
-                {
-                    name: (0, lang_1.i18n)(`commands.config.subcommands.set.options.allowUsageTracking.labels.disabled`),
-                    value: false,
-                },
-            ],
-            default: true,
-        },
-    ]);
+const en_1 = require("../lang/en");
+const logger_1 = require("./ui/logger");
+async function enableOrDisableBooleanFieldPrompt(fieldName) {
+    const isEnabled = await (0, promptUtils_1.listPrompt)(en_1.lib.configOptions.enableOrDisableBooleanFieldPrompt.message(fieldName), {
+        choices: [
+            {
+                name: en_1.lib.configOptions.enableOrDisableBooleanFieldPrompt.labels
+                    .enabled,
+                value: true,
+            },
+            {
+                name: en_1.lib.configOptions.enableOrDisableBooleanFieldPrompt.labels
+                    .disabled,
+                value: false,
+            },
+        ],
+        defaultAnswer: true,
+    });
     return isEnabled;
 }
 async function setAllowUsageTracking({ accountId, allowUsageTracking, }) {
@@ -39,25 +36,29 @@ async function setAllowUsageTracking({ accountId, allowUsageTracking, }) {
         isEnabled = allowUsageTracking;
     }
     else {
-        isEnabled = await enableOrDisableUsageTracking();
+        isEnabled = await enableOrDisableBooleanFieldPrompt(en_1.lib.configOptions.setAllowUsageTracking.fieldName);
     }
     (0, config_1.updateAllowUsageTracking)(isEnabled);
-    logger_1.logger.success((0, lang_1.i18n)(`commands.config.subcommands.set.options.allowUsageTracking.success`, {
-        isEnabled: isEnabled.toString(),
-    }));
+    logger_1.uiLogger.success(en_1.lib.configOptions.setAllowUsageTracking.success(isEnabled.toString()));
+}
+async function setAllowAutoUpdates({ accountId, allowAutoUpdates, }) {
+    (0, usageTracking_1.trackCommandUsage)('config-set-allow-auto-updates', undefined, accountId);
+    let isEnabled;
+    if (typeof allowAutoUpdates === 'boolean') {
+        isEnabled = allowAutoUpdates;
+    }
+    else {
+        isEnabled = await enableOrDisableBooleanFieldPrompt(en_1.lib.configOptions.setAllowAutoUpdates.fieldName);
+    }
+    (0, config_1.updateAllowAutoUpdates)(isEnabled);
+    logger_1.uiLogger.success(en_1.lib.configOptions.setAllowAutoUpdates.success(isEnabled.toString()));
 }
 const ALL_CMS_PUBLISH_MODES = Object.values(files_1.CMS_PUBLISH_MODE);
 async function selectCmsPublishMode() {
-    const { cmsPublishMode } = await (0, promptUtils_1.promptUser)([
-        {
-            type: 'list',
-            name: 'cmsPublishMode',
-            pageSize: 20,
-            message: (0, lang_1.i18n)(`commands.config.subcommands.set.options.defaultMode.promptMessage`),
-            choices: ALL_CMS_PUBLISH_MODES,
-            default: files_1.CMS_PUBLISH_MODE.publish,
-        },
-    ]);
+    const cmsPublishMode = await (0, promptUtils_1.listPrompt)(en_1.lib.configOptions.setDefaultCmsPublishMode.promptMessage, {
+        choices: ALL_CMS_PUBLISH_MODES,
+        defaultAnswer: files_1.CMS_PUBLISH_MODE.publish,
+    });
     return cmsPublishMode;
 }
 async function setDefaultCmsPublishMode({ accountId, defaultCmsPublishMode, }) {
@@ -71,21 +72,17 @@ async function setDefaultCmsPublishMode({ accountId, defaultCmsPublishMode, }) {
         newDefault = defaultCmsPublishMode;
     }
     else {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.config.subcommands.set.options.defaultMode.error`, {
-            validModes: (0, text_1.commaSeparatedValues)(ALL_CMS_PUBLISH_MODES),
-        }));
+        logger_1.uiLogger.error(en_1.lib.configOptions.setDefaultCmsPublishMode.error((0, text_1.commaSeparatedValues)(ALL_CMS_PUBLISH_MODES)));
         newDefault = await selectCmsPublishMode();
     }
     (0, config_1.updateDefaultCmsPublishMode)(newDefault);
-    logger_1.logger.success((0, lang_1.i18n)(`commands.config.subcommands.set.options.defaultMode.success`, {
-        mode: newDefault,
-    }));
+    logger_1.uiLogger.success(en_1.lib.configOptions.setDefaultCmsPublishMode.success(newDefault));
 }
 async function enterTimeout() {
     const { timeout } = await (0, promptUtils_1.promptUser)([
         {
             name: 'timeout',
-            message: (0, lang_1.i18n)(`commands.config.subcommands.set.options.httpTimeout.promptMessage`),
+            message: en_1.lib.configOptions.setHttpTimeout.promptMessage,
             type: 'input',
             default: 30000,
         },
@@ -102,7 +99,5 @@ async function setHttpTimeout({ accountId, httpTimeout, }) {
         newHttpTimeout = httpTimeout;
     }
     (0, config_1.updateHttpTimeout)(newHttpTimeout);
-    logger_1.logger.success((0, lang_1.i18n)(`commands.config.subcommands.set.options.httpTimeout.success`, {
-        timeout: newHttpTimeout,
-    }));
+    logger_1.uiLogger.success(en_1.lib.configOptions.setHttpTimeout.success(newHttpTimeout));
 }

package/lib/constants.d.ts

@@ -49,6 +49,7 @@ export declare const PROJECT_ERROR_TYPES: {
     readonly BUILD_NOT_IN_PROGRESS: "BuildPipelineErrorType.BUILD_NOT_IN_PROGRESS";
     readonly SUBBUILD_FAILED: "BuildPipelineErrorType.DEPENDENT_SUBBUILD_FAILED";
     readonly SUBDEPLOY_FAILED: "DeployPipelineErrorType.DEPENDENT_SUBDEPLOY_FAILED";
+    readonly DEPLOY_CONTAINS_REMOVALS: "DeployPipelineErrorType.WARNING_DEPLOY_CONTAINS_REMOVALS";
 };
 export declare const PROJECT_TASK_TYPES: {
     [key: string]: string;
@@ -78,3 +79,31 @@ export declare const FEATURES: {
     readonly UNIFIED_THEME_PREVIEW: "cms:react:unifiedThemePreview";
     readonly UNIFIED_APPS: "Developers:UnifiedApps:PrivateBeta";
 };
+export declare const LOCAL_DEV_UI_MESSAGE_SEND_TYPES: {
+    UPLOAD_SUCCESS: string;
+    UPLOAD_FAILURE: string;
+    UPDATE_PROJECT_NODES: string;
+    UPDATE_APP_DATA: string;
+    UPDATE_PROJECT_DATA: string;
+};
+export declare const LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES: {
+    UPLOAD: string;
+};
+export declare const APP_INSTALLATION_STATES: {
+    readonly NOT_INSTALLED: "NOT_INSTALLED";
+    readonly INSTALLED: "INSTALLED";
+    readonly INSTALLED_WITH_OUTDATED_SCOPES: "INSTALLED_WITH_OUTDATED_SCOPES";
+};
+export declare const staticAuth = "static";
+export declare const oAuth = "oauth";
+export declare const privateDistribution = "private";
+export declare const marketplaceDistribution = "marketplace";
+export declare const appComponent = "app";
+export declare const GET_STARTED_OPTIONS: {
+    readonly APP: "APP";
+    readonly CMS: "CMS";
+};
+export declare const LOCAL_DEV_SERVER_MESSAGE_TYPES: {
+    readonly INITIAL: "INITIAL";
+    readonly WEBSOCKET_SERVER_CONNECTED: "WEBSOCKET_SERVER_CONNECTED";
+};

package/lib/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FEATURES = exports.APP_AUTH_TYPES = exports.APP_DISTRIBUTION_TYPES = exports.IR_COMPONENT_TYPES = exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.DEFAULT_POLLING_DELAY = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
+exports.LOCAL_DEV_SERVER_MESSAGE_TYPES = exports.GET_STARTED_OPTIONS = exports.appComponent = exports.marketplaceDistribution = exports.privateDistribution = exports.oAuth = exports.staticAuth = exports.APP_INSTALLATION_STATES = exports.LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES = exports.LOCAL_DEV_UI_MESSAGE_SEND_TYPES = exports.FEATURES = exports.APP_AUTH_TYPES = exports.APP_DISTRIBUTION_TYPES = exports.IR_COMPONENT_TYPES = exports.PLATFORM_VERSION_ERROR_TYPES = exports.PROJECT_COMPONENT_TYPES = exports.PROJECT_TASK_TYPES = exports.PROJECT_ERROR_TYPES = exports.PROJECT_DEPLOY_TEXT = exports.PROJECT_BUILD_TEXT = exports.PROJECT_DEPLOY_STATES = exports.PROJECT_BUILD_STATES = exports.PROJECT_CONFIG_FILE = exports.DEFAULT_POLLING_DELAY = exports.MARKETPLACE_FOLDER = exports.HUBSPOT_FOLDER = exports.FEEDBACK_INTERVAL = exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = void 0;
 exports.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH = 'HubSpot/hubspot-project-components';
 exports.DEFAULT_PROJECT_TEMPLATE_BRANCH = 'main';
 exports.FEEDBACK_INTERVAL = 10;
@@ -41,6 +41,7 @@ exports.PROJECT_ERROR_TYPES = {
     BUILD_NOT_IN_PROGRESS: 'BuildPipelineErrorType.BUILD_NOT_IN_PROGRESS',
     SUBBUILD_FAILED: 'BuildPipelineErrorType.DEPENDENT_SUBBUILD_FAILED',
     SUBDEPLOY_FAILED: 'DeployPipelineErrorType.DEPENDENT_SUBDEPLOY_FAILED',
+    DEPLOY_CONTAINS_REMOVALS: 'DeployPipelineErrorType.WARNING_DEPLOY_CONTAINS_REMOVALS',
 };
 exports.PROJECT_TASK_TYPES = {
     PRIVATE_APP: 'private app',
@@ -73,3 +74,31 @@ exports.FEATURES = {
     UNIFIED_THEME_PREVIEW: 'cms:react:unifiedThemePreview',
     UNIFIED_APPS: 'Developers:UnifiedApps:PrivateBeta',
 };
+exports.LOCAL_DEV_UI_MESSAGE_SEND_TYPES = {
+    UPLOAD_SUCCESS: 'server:uploadSuccess',
+    UPLOAD_FAILURE: 'server:uploadFailure',
+    UPDATE_PROJECT_NODES: 'server:updateProjectNodes',
+    UPDATE_APP_DATA: 'server:updateAppData',
+    UPDATE_PROJECT_DATA: 'server:updateProjectData',
+};
+exports.LOCAL_DEV_UI_MESSAGE_RECEIVE_TYPES = {
+    UPLOAD: 'client:upload',
+};
+exports.APP_INSTALLATION_STATES = {
+    NOT_INSTALLED: 'NOT_INSTALLED',
+    INSTALLED: 'INSTALLED',
+    INSTALLED_WITH_OUTDATED_SCOPES: 'INSTALLED_WITH_OUTDATED_SCOPES',
+};
+exports.staticAuth = 'static';
+exports.oAuth = 'oauth';
+exports.privateDistribution = 'private';
+exports.marketplaceDistribution = 'marketplace';
+exports.appComponent = 'app';
+exports.GET_STARTED_OPTIONS = {
+    APP: 'APP',
+    CMS: 'CMS',
+};
+exports.LOCAL_DEV_SERVER_MESSAGE_TYPES = {
+    INITIAL: 'INITIAL',
+    WEBSOCKET_SERVER_CONNECTED: 'WEBSOCKET_SERVER_CONNECTED',
+};

package/lib/dependencyManagement.d.ts

@@ -1,8 +1,3 @@
-export declare function isGloballyInstalled(command: string): Promise<boolean>;
-export declare function getLatestCliVersion(): Promise<{
-    latest: string;
-    next: string;
-}>;
 export declare function installPackages({ packages, installLocations, }: {
     packages?: string[];
     installLocations?: string[];

package/lib/dependencyManagement.js

@@ -3,23 +3,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isGloballyInstalled = isGloballyInstalled;
-exports.getLatestCliVersion = getLatestCliVersion;
 exports.installPackages = installPackages;
 exports.getProjectPackageJsonLocations = getProjectPackageJsonLocations;
 exports.hasMissingPackages = hasMissingPackages;
-const logger_1 = require("@hubspot/local-dev-lib/logger");
-const config_1 = require("./projects/config");
-const child_process_1 = require("child_process");
-const fs_1 = require("@hubspot/local-dev-lib/fs");
+const fs_1 = __importDefault(require("fs"));
+const util_1 = __importDefault(require("util"));
 const path_1 = __importDefault(require("path"));
+const child_process_1 = require("child_process");
+const fs_2 = require("@hubspot/local-dev-lib/fs");
+const config_1 = require("./projects/config");
 const ui_1 = require("./ui");
-const util_1 = __importDefault(require("util"));
 const lang_1 = require("./lang");
 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 npm_1 = require("./npm");
 class NoPackageJsonFilesError extends Error {
     constructor(projectName) {
         super((0, lang_1.i18n)(`commands.project.subcommands.installDeps.noPackageJsonInProject`, {
@@ -28,22 +24,6 @@ class NoPackageJsonFilesError extends Error {
         }));
     }
 }
-async function isGloballyInstalled(command) {
-    const exec = util_1.default.promisify(child_process_1.exec);
-    try {
-        await exec(`${command} --version`);
-        return true;
-    }
-    catch (e) {
-        return false;
-    }
-}
-async function getLatestCliVersion() {
-    const exec = util_1.default.promisify(child_process_1.exec);
-    const { stdout } = await exec(`npm info ${package_json_1.default.name} dist-tags --json`);
-    const { latest, next } = JSON.parse(stdout);
-    return { latest, next };
-}
 async function installPackages({ packages, installLocations, }) {
     const installDirs = installLocations || (await getProjectPackageJsonLocations());
     await Promise.all(installDirs.map(async (dir) => {
@@ -64,14 +44,8 @@ async function installPackagesInDirectory(directory, packages) {
                 directory: relativeDir,
             }),
     });
-    let installCommand = `${DEFAULT_PACKAGE_MANAGER} install`;
-    if (packages) {
-        installCommand = `${installCommand} ${packages.join(' ')}`;
-    }
-    logger_1.logger.debug(`Running ${installCommand}`);
     try {
-        const exec = util_1.default.promisify(child_process_1.exec);
-        await exec(installCommand, { cwd: directory });
+        await (0, npm_1.executeInstall)(packages, null, { cwd: directory });
         SpinniesManager_1.default.succeed(spinner, {
             text: (0, lang_1.i18n)(`commands.project.subcommands.installDeps.installationSuccessful`, {
                 directory: relativeDir,
@@ -99,17 +73,17 @@ async function getProjectPackageJsonLocations() {
         throw new Error((0, lang_1.i18n)(`commands.project.subcommands.installDeps.noProjectConfig`));
     }
     const { projectDir, projectConfig: { srcDir, name }, } = projectConfig;
-    if (!(await isGloballyInstalled(DEFAULT_PACKAGE_MANAGER))) {
+    if (!(await (0, npm_1.isGloballyInstalled)(npm_1.DEFAULT_PACKAGE_MANAGER))) {
         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'),
+            packageManager: npm_1.DEFAULT_PACKAGE_MANAGER,
+            link: (0, ui_1.uiLink)(npm_1.DEFAULT_PACKAGE_MANAGER, 'https://docs.npmjs.com/downloading-and-installing-node-js-and-npm'),
         }));
     }
-    if (!fs_2.default.existsSync(projectConfig.projectDir) ||
-        !fs_2.default.existsSync(path_1.default.join(projectDir, srcDir))) {
+    if (!fs_1.default.existsSync(projectConfig.projectDir) ||
+        !fs_1.default.existsSync(path_1.default.join(projectDir, srcDir))) {
         throw new NoPackageJsonFilesError(name);
     }
-    const packageJsonFiles = (await (0, fs_1.walk)(path_1.default.join(projectDir, srcDir))).filter(file => file.includes('package.json') &&
+    const packageJsonFiles = (await (0, fs_2.walk)(path_1.default.join(projectDir, srcDir))).filter(file => file.includes('package.json') &&
         !file.includes('node_modules') &&
         !file.includes('.vite'));
     if (packageJsonFiles.length === 0) {

package/lib/doctor/Doctor.js

@@ -8,6 +8,7 @@ const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const dependencyManagement_1 = require("../dependencyManagement");
+const npm_1 = require("../npm");
 const util_1 = __importDefault(require("util"));
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
@@ -230,7 +231,7 @@ class Doctor {
         let latestCLIVersion;
         let nextCliVersion;
         try {
-            const { latest, next } = await (0, dependencyManagement_1.getLatestCliVersion)();
+            const { latest, next } = await (0, npm_1.getLatestCliVersion)();
             latestCLIVersion = latest;
             nextCliVersion = next;
         }
@@ -261,7 +262,7 @@ class Doctor {
             this.diagnosis?.addCliSection({
                 type: 'success',
                 message: i18n(`lib.doctor.hsChecks.latest`, {
-                    hsVersion: latestCLIVersion,
+                    hsVersion: package_json_1.default.version,
                 }),
             });
         }

package/lib/errorHandlers/index.js

@@ -15,6 +15,10 @@ const util_1 = __importDefault(require("util"));
 const ui_1 = require("../ui");
 function logError(error, context) {
     debugError(error, context);
+    if (isProjectValidationError(error)) {
+        logger_1.logger.error(error.message);
+        return;
+    }
     if ((0, suppressError_1.shouldSuppressError)(error, context)) {
         return;
     }
@@ -89,6 +93,9 @@ class ApiErrorContext {
     }
 }
 exports.ApiErrorContext = ApiErrorContext;
+function isProjectValidationError(error) {
+    return error instanceof Error && error.name === 'ProjectValidationError';
+}
 function isErrorWithMessageOrReason(error) {
     return (typeof error === 'object' &&
         error !== null &&

package/lib/filesystem.d.ts

@@ -1,2 +1,2 @@
-export declare function resolveLocalPath(filepath: string): string;
+export declare function resolveLocalPath(filepath?: string): string;
 export declare function isPathFolder(path: string): boolean;

package/lib/generateSelectors.js

@@ -10,9 +10,9 @@ exports.setPreviewSelectors = setPreviewSelectors;
 exports.generateInheritedSelectors = generateInheritedSelectors;
 exports.generateSelectorsMap = generateSelectorsMap;
 const fs_1 = __importDefault(require("fs"));
-const logger_1 = require("@hubspot/local-dev-lib/logger");
 const exitCodes_1 = require("./enums/exitCodes");
-const lang_1 = require("./lang");
+const en_1 = require("../lang/en");
+const logger_1 = require("./ui/logger");
 const CSS_COMMENTS_REGEX = new RegExp(/\/\*.*\*\//, 'g');
 const CSS_PSEUDO_CLASS_REGEX = new RegExp(/:active|:checked|:disabled|:empty|:enabled|:first-of-type|:focus|:hover|:in-range|:invalid|:link|:optional|:out-of-range|:read-only|:read-write|:required|:target|:valid|:visited/, 'g');
 let maxFieldsDepth = 0;
@@ -22,9 +22,7 @@ function getMaxFieldsDepth() {
 function findFieldsJsonPath(basePath) {
     const _path = basePath.endsWith('/') ? basePath.slice(0, -1) : basePath;
     if (!fs_1.default.existsSync(_path)) {
-        logger_1.logger.error((0, lang_1.i18n)(`commands.theme.subcommands.generateSelectors.errors.invalidPath`, {
-            themePath: basePath,
-        }));
+        logger_1.uiLogger.error(en_1.commands.theme.subcommands.generateSelectors.errors.invalidPath(basePath));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     const files = fs_1.default.readdirSync(_path);

package/lib/interpolation.d.ts

@@ -1,8 +1,7 @@
 export declare const helpers: {
     [key: string]: (stringValue: string) => string;
 };
-type InterpolationData = {
-    [identifier: string]: string | number;
+export type InterpolationData = {
+    [identifier: string]: string | undefined | null | number | boolean;
 };
 export declare function interpolate(stringValue: string, interpolationData: InterpolationData): string;
-export {};

package/lib/lang.d.ts

@@ -1,9 +1,8 @@
+import { InterpolationData } from './interpolation';
 export declare const MISSING_LANGUAGE_DATA_PREFIX = "[Missing language data]";
 type LanguageObject = {
     [key: string]: string | LanguageObject;
 };
-export declare function i18n(lookupDotNotation: string, options?: {
-    [identifier: string]: string | number;
-}): string;
+export declare function i18n(lookupDotNotation: string, options?: InterpolationData): string;
 export declare function setLangData(newLocale: string, newLangObj: LanguageObject): void;
 export {};

package/lib/marketplaceValidate.d.ts

@@ -2,5 +2,15 @@ import { GetValidationResultsResponse } from '@hubspot/local-dev-lib/types/Marke
 export declare function kickOffValidation(accountId: number, assetType: string, src: string): Promise<number>;
 export declare function pollForValidationFinish(accountId: number, validationId: number): Promise<void>;
 export declare function fetchValidationResults(accountId: number, validationId: number): Promise<GetValidationResultsResponse>;
-export declare function processValidationErrors(i18nKey: string, validationResults: GetValidationResultsResponse): void;
-export declare function displayValidationResults(i18nKey: string, validationResults: GetValidationResultsResponse): void;
+export declare function processValidationErrors(invalidPathError: (path: string) => string, validationResults: GetValidationResultsResponse): void;
+type ResultsCopy = {
+    noErrors: string;
+    required: string;
+    recommended: string;
+    warnings: {
+        file: (file: string) => string;
+        lineNumber: (line: string) => string;
+    };
+};
+export declare function displayValidationResults(resultsCopy: ResultsCopy, validationResults: GetValidationResultsResponse): void;
+export {};