@hubspot/cli 7.5.3-experimental.0 → 7.5.4-experimental.0

package/commands/account/use.js

@@ -8,6 +8,7 @@ const config_1 = require("@hubspot/local-dev-lib/config");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const accountsPrompt_1 = require("../../lib/prompts/accountsPrompt");
+const ui_1 = require("../../lib/ui");
 exports.command = 'use [account]';
 exports.describe = (0, lang_1.i18n)('commands.account.subcommands.use.describe');
 async function handler(args) {
@@ -23,6 +24,18 @@ async function handler(args) {
         newDefaultAccount = await (0, accountsPrompt_1.selectAccountFromConfig)();
     }
     (0, usageTracking_1.trackCommandUsage)('accounts-use', undefined, (0, config_1.getAccountId)(newDefaultAccount));
+    const accountOverride = (0, config_1.getCWDAccountOverride)();
+    const overrideFilePath = (0, config_1.getDefaultAccountOverrideFilePath)();
+    if (accountOverride && overrideFilePath) {
+        logger_1.logger.warn((0, lang_1.i18n)(`commands.account.subcommands.use.accountOverride`, {
+            accountOverride,
+        }));
+        logger_1.logger.log((0, lang_1.i18n)(`commands.account.subcommands.use.accountOverrideCommands`, {
+            createOverrideCommand: (0, ui_1.uiCommandReference)('hs account create-override'),
+            removeOverrideCommand: (0, ui_1.uiCommandReference)('hs account remove-override'),
+        }));
+        logger_1.logger.log('');
+    }
     (0, config_1.updateDefaultAccount)(newDefaultAccount);
     return logger_1.logger.success((0, lang_1.i18n)('commands.account.subcommands.use.success.defaultAccountUpdated', {
         accountName: newDefaultAccount,

package/commands/account.js

@@ -37,24 +37,29 @@ exports.describe = exports.command = void 0;
 exports.builder = builder;
 const commonOpts_1 = require("../lib/commonOpts");
 const lang_1 = require("../lib/lang");
+const auth = __importStar(require("./account/auth"));
 const list = __importStar(require("./account/list"));
 const rename = __importStar(require("./account/rename"));
 const use = __importStar(require("./account/use"));
 const info = __importStar(require("./account/info"));
 const remove = __importStar(require("./account/remove"));
 const clean = __importStar(require("./account/clean"));
-const i18nKey = 'commands.account';
+const createOverride = __importStar(require("./account/createOverride"));
+const removeOverride = __importStar(require("./account/removeOverride"));
 exports.command = ['account', 'accounts'];
-exports.describe = (0, lang_1.i18n)(`${i18nKey}.describe`);
+exports.describe = (0, lang_1.i18n)('commands.account.describe');
 function builder(yargs) {
     (0, commonOpts_1.addGlobalOptions)(yargs);
     yargs
+        .command(auth)
         .command(list)
         .command(rename)
         .command(use)
         .command(info)
         .command(remove)
         .command(clean)
+        .command(createOverride)
+        .command(removeOverride)
         .demandCommand(1, '');
     return yargs;
 }

package/commands/auth.js

@@ -47,8 +47,12 @@ async function handler(args) {
     if (configPath) {
         (0, git_1.checkAndWarnGitInclusion)(configPath);
     }
-    if (!(0, config_2.getConfigPath)(configFlagValue)) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.noConfigFileFound`));
+    if ((0, config_2.configFileExists)(true)) {
+        const globalConfigPath = (0, config_2.getConfigPath)('', true);
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.globalConfigFileExists`, {
+            configPath: globalConfigPath,
+            authCommand: (0, ui_1.uiCommandReference)('hs account auth'),
+        }));
         process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     (0, usageTracking_1.trackCommandUsage)('auth');

package/commands/config/migrate.d.ts

@@ -0,0 +1,10 @@
+import { Argv, ArgumentsCamelCase } from 'yargs';
+import { CommonArgs, ConfigArgs } from '../../types/Yargs';
+export declare const describe: string;
+export declare const command = "migrate";
+type ConfigMigrateArgs = CommonArgs & ConfigArgs & {
+    force?: boolean;
+};
+export declare function handler(args: ArgumentsCamelCase<ConfigMigrateArgs>): Promise<void>;
+export declare function builder(yargs: Argv): Argv<ConfigMigrateArgs>;
+export {};

package/commands/config/migrate.js

@@ -0,0 +1,84 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.command = exports.describe = void 0;
+exports.handler = handler;
+exports.builder = builder;
+const fs_1 = __importDefault(require("fs"));
+const config_1 = require("@hubspot/local-dev-lib/constants/config");
+const migrate_1 = require("@hubspot/local-dev-lib/config/migrate");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const configMigrate_1 = require("../../lib/configMigrate");
+const commonOpts_1 = require("../../lib/commonOpts");
+const lang_1 = require("../../lib/lang");
+const usageTracking_1 = require("../../lib/usageTracking");
+const index_1 = require("../../lib/errorHandlers/index");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+exports.describe = (0, lang_1.i18n)('commands.config.subcommands.migrate.describe', {
+    deprecatedConfigPath: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+    globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
+});
+exports.command = 'migrate';
+async function handler(args) {
+    const { config: configPath, force, derivedAccountId } = args;
+    if (configPath && !fs_1.default.existsSync(configPath)) {
+        logger_1.logger.log((0, lang_1.i18n)('commands.config.subcommands.migrate.errors.configNotFound', {
+            configPath,
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    const deprecatedConfigExists = (0, migrate_1.configFileExists)(false, configPath);
+    const globalConfigExists = (0, migrate_1.configFileExists)(true);
+    if (!deprecatedConfigExists) {
+        logger_1.logger.log((0, lang_1.i18n)('commands.config.subcommands.migrate.migrationAlreadyCompleted', {
+            deprecatedConfigPath: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    }
+    try {
+        if (!globalConfigExists) {
+            await (0, configMigrate_1.handleMigration)(derivedAccountId, configPath);
+        }
+        else {
+            await (0, configMigrate_1.handleMerge)(derivedAccountId, configPath, force);
+        }
+        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+    }
+    catch (error) {
+        (0, usageTracking_1.trackCommandMetadataUsage)('config-migrate', {
+            command: 'hs config migrate',
+            type: 'Migration/merge',
+            successful: false,
+        }, derivedAccountId);
+        (0, index_1.logError)(error);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+}
+function builder(yargs) {
+    (0, commonOpts_1.addConfigOptions)(yargs);
+    yargs
+        .option('force', {
+        alias: 'f',
+        type: 'boolean',
+        default: false,
+        description: (0, lang_1.i18n)('commands.config.subcommands.migrate.options.force'),
+    })
+        .example([
+        [
+            '$0 config migrate',
+            (0, lang_1.i18n)('commands.config.subcommands.migrate.examples.default', {
+                deprecatedConfigPath: config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
+                globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
+            }),
+        ],
+        [
+            '$0 config migrate --config=/path/to/config.yml',
+            (0, lang_1.i18n)('commands.config.subcommands.migrate.examples.configFlag', {
+                globalConfigPath: config_1.GLOBAL_CONFIG_PATH,
+            }),
+        ],
+    ]);
+    return yargs;
+}

package/commands/config/set.d.ts

@@ -1 +1,11 @@
+import { ArgumentsCamelCase, Argv } from 'yargs';
+import { CommonArgs } from '../../types/Yargs';
+import { CmsPublishMode } from '@hubspot/local-dev-lib/types/Files';
+type ConfigSetArgs = CommonArgs & {
+    defaultCmsPublishMode: CmsPublishMode;
+    allowUsageTracking?: boolean;
+    httpTimeout?: string;
+};
+export declare function handler(args: ArgumentsCamelCase<ConfigSetArgs>): Promise<void>;
+export declare function builder(yargs: Argv): Argv<ConfigSetArgs>;
 export {};

package/commands/config/set.js

@@ -1,21 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { i18n } = require('../../lib/lang');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { promptUser } = require('../../lib/prompts/promptUtils');
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { setDefaultCmsPublishMode, setHttpTimeout, setAllowUsageTracking, } = require('../../lib/configOptions');
+exports.handler = handler;
+exports.builder = builder;
+const lang_1 = require("../../lib/lang");
+const usageTracking_1 = require("../../lib/usageTracking");
+const promptUtils_1 = require("../../lib/prompts/promptUtils");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const configOptions_1 = require("../../lib/configOptions");
 exports.command = 'set';
-exports.describe = i18n(`commands.config.subcommands.set.describe`);
-const selectOptions = async () => {
-    const { cmsPublishMode } = await promptUser([
+exports.describe = (0, lang_1.i18n)(`commands.config.subcommands.set.describe`);
+async function selectOptions() {
+    const { cmsPublishMode } = await (0, promptUtils_1.promptUser)([
         {
             type: 'list',
-            look: false,
             name: 'cmsPublishMode',
             pageSize: 20,
-            message: i18n(`commands.config.subcommands.set.promptMessage`),
+            message: (0, lang_1.i18n)(`commands.config.subcommands.set.promptMessage`),
             choices: [
                 {
                     name: 'Default CMS publish mode',
@@ -27,46 +27,46 @@ const selectOptions = async () => {
         },
     ]);
     return cmsPublishMode;
-};
-const handleConfigUpdate = async (accountId, options) => {
+}
+async function handleConfigUpdate(accountId, options) {
     const { allowUsageTracking, defaultCmsPublishMode, httpTimeout } = options;
     if (typeof defaultCmsPublishMode !== 'undefined') {
-        await setDefaultCmsPublishMode({ defaultCmsPublishMode, accountId });
+        await (0, configOptions_1.setDefaultCmsPublishMode)({ defaultCmsPublishMode, accountId });
         return true;
     }
     else if (typeof httpTimeout !== 'undefined') {
-        await setHttpTimeout({ httpTimeout, accountId });
+        await (0, configOptions_1.setHttpTimeout)({ httpTimeout, accountId });
         return true;
     }
     else if (typeof allowUsageTracking !== 'undefined') {
-        await setAllowUsageTracking({ allowUsageTracking, accountId });
+        await (0, configOptions_1.setAllowUsageTracking)({ allowUsageTracking, accountId });
         return true;
     }
     return false;
-};
-exports.handler = async (options) => {
-    const { derivedAccountId } = options;
-    trackCommandUsage('config-set', null, derivedAccountId);
-    const configUpdated = await handleConfigUpdate(derivedAccountId, options);
+}
+async function handler(args) {
+    const { derivedAccountId } = args;
+    (0, usageTracking_1.trackCommandUsage)('config-set', {}, derivedAccountId);
+    const configUpdated = await handleConfigUpdate(derivedAccountId, args);
     if (!configUpdated) {
         const selectedOptions = await selectOptions();
         await handleConfigUpdate(derivedAccountId, selectedOptions);
     }
-    process.exit(EXIT_CODES.SUCCESS);
-};
-exports.builder = yargs => {
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function builder(yargs) {
     yargs
         .options({
         'default-cms-publish-mode': {
-            describe: i18n(`commands.config.subcommands.set.options.defaultMode.describe`),
+            describe: (0, lang_1.i18n)(`commands.config.subcommands.set.options.defaultMode.describe`),
             type: 'string',
         },
         'allow-usage-tracking': {
-            describe: i18n(`commands.config.subcommands.set.options.allowUsageTracking.describe`),
+            describe: (0, lang_1.i18n)(`commands.config.subcommands.set.options.allowUsageTracking.describe`),
             type: 'boolean',
         },
         'http-timeout': {
-            describe: i18n(`commands.config.subcommands.set.options.httpTimeout.describe`),
+            describe: (0, lang_1.i18n)(`commands.config.subcommands.set.options.httpTimeout.describe`),
             type: 'string',
         },
     })
@@ -76,8 +76,8 @@ exports.builder = yargs => {
         .example([
         [
             '$0 config set',
-            i18n(`commands.config.subcommands.set.examples.default`),
+            (0, lang_1.i18n)(`commands.config.subcommands.set.examples.default`),
         ],
     ]);
     return yargs;
-};
+}

package/commands/config.d.ts

@@ -1 +1,4 @@
-export {};
+import { Argv } from 'yargs';
+export declare const command = "config";
+export declare const describe: string;
+export declare function builder(yargs: Argv): Argv;

package/commands/config.js

@@ -1,15 +1,49 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const { addConfigOptions, addGlobalOptions } = require('../lib/commonOpts');
-const { i18n } = require('../lib/lang');
-const set = require('./config/set');
-const i18nKey = 'commands.config';
+exports.describe = exports.command = void 0;
+exports.builder = builder;
+const commonOpts_1 = require("../lib/commonOpts");
+const lang_1 = require("../lib/lang");
+const set = __importStar(require("./config/set"));
+const migrate = __importStar(require("./config/migrate"));
 exports.command = 'config';
-exports.describe = i18n(`${i18nKey}.describe`);
-exports.builder = yargs => {
-    addConfigOptions(yargs);
-    addGlobalOptions(yargs);
-    yargs.command(set).demandCommand(1, '');
+exports.describe = (0, lang_1.i18n)('commands.config.describe');
+function builder(yargs) {
+    (0, commonOpts_1.addConfigOptions)(yargs);
+    (0, commonOpts_1.addGlobalOptions)(yargs);
+    yargs.command(set).command(migrate).demandCommand(1, '');
     return yargs;
-};
+}

package/commands/init.js

@@ -78,6 +78,13 @@ async function handler(args) {
         });
     }
     const env = args.qa ? environments_1.ENVIRONMENTS.QA : environments_1.ENVIRONMENTS.PROD;
+    if ((0, config_1.configFileExists)(true)) {
+        const globalConfigPath = (0, config_1.getConfigPath)('', true);
+        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.globalConfigFileExists`, {
+            configPath: globalConfigPath,
+        }));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
     if (fs_extra_1.default.existsSync(configPath)) {
         logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.configFileExists`, {
             configPath: configPath,
@@ -114,19 +121,16 @@ async function handler(args) {
             accountId = oauthResult.accountId;
             name = oauthResult.name;
         }
+        const configPath = (0, config_1.getConfigPath)();
         try {
             (0, gitignore_1.checkAndAddConfigToGitignore)(configPath);
         }
         catch (e) {
             (0, index_1.debugError)(e);
         }
-        let newConfigPath = configPath;
-        if (!newConfigPath && !useHiddenConfig) {
-            newConfigPath = `${(0, path_2.getCwd)()}/${config_2.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}`;
-        }
         logger_1.logger.log('');
         logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.configFileCreated`, {
-            configPath: newConfigPath,
+            configPath: configPath,
         }));
         logger_1.logger.success((0, lang_1.i18n)(`${i18nKey}.success.configFileUpdated`, {
             authType: AUTH_TYPE_NAMES[authType],
@@ -167,11 +171,6 @@ function initBuilder(yargs) {
             hidden: true,
             default: false,
         },
-        'use-hidden-config': {
-            describe: (0, lang_1.i18n)(`${i18nKey}.options.useHiddenConfig.describe`),
-            hidden: true,
-            type: 'boolean',
-        },
     });
     yargs.conflicts('use-hidden-config', 'config');
     return yargs;

package/commands/project.js

@@ -15,7 +15,6 @@ const open = require('./project/open');
 const dev = require('./project/dev');
 const add = require('./project/add');
 const migrateApp = require('./project/migrateApp');
-const migrate = require('./project/migrate');
 const cloneApp = require('./project/cloneApp');
 const installDeps = require('./project/installDeps');
 const i18nKey = 'commands.project';
@@ -35,7 +34,6 @@ exports.builder = yargs => {
         .command(download)
         .command(open)
         .command(migrateApp)
-        .command(migrate)
         .command(cloneApp)
         .command(installDeps)
         .demandCommand(1, '');

package/lang/en.js

@@ -2816,6 +2816,11 @@ export const lib = {
       fileFiltered: filename => `Ignore rule triggered for "${filename}"`,
     },
   },
+  middleware: {
+    fireAlarm: {
+      failedToLoadBoxen: 'Failed to load boxen util.',
+    },
+  },
   ui: {
     betaTag: chalk.bold('[BETA]'),
     betaWarning: {