@hubspot/cli 7.7.0-experimental.3 → 7.7.2-experimental.0

package/lang/en.lyaml

@@ -20,19 +20,6 @@ en:
     account:
       describe: "Commands for managing configured accounts."
       subcommands:
-        auth:
-          describe: "Configure authentication for your HubSpot account."
-          verboseDescribe: "Configure authentication for a HubSpot account. This will create or update the global config file at {{ globalConfigPath }} 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.\nIf a deprecated config file exists, you will be prompted to migrate it to the new global config file. If both deprecated and global config files exist, you will be prompted to merge them. If any conflicts exist between the two files, you will be prompted to reconcile them."
-          options:
-            account:
-              describe: "HubSpot account to authenticate"
-          errors:
-            failedToUpdateConfig: "Failed to update the configuration file. Please try again."
-            migrationNotConfirmed: "Did not migrate. Use the {{ authCommand }} command to update the deprecated config at {{ deprecatedConfigPath }}."
-            mergeNotConfirmed: "Did not merge. When you are ready to merge the deprecated config file with the global config file, run the {{ authCommand }} or {{ migrateCommand }} command."
-          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 }}"
@@ -156,7 +143,7 @@ en:
       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:
         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 }}."
+        globalConfigFileExists: "You are using our new global configuration for account management, which is not compatible with this command. Please use {{ accountAuthCommand }} instead."
       options:
         authType:
           describe: "Authentication method"
@@ -167,17 +154,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 }}."
-          verboseDescribe: "This command will create a new global configuration file in your root directory and rename the deprecated config to {{ archivedConfigPath }}. If any conflicting values are detected, we will prompt you to reconcile them unless the \"--force\" flag is supplied."
-          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"
@@ -532,7 +508,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."
+        globalConfigFileExists: "You are using our new global configuration for account management, which is not compatible with this command. Please use {{ accountAuthCommand }} instead."
     lint:
       issuesFound: "{{ count }} issues found."
       groupName: "Linting {{ path }}"
@@ -874,14 +850,6 @@ en:
           noProjectConfig: "No project detected. Run this command from a project directory."
           noPackageJsonInProject: "No dependencies to install. The project {{ projectName }} folder might be missing component or subcomponent files. {{ link }}"
           packageManagerNotInstalled: "This command depends on {{ packageManager }}, install {{#bold}}{{ link }}{{/bold}}"
-    remove:
-      describe: "Delete a file or folder from HubSpot."
-      deleted: "Deleted \"{{ path }}\" from account {{ accountId }}"
-      errors:
-        deleteFailed: "Deleting \"{{ path }}\" from account {{ accountId }} failed"
-      positionals:
-        path:
-          describe: "Remote hubspot path"
     sandbox:
       describe: "Commands for managing sandboxes."
       subcommands:
@@ -979,144 +947,6 @@ en:
           success:
             update: "The secret \"{{ secretName }}\" was updated in the HubSpot account: {{ accountIdentifier }}"
             updateExplanation: "Existing serverless functions will start using this new value within 10 seconds."
-    theme:
-      describe: "Commands for managing themes."
-      subcommands:
-        generateSelectors:
-          describe: "Automatically generates an editor-preview.json file for the given theme. The selectors this command generates are not perfect, so please edit editor-preview.json after running."
-          errors:
-            invalidPath: "Could not find directory \"{{ themePath }}\""
-            fieldsNotFound: "Unable to find theme's fields.json."
-            noSelectorsFound: "No selectors found."
-          success: "Selectors generated for {{ themePath }}, please double check the selectors generated at {{ selectorsPath }} before uploading the theme."
-          positionals:
-            path:
-              describe: "The path of the theme you'd like to generate an editor-preview.json for."
-        marketplaceValidate:
-          describe: "Validate a theme for the marketplace."
-          errors:
-            invalidPath: "The path \"{{ path }}\" is not a path to a folder in the Design Manager"
-          logs:
-            validatingTheme: "Validating theme \"{{ path }}\" \n"
-          results:
-            required: "Required validation results:"
-            recommended: "Recommended validation results:"
-            warnings:
-              file: "File: {{ file }}"
-              lineNumber: "Line number: {{ line }}"
-            noErrors: "No errors"
-          positionals:
-            path:
-              describe: "Path to the theme within the Design Manager."
-        preview:
-          describe: "Upload and watch a theme directory on your computer for changes and start a local development server to preview theme changes on a site."
-          errors:
-            invalidPath: "The path \"{{ path }}\" is not a path to a directory"
-            noThemeComponents: "Your project has no theme components available to preview."
-          positionals:
-            src:
-              describe: "Path to the local directory your theme is in, relative to your current working directory"
-            dest:
-              describe: "Path in HubSpot Design Tools. Can be a net new path. If you wish to preview a site page using your theme changes it must match the path of the theme used by the site."
-          options:
-            notify:
-              describe: "Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file"
-            noSsl:
-              describe: "Disable HTTPS"
-            port:
-              describe: "The port on which to start the local server"
-          initialUploadProgressBar:
-            start: "Starting..."
-            uploading: "Uploading..."
-            finish: "Complete!"
-          logs:
-            processExited: "Stopping dev server..."
-    module:
-      describe: "Commands for working with modules, including marketplace validation with the marketplace-validate subcommand."
-      subcommands:
-        marketplaceValidate:
-          describe: "Validate a module for the marketplace. Make sure to include the suffix .module in the path to the module within the Design Manager."
-          errors:
-            invalidPath: "The path \"{{ path }}\" is not a path to a module within the Design Manager."
-          logs:
-            validatingModule: "Validating module \"{{ path }}\" \n"
-          options:
-            json:
-              describe: "Output raw json data"
-          results:
-            required: "Required validation results:"
-            recommended: "Recommended validation results:"
-            warnings:
-              file: "File: {{ file }}"
-              lineNumber: "Line number: {{ line }}"
-            noErrors: "No errors"
-          positionals:
-            src:
-              describe: "Path to the module within the Design Manager."
-    upload:
-      describe: "Upload a folder or file from your computer to the HubSpot CMS."
-      errors:
-        destinationRequired: "A destination path needs to be passed"
-        fileIgnored: "The file \"{{ path }}\" is being ignored via an .hsignore rule"
-        invalidPath: "The path \"{{ path }}\" is not a path to a file or folder"
-        uploadFailed: "Uploading file \"{{ src }}\" to \"{{ dest }}\" failed"
-        someFilesFailed: "One or more files failed to upload to \"{{ dest }}\" in the Design Manager"
-        deleteFailed: "Deleting \"{{ path }}\" from account {{ accountId }} failed"
-      options:
-        options:
-          describe: "Options to pass to javascript fields files"
-        saveOutput:
-          describe: "If true, saves all output from javascript fields files as 'fields.output.json'."
-        convertFields:
-          describe: "If true, converts any javascript fields files contained in module folder or project root."
-        clean:
-          describe: "Will delete the destination directory and its contents before uploading. This will also clear the global content associated with any global partial templates and modules."
-        force:
-          describe: "Skips confirmation prompts when doing a clean upload."
-      previewUrl: "To preview this theme, visit: {{ previewUrl }}"
-      positionals:
-        src:
-          describe: "Path to the local file, relative to your current working directory."
-        dest:
-          describe: "Path in HubSpot Design Tools, can be a net new path."
-      success:
-        fileUploaded: "Uploaded file from \"{{ src }}\" to \"{{ dest }}\" in the Design Manager of account {{ accountId }}"
-        uploadComplete: "Uploading files to \"{{ dest }}\" in the Design Manager is complete"
-      uploading: "Uploading files from \"{{ src }}\" to \"{{ dest }}\" in the Design Manager of account {{ accountId }}"
-      notUploaded: "There was an error processing \"{{ src }}\". The file has not been uploaded."
-      cleaning: "Removing \"{{ filePath }}\" from account {{ accountId }} and uploading local..."
-      confirmCleanUpload: "You are about to delete the directory \"{{ filePath }}\" and its contents on HubSpot account {{ accountId }} before uploading. This will also clear the global content associated with any global partial templates and modules. Are you sure you want to do this?"
-    watch:
-      describe: "Watch a directory on your computer for changes and upload the changed files to the HubSpot CMS."
-      errors:
-        folderFailed: "Initial uploading of folder \"{{ src }}\" to \"{{ dest }}\" in account {{ accountId }} had failures"
-        fileFailed: "Upload of file \"{{ file }}\" to \"{{ dest }}\" in account {{ accountId }} failed"
-        destinationRequired: "A destination directory needs to be passed"
-        invalidPath: "The \"{{ path }}\" is not a path to a directory"
-      options:
-        disableInitial:
-          describe: "Disable the initial upload when watching a directory (default)"
-        initialUpload:
-          describe: "Upload directory before watching for updates"
-        notify:
-          describe: "Log to specified file when a watch task is triggered and after workers have gone idle. Ex. --notify path/to/file"
-        remove:
-          describe: "Will cause watch to delete files in your HubSpot account that are not found locally."
-        convertFields:
-          describe: "If true, converts any javascript fields files contained in module folder or project root."
-        saveOutput:
-          describe: "If true, saves all output from javascript fields files as 'fields.output.json'."
-        options:
-          describe: "Options to pass to javascript fields files"
-      positionals:
-        src:
-          describe: "Path to the local directory your files are in, relative to your current working directory"
-        dest:
-          describe: "Path in HubSpot Design Tools. Can be a net new path"
-      warnings:
-        disableInitial: "Passing the \"--disable-initial\" option is no longer necessary. Running \"hs watch\" no longer uploads the watched directory by default."
-        initialUpload: "To upload the directory run \"hs upload\" beforehand or add the \"--initial-upload\" option when running \"hs watch\"."
-        notUploaded: "The \"hs watch\" command no longer uploads the watched directory when started. The directory \"{{ path }}\" was not uploaded."
     convertFields:
       describe: "Converts a specific JavaScript fields file of a module or theme to JSON."
       positionals:
@@ -1203,7 +1033,7 @@ en:
         errors:
           noProjectsInConfig: "Unable to find any projects in the target repository's config.json file. Please ensure that there is a \"projects\" array in the config file."
           missingConfigFileTemplateSource: "Failed to fetch the config.json file from the target repository. Please ensure that there is a valid config.json file at the root of the repository and try again."
-          missingPropertiesInConfig: "Found misconfigured projects in the target repository's config.json file. Please ensure that each project in the target repository's config.json file contains the following properties: [\"name\", \"label\", \"path\", \"insertPath\"]."
+          missingPropertiesInConfig: "Found misconfigured projects in the target repository's config.json file. Please ensure that each project in the target repository's config.json file contains the following properties: [\"name\", \"label\", \"path\"]."
       validateProjectConfig:
         configNotFound: "Unable to locate a project configuration file. Try running again from a project directory, or run {{ createCommand }} to create a new project."
         configMissingFields: "The project configuration file is missing required fields."
@@ -1335,19 +1165,6 @@ en:
           describe: "Use environment variable config"
         debug:
           describe: "Set log level to debug"
-    configMigrate:
-      migrationHeader: "Migrate your existing configuration file to the new global location?"
-      migrationDescription: "This action will create a new global configuration file in your root directory and rename the deprecated config to {{ archivedConfigPath}}. If any conflicting values are detected, we will prompt you to reconcile them unless the \"--force\" flag is supplied."
-      mergeHeader: "Merge your existing configuration file with the global config?"
-      mergeDescription: "This action will merge your deprecated config file with the global config file located in your root directory. It will also rename the deprecated config to {{ archivedConfigPath }}. If any conflicting values are detected, we will prompt you to reconcile them unless the \"--force\" flag is supplied."
-      migrateConfigPromptDescription: "From deprecated config file: {{ deprecatedConfigPath }}\nTo new global config file: {{ globalConfigPath }}"
-      migrateConfigPrompt: "Migrate to the new config?"
-      mergeConfigConflictPrompt: "Change the {{ property }} property in the global config from {{ newValue }} to {{ oldValue }}?"
-      mergeConfigsPromptDescription: "Two config files detected. \nDeprecated config file: {{ deprecatedConfigPath }}\nGlobal config: {{ globalConfigPath }}"
-      mergeConfigsPrompt: "Merge configs?"
-      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>"

package/lib/accountTypes.js

@@ -39,7 +39,5 @@ async function isUnifiedAccount(account) {
     if (!accountId) {
         return false;
     }
-    const isUngatedForUnifiedApps = await (0, hasFeature_1.hasFeature)(accountId, constants_1.FEATURES.UNIFIED_APPS);
-    return ((isStandardAccount(account) || isAppDeveloperAccount(account)) &&
-        isUngatedForUnifiedApps);
+    return (0, hasFeature_1.hasFeature)(accountId, constants_1.FEATURES.UNIFIED_APPS);
 }

package/lib/commonOpts.d.ts

@@ -16,9 +16,7 @@ export declare function setLogLevel(options: Arguments<{
     debug?: boolean;
     networkDebug?: boolean;
 }>): void;
-export declare function getCommandName(argv: Arguments<{
-    _?: string[];
-}>): string;
+export declare function getCommandName(argv: Arguments): string;
 export declare function getCmsPublishMode(options: Arguments<{
     cmsPublishMode?: CmsPublishMode;
     derivedAccountId?: number;

package/lib/commonOpts.js

@@ -138,7 +138,7 @@ function setLogLevel(options) {
     }
 }
 function getCommandName(argv) {
-    return (argv && argv._ && argv._[0]) || '';
+    return String(argv && argv._ && argv._[0]) || '';
 }
 function getCmsPublishMode(options) {
     // 1. --cmsPublishMode

package/lib/configMigrate.d.ts

@@ -1,2 +1,2 @@
-export declare function handleMigration(accountId: number | undefined, configPath?: string): Promise<boolean>;
-export declare function handleMerge(accountId: number | undefined, configPath?: string, force?: boolean): Promise<boolean>;
+export declare function handleMigration(deprecatedConfigPath?: string, hideWarning?: boolean): Promise<boolean>;
+export declare function handleMerge(deprecatedConfigPath?: string, force?: boolean, hideWarning?: boolean): Promise<boolean>;

package/lib/configMigrate.js

@@ -4,61 +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) {
-    logger_1.logger.log((0, lang_1.i18n)('lib.configMigrate.migrationHeader'));
-    logger_1.logger.log('');
-    logger_1.logger.log((0, lang_1.i18n)('lib.configMigrate.migrationDescription', {
-        archivedConfigPath: config_1.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME,
-    }));
-    logger_1.logger.log('');
-    logger_1.logger.log((0, lang_1.i18n)('lib.configMigrate.migrateConfigPromptDescription', {
-        deprecatedConfigPath: (0, migrate_1.getConfigPath)(configPath, false) ||
-            config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-        globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
-    }));
+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'),
+        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
@@ -68,51 +51,33 @@ async function mergeConfigProperties(globalConfig, deprecatedConfig, force) {
     }
     return initialConfig;
 }
-async function handleMerge(accountId, configPath, force) {
-    logger_1.logger.log((0, lang_1.i18n)('lib.configMigrate.mergeHeader'));
-    logger_1.logger.log('');
-    logger_1.logger.log((0, lang_1.i18n)('lib.configMigrate.mergeDescription', {
-        archivedConfigPath: config_1.ARCHIVED_HUBSPOT_CONFIG_YAML_FILE_NAME,
-    }));
-    logger_1.logger.log('');
-    logger_1.logger.log((0, lang_1.i18n)('lib.configMigrate.mergeConfigsPromptDescription', {
-        deprecatedConfigPath: (0, migrate_1.getConfigPath)(configPath, false) ||
-            config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
-        globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
-    }));
+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'),
+        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/constants.d.ts

@@ -78,9 +78,27 @@ export declare const FEATURES: {
     readonly UNIFIED_THEME_PREVIEW: "cms:react:unifiedThemePreview";
     readonly UNIFIED_APPS: "Developers:UnifiedApps:PrivateBeta";
 };
-export declare const LOCAL_DEV_UI_WEBSOCKET_MESSAGE_TYPES: {
-    readonly UPLOAD: "upload";
-    readonly INSTALL_DEPS: "installDeps";
-    readonly APP_INSTALLED: "appInstalled";
-    readonly UPDATE_PROJECT_NODES: "updateProjectNodes";
+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 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.LOCAL_DEV_UI_WEBSOCKET_MESSAGE_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.LOCAL_DEV_SERVER_MESSAGE_TYPES = 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;
@@ -73,9 +73,27 @@ exports.FEATURES = {
     UNIFIED_THEME_PREVIEW: 'cms:react:unifiedThemePreview',
     UNIFIED_APPS: 'Developers:UnifiedApps:PrivateBeta',
 };
-exports.LOCAL_DEV_UI_WEBSOCKET_MESSAGE_TYPES = {
-    UPLOAD: 'upload',
-    INSTALL_DEPS: 'installDeps',
-    APP_INSTALLED: 'appInstalled',
-    UPDATE_PROJECT_NODES: 'updateProjectNodes',
+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.LOCAL_DEV_SERVER_MESSAGE_TYPES = {
+    INITIAL: 'INITIAL',
+    WEBSOCKET_SERVER_CONNECTED: 'WEBSOCKET_SERVER_CONNECTED',
 };

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/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 {};