@hubspot/cli 7.4.5-beta.0 → 7.4.6-beta.0

package/commands/app/migrate.d.ts

@@ -1,6 +1,6 @@
-import { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
+import { ArgumentsCamelCase } from 'yargs';
+import { YargsCommandModule } from '../../types/Yargs';
 import { MigrateAppArgs } from '../../lib/app/migrate';
 export declare function handler(options: ArgumentsCamelCase<MigrateAppArgs>): Promise<never>;
-export declare function builder(yargs: Argv): Argv<MigrateAppArgs>;
-declare const migrateCommand: CommandModule<unknown, MigrateAppArgs>;
+declare const migrateCommand: YargsCommandModule<unknown, MigrateAppArgs>;
 export default migrateCommand;

package/commands/app/migrate.js

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handler = handler;
-exports.builder = builder;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const config_1 = require("@hubspot/local-dev-lib/config");
 const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
-const commonOpts_1 = require("../../lib/commonOpts");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const errorHandlers_1 = require("../../lib/errorHandlers");
@@ -14,6 +12,7 @@ const migrate_1 = require("../../lib/app/migrate");
 const ui_1 = require("../../lib/ui");
 const migrate_legacy_1 = require("../../lib/app/migrate_legacy");
 const config_2 = require("../../lib/projects/config");
+const yargsUtils_1 = require("../../lib/yargsUtils");
 const { v2023_2, v2025_2 } = projects_1.PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = undefined; // uiBetaTag(i18n(`commands.project.subcommands.migrateApp.header.text.describe`), false);
@@ -60,10 +59,7 @@ async function handler(options) {
     await (0, usageTracking_1.trackCommandMetadataUsage)('migrate-app', { successful: true }, derivedAccountId);
     return process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function appMigrateBuilder(yargs) {
     yargs.options({
         name: {
             describe: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.options.name.describe`),
@@ -97,6 +93,12 @@ function builder(yargs) {
     ]);
     return yargs;
 }
+const builder = (0, yargsUtils_1.makeYargsBuilder)(appMigrateBuilder, command, (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.migrateApp.describe`), false), {
+    useGlobalOptions: true,
+    useConfigOptions: true,
+    useAccountOptions: true,
+    useEnvironmentOptions: true,
+});
 const migrateCommand = {
     command,
     describe,

package/commands/app.js

@@ -6,12 +6,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.describe = exports.command = void 0;
 exports.builder = builder;
 const migrate_1 = __importDefault(require("./app/migrate"));
-const commonOpts_1 = require("../lib/commonOpts");
 exports.command = ['app', 'apps'];
 // Keep the command hidden for now
 exports.describe = undefined;
 function builder(yargs) {
-    (0, commonOpts_1.addGlobalOptions)(yargs);
     return yargs.command(migrate_1.default).demandCommand(1, '');
 }
 const appCommand = {

package/commands/project/add.d.ts

@@ -1,11 +1,7 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs } from '../../types/Yargs';
-export declare const command = "add";
-export declare const describe: string;
+import { YargsCommandModule, CommonArgs } from '../../types/Yargs';
 type ProjectAddArgs = CommonArgs & {
     type: string;
     name: string;
 };
-export declare function handler(args: ArgumentsCamelCase<ProjectAddArgs>): Promise<void>;
-export declare const builder: (yargs: Argv) => Promise<Argv<ProjectAddArgs>>;
-export {};
+declare const projectAddCommand: YargsCommandModule<unknown, ProjectAddArgs>;
+export default projectAddCommand;

package/commands/project/add.js

@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.describe = exports.command = void 0;
-exports.handler = handler;
 const path_1 = __importDefault(require("path"));
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const github_1 = require("@hubspot/local-dev-lib/github");
@@ -20,8 +18,8 @@ const ui_1 = require("../../lib/ui");
 const constants_1 = require("../../lib/constants");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-exports.command = 'add';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.add.describe`), false);
+const command = 'add';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.add.describe`), false);
 async function handler(args) {
     const { derivedAccountId } = args;
     (0, usageTracking_1.trackCommandUsage)('project-add', undefined, derivedAccountId);
@@ -113,10 +111,13 @@ function projectAddBuilder(yargs) {
     ]);
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(projectAddBuilder, exports.command, exports.describe);
-module.exports = {
-    command: exports.command,
-    describe: exports.describe,
-    builder: exports.builder,
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectAddBuilder, command, describe, {
+    useGlobalOptions: true,
+});
+const projectAddCommand = {
+    command,
+    describe,
     handler,
+    builder,
 };
+exports.default = projectAddCommand;

package/commands/project/cloneApp.d.ts

@@ -1,13 +1,7 @@
-import { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
-import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "clone-app";
-export declare const describe: string | undefined;
-export declare const deprecated = true;
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
 export type CloneAppArgs = ConfigArgs & EnvironmentArgs & AccountArgs & CommonArgs & {
     dest: string;
     appId: number;
 };
-export declare const handler: (options: ArgumentsCamelCase<CloneAppArgs>) => Promise<never>;
-export declare const builder: (yargs: Argv) => Argv<CloneAppArgs>;
-declare const cloneAppCommand: CommandModule<unknown, CloneAppArgs>;
+declare const cloneAppCommand: YargsCommandModule<unknown, CloneAppArgs>;
 export default cloneAppCommand;

package/commands/project/cloneApp.js

@@ -3,17 +3,13 @@ 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.deprecated = exports.describe = exports.command = void 0;
-const ui_1 = require("../../lib/ui");
 const path_1 = __importDefault(require("path"));
 const fs_1 = __importDefault(require("fs"));
-const commonOpts_1 = require("../../lib/commonOpts");
 const usageTracking_1 = require("../../lib/usageTracking");
 const lang_1 = require("../../lib/lang");
 const selectPublicAppPrompt_1 = require("../../lib/prompts/selectPublicAppPrompt");
 const createProjectPrompt_1 = require("../../lib/prompts/createProjectPrompt");
 const polling_1 = require("../../lib/polling");
-const ui_2 = require("../../lib/ui");
 const errorHandlers_1 = require("../../lib/errorHandlers");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const accountTypes_1 = require("../../lib/accountTypes");
@@ -26,14 +22,16 @@ const archive_1 = require("@hubspot/local-dev-lib/archive");
 const config_2 = require("@hubspot/local-dev-lib/config");
 const SpinniesManager_1 = __importDefault(require("../../lib/ui/SpinniesManager"));
 const migrate_1 = require("../../lib/app/migrate");
-exports.command = 'clone-app';
-exports.describe = (0, ui_1.uiDeprecatedTag)((0, lang_1.i18n)(`commands.project.subcommands.cloneApp.describe`), false);
-exports.deprecated = true;
-const handler = async (options) => {
-    const { derivedAccountId } = options;
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const ui_1 = require("../../lib/ui");
+const command = 'clone-app';
+const describe = (0, ui_1.uiDeprecatedTag)((0, lang_1.i18n)(`commands.project.subcommands.cloneApp.describe`), false);
+const deprecated = true;
+async function handler(args) {
+    const { derivedAccountId } = args;
     await (0, usageTracking_1.trackCommandUsage)('clone-app', {}, derivedAccountId);
     const accountConfig = (0, config_2.getAccountConfig)(derivedAccountId);
-    const accountName = (0, ui_2.uiAccountDescription)(derivedAccountId);
+    const accountName = (0, ui_1.uiAccountDescription)(derivedAccountId);
     if (!accountConfig) {
         throw new Error((0, lang_1.i18n)(`commands.projects.subcommands.cloneApp.errors.noAccountConfig`));
     }
@@ -46,7 +44,7 @@ const handler = async (options) => {
     let projectName;
     let projectDest;
     try {
-        appId = options.appId;
+        appId = args.appId;
         if (!appId) {
             const appIdResponse = await (0, selectPublicAppPrompt_1.selectPublicAppPrompt)({
                 accountId: derivedAccountId,
@@ -55,7 +53,7 @@ const handler = async (options) => {
             });
             appId = appIdResponse.appId;
         }
-        const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(options);
+        const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args);
         projectName = createProjectPromptResponse.name;
         projectDest = createProjectPromptResponse.dest;
     }
@@ -98,7 +96,7 @@ const handler = async (options) => {
                 logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.cloneApp.errors.couldNotWriteConfigPath`), configPath);
             }
             logger_1.logger.log('');
-            (0, ui_2.uiLine)();
+            (0, ui_1.uiLine)();
             logger_1.logger.success((0, lang_1.i18n)(`commands.project.subcommands.cloneApp.cloneStatus.success`, {
                 dest: projectDest,
             }));
@@ -125,9 +123,8 @@ const handler = async (options) => {
     }
     await (0, usageTracking_1.trackCommandMetadataUsage)('clone-app', { successful: true }, derivedAccountId);
     process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
-};
-exports.handler = handler;
-const builder = (yargs) => {
+}
+function cloneAppBuilder(yargs) {
     yargs.options({
         dest: {
             describe: (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.options.dest.describe`),
@@ -144,17 +141,19 @@ const builder = (yargs) => {
             (0, lang_1.i18n)(`commands.project.subcommands.cloneApp.examples.default`),
         ],
     ]);
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
     return yargs;
-};
-exports.builder = builder;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(cloneAppBuilder, command, describe, {
+    useGlobalOptions: true,
+    useAccountOptions: true,
+    useConfigOptions: true,
+    useEnvironmentOptions: true,
+});
 const cloneAppCommand = {
-    command: exports.command,
-    describe: exports.describe,
-    handler: exports.handler,
-    builder: exports.builder,
-    deprecated: exports.deprecated,
+    command,
+    describe,
+    handler,
+    builder,
+    deprecated,
 };
 exports.default = cloneAppCommand;

package/commands/project/create.d.ts

@@ -1 +1,10 @@
-export {};
+import { RepoPath } from '@hubspot/local-dev-lib/types/Github';
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
+type ProjectCreateArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
+    name?: string;
+    dest?: string;
+    templateSource?: RepoPath;
+    template?: string;
+};
+declare const projectCreateCommand: YargsCommandModule<unknown, ProjectCreateArgs>;
+export default projectCreateCommand;

package/commands/project/create.js

@@ -1,88 +1,96 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-// @ts-nocheck
-const path = require('path');
-const fs = require('fs-extra');
-const chalk = require('chalk');
-const { logger } = require('@hubspot/local-dev-lib/logger');
-const { fetchReleaseData, cloneGithubRepo, } = require('@hubspot/local-dev-lib/github');
-const { getCwd } = require('@hubspot/local-dev-lib/path');
-const { addAccountOptions, addConfigOptions, addUseEnvironmentOptions, } = require('../../lib/commonOpts');
-const { trackCommandUsage } = require('../../lib/usageTracking');
-const { createProjectPrompt, } = require('../../lib/prompts/createProjectPrompt');
-const { writeProjectConfig, getProjectConfig, } = require('../../lib/projects/config');
-const { getProjectTemplateListFromRepo, EMPTY_PROJECT_TEMPLATE_NAME, } = require('../../lib/projects/create');
-const { i18n } = require('../../lib/lang');
-const { uiBetaTag, uiFeatureHighlight } = require('../../lib/ui');
-const { debugError } = require('../../lib/errorHandlers');
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { PROJECT_CONFIG_FILE, HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH, DEFAULT_PROJECT_TEMPLATE_BRANCH, } = require('../../lib/constants');
-exports.command = 'create';
-exports.describe = uiBetaTag(i18n(`commands.project.subcommands.create.describe`), false);
-exports.handler = async (options) => {
-    const { derivedAccountId } = options;
+const path_1 = __importDefault(require("path"));
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const chalk_1 = __importDefault(require("chalk"));
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const github_1 = require("@hubspot/local-dev-lib/github");
+const path_2 = require("@hubspot/local-dev-lib/path");
+const usageTracking_1 = require("../../lib/usageTracking");
+const createProjectPrompt_1 = require("../../lib/prompts/createProjectPrompt");
+const config_1 = require("../../lib/projects/config");
+const create_1 = require("../../lib/projects/create");
+const lang_1 = require("../../lib/lang");
+const ui_1 = require("../../lib/ui");
+const errorHandlers_1 = require("../../lib/errorHandlers");
+const exitCodes_1 = require("../../lib/enums/exitCodes");
+const constants_1 = require("../../lib/constants");
+const yargsUtils_1 = require("../../lib/yargsUtils");
+const command = 'create';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.create.describe`), false);
+async function handler(args) {
+    const { derivedAccountId } = args;
     let latestRepoReleaseTag;
-    let templateSource = options.templateSource;
+    let templateSource = args.templateSource;
     if (!templateSource) {
-        templateSource = HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
+        templateSource = constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH;
         try {
-            const releaseData = await fetchReleaseData(HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH);
+            const releaseData = await (0, github_1.fetchReleaseData)(constants_1.HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH);
             if (releaseData) {
                 latestRepoReleaseTag = releaseData.tag_name;
             }
         }
         catch (err) {
-            logger.error(i18n(`commands.project.subcommands.create.error.failedToFetchProjectList`));
-            process.exit(EXIT_CODES.ERROR);
+            logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.create.error.failedToFetchProjectList`));
+            process.exit(exitCodes_1.EXIT_CODES.ERROR);
         }
     }
-    const projectTemplates = await getProjectTemplateListFromRepo(templateSource, latestRepoReleaseTag || DEFAULT_PROJECT_TEMPLATE_BRANCH);
+    if (!templateSource || !templateSource.includes('/')) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.create.error.invalidTemplateSource`));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
+    }
+    const projectTemplates = await (0, create_1.getProjectTemplateListFromRepo)(templateSource, latestRepoReleaseTag || constants_1.DEFAULT_PROJECT_TEMPLATE_BRANCH);
     if (!projectTemplates.length) {
-        logger.error(i18n(`commands.project.subcommands.create.error.failedToFetchProjectList`));
-        process.exit(EXIT_CODES.ERROR);
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.create.error.failedToFetchProjectList`));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const createProjectPromptResponse = await createProjectPrompt(options, projectTemplates);
-    const projectDest = path.resolve(getCwd(), createProjectPromptResponse.dest);
-    trackCommandUsage('project-create', { type: createProjectPromptResponse.projectTemplate.name }, derivedAccountId);
-    const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await getProjectConfig(projectDest);
+    const createProjectPromptResponse = await (0, createProjectPrompt_1.createProjectPrompt)(args, projectTemplates);
+    const projectDest = path_1.default.resolve((0, path_2.getCwd)(), createProjectPromptResponse.dest);
+    (0, usageTracking_1.trackCommandUsage)('project-create', { type: createProjectPromptResponse.projectTemplate.name }, derivedAccountId);
+    const { projectConfig: existingProjectConfig, projectDir: existingProjectDir, } = await (0, config_1.getProjectConfig)(projectDest);
     // Exit if the target destination is within an existing project
-    if (existingProjectConfig && projectDest.startsWith(existingProjectDir)) {
-        logger.error(i18n(`commands.project.subcommands.create.errors.cannotNestProjects`, {
+    if (existingProjectConfig &&
+        existingProjectDir &&
+        projectDest.startsWith(existingProjectDir)) {
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.create.errors.cannotNestProjects`, {
             projectDir: existingProjectDir,
         }));
-        process.exit(EXIT_CODES.ERROR);
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
     try {
-        await cloneGithubRepo(templateSource, projectDest, {
+        await (0, github_1.cloneGithubRepo)(templateSource, projectDest, {
             sourceDir: createProjectPromptResponse.projectTemplate.path,
             tag: latestRepoReleaseTag,
             hideLogs: true,
         });
     }
     catch (err) {
-        debugError(err);
-        logger.error(i18n(`commands.project.subcommands.create.errors.failedToDownloadProject`));
-        process.exit(EXIT_CODES.ERROR);
+        (0, errorHandlers_1.debugError)(err);
+        logger_1.logger.error((0, lang_1.i18n)(`commands.project.subcommands.create.errors.failedToDownloadProject`));
+        process.exit(exitCodes_1.EXIT_CODES.ERROR);
     }
-    const projectConfigPath = path.join(projectDest, PROJECT_CONFIG_FILE);
-    const parsedConfigFile = JSON.parse(fs.readFileSync(projectConfigPath).toString());
-    writeProjectConfig(projectConfigPath, {
+    const projectConfigPath = path_1.default.join(projectDest, constants_1.PROJECT_CONFIG_FILE);
+    const parsedConfigFile = JSON.parse(fs_extra_1.default.readFileSync(projectConfigPath).toString());
+    (0, config_1.writeProjectConfig)(projectConfigPath, {
         ...parsedConfigFile,
         name: createProjectPromptResponse.name,
     });
     // If the template is 'no-template', we need to manually create a src directory
     if (createProjectPromptResponse.projectTemplate.name ===
-        EMPTY_PROJECT_TEMPLATE_NAME) {
-        fs.ensureDirSync(path.join(projectDest, 'src'));
+        create_1.EMPTY_PROJECT_TEMPLATE_NAME) {
+        fs_extra_1.default.ensureDirSync(path_1.default.join(projectDest, 'src'));
     }
-    logger.log('');
-    logger.success(i18n(`commands.project.subcommands.create.logs.success`, {
+    logger_1.logger.log('');
+    logger_1.logger.success((0, lang_1.i18n)(`commands.project.subcommands.create.logs.success`, {
         projectName: createProjectPromptResponse.name,
         projectDest,
     }));
-    logger.log('');
-    logger.log(chalk.bold(i18n(`commands.project.subcommands.create.logs.welcomeMessage`)));
-    uiFeatureHighlight([
+    logger_1.logger.log('');
+    logger_1.logger.log(chalk_1.default.bold((0, lang_1.i18n)(`commands.project.subcommands.create.logs.welcomeMessage`)));
+    (0, ui_1.uiFeatureHighlight)([
         'projectCommandTip',
         'projectUploadCommand',
         'projectDevCommand',
@@ -91,41 +99,51 @@ exports.handler = async (options) => {
         'feedbackCommand',
         'sampleProjects',
     ]);
-    process.exit(EXIT_CODES.SUCCESS);
-};
-exports.builder = yargs => {
+    process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+}
+function projectCreateBuilder(yargs) {
     yargs.options({
         name: {
-            describe: i18n(`commands.project.subcommands.create.options.name.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.create.options.name.describe`),
             type: 'string',
         },
         dest: {
-            describe: i18n(`commands.project.subcommands.create.options.dest.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.create.options.dest.describe`),
             type: 'string',
         },
         template: {
-            describe: i18n(`commands.project.subcommands.create.options.template.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.create.options.template.describe`),
             type: 'string',
         },
         'template-source': {
-            describe: i18n(`commands.project.subcommands.create.options.templateSource.describe`),
+            describe: (0, lang_1.i18n)(`commands.project.subcommands.create.options.templateSource.describe`),
             type: 'string',
         },
     });
     yargs.example([
         [
             '$0 project create',
-            i18n(`commands.project.subcommands.create.examples.default`),
+            (0, lang_1.i18n)(`commands.project.subcommands.create.examples.default`),
         ],
     ]);
     yargs.example([
         [
             '$0 project create --template-source HubSpot/ui-extensions-examples',
-            i18n(`commands.project.subcommands.create.examples.templateSource`),
+            (0, lang_1.i18n)(`commands.project.subcommands.create.examples.templateSource`),
         ],
     ]);
-    addConfigOptions(yargs);
-    addAccountOptions(yargs);
-    addUseEnvironmentOptions(yargs);
     return yargs;
+}
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectCreateBuilder, command, describe, {
+    useGlobalOptions: true,
+    useAccountOptions: true,
+    useConfigOptions: true,
+    useEnvironmentOptions: true,
+});
+const projectCreateCommand = {
+    command,
+    describe,
+    handler,
+    builder,
 };
+exports.default = projectCreateCommand;

package/commands/project/deploy.d.ts

@@ -1,11 +1,8 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "deploy";
-export declare const describe: string;
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
 export type ProjectDeployArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     project?: string;
     build?: number;
     buildId?: number;
 };
-export declare function handler(args: ArgumentsCamelCase<ProjectDeployArgs>): Promise<void>;
-export declare const builder: (yargs: Argv) => Promise<Argv<ProjectDeployArgs>>;
+declare const projectDeployCommand: YargsCommandModule<unknown, ProjectDeployArgs>;
+export default projectDeployCommand;

package/commands/project/deploy.js

@@ -3,8 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.builder = exports.describe = exports.command = void 0;
-exports.handler = handler;
 const chalk_1 = __importDefault(require("chalk"));
 const projects_1 = require("@hubspot/local-dev-lib/api/projects");
 const config_1 = require("@hubspot/local-dev-lib/config");
@@ -23,8 +21,8 @@ const ui_1 = require("../../lib/ui");
 const exitCodes_1 = require("../../lib/enums/exitCodes");
 const ui_2 = require("../../lib/ui");
 const yargsUtils_1 = require("../../lib/yargsUtils");
-exports.command = 'deploy';
-exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.deploy.describe`), false);
+const command = 'deploy';
+const describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.deploy.describe`), false);
 function validateBuildId(buildId, deployedBuildId, latestBuildId, projectName, accountId) {
     if (Number(buildId) > latestBuildId) {
         return (0, lang_1.i18n)(`commands.project.subcommands.deploy.errors.buildIdDoesNotExist`, {
@@ -136,14 +134,16 @@ function projectDeployBuilder(yargs) {
     ]);
     return yargs;
 }
-exports.builder = (0, yargsUtils_1.makeYargsBuilder)(projectDeployBuilder, exports.command, exports.describe, {
+const builder = (0, yargsUtils_1.makeYargsBuilder)(projectDeployBuilder, command, describe, {
+    useGlobalOptions: true,
     useConfigOptions: true,
     useAccountOptions: true,
     useEnvironmentOptions: true,
 });
-module.exports = {
-    command: exports.command,
-    describe: exports.describe,
-    builder: exports.builder,
+const projectDeployCommand = {
+    command,
+    describe,
+    builder,
     handler,
 };
+exports.default = projectDeployCommand;

package/commands/project/dev/index.d.ts

@@ -1,6 +1,8 @@
-import { ArgumentsCamelCase, Argv } from 'yargs';
+import { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
 import { ProjectDevArgs } from '../../../types/Yargs';
 export declare const command = "dev";
 export declare const describe: string;
 export declare function handler(args: ArgumentsCamelCase<ProjectDevArgs>): Promise<void>;
-export declare function builder(yargs: Argv): Argv<ProjectDevArgs>;
+export declare const builder: (yargs: Argv) => Promise<Argv<ProjectDevArgs>>;
+declare const projectDevCommand: CommandModule<unknown, ProjectDevArgs>;
+export default projectDevCommand;

package/commands/project/dev/index.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.describe = exports.command = void 0;
+exports.builder = exports.describe = exports.command = void 0;
 exports.handler = handler;
-exports.builder = builder;
-const commonOpts_1 = require("../../../lib/commonOpts");
 const usageTracking_1 = require("../../../lib/usageTracking");
 const lang_1 = require("../../../lib/lang");
 const logger_1 = require("@hubspot/local-dev-lib/logger");
@@ -14,6 +12,7 @@ const ui_1 = require("../../../lib/ui");
 const deprecatedFlow_1 = require("./deprecatedFlow");
 const unifiedFlow_1 = require("./unifiedFlow");
 const buildAndDeploy_1 = require("../../../lib/projects/buildAndDeploy");
+const yargsUtils_1 = require("../../../lib/yargsUtils");
 exports.command = 'dev';
 exports.describe = (0, ui_1.uiBetaTag)((0, lang_1.i18n)(`commands.project.subcommands.dev.describe`), false);
 async function handler(args) {
@@ -42,10 +41,7 @@ async function handler(args) {
         await (0, deprecatedFlow_1.deprecatedProjectDevFlow)(args, accountConfig, projectConfig, projectDir);
     }
 }
-function builder(yargs) {
-    (0, commonOpts_1.addConfigOptions)(yargs);
-    (0, commonOpts_1.addAccountOptions)(yargs);
-    (0, commonOpts_1.addUseEnvironmentOptions)(yargs);
+function projectDevBuilder(yargs) {
     yargs.example([
         [
             '$0 project dev',
@@ -54,3 +50,16 @@ function builder(yargs) {
     ]);
     return yargs;
 }
+exports.builder = (0, yargsUtils_1.makeYargsBuilder)(projectDevBuilder, exports.command, exports.describe, {
+    useGlobalOptions: true,
+    useAccountOptions: true,
+    useConfigOptions: true,
+    useEnvironmentOptions: true,
+});
+const projectDevCommand = {
+    command: exports.command,
+    describe: exports.describe,
+    handler,
+    builder: exports.builder,
+};
+exports.default = projectDevCommand;

package/commands/project/download.d.ts

@@ -1,12 +1,8 @@
-import { Argv, ArgumentsCamelCase } from 'yargs';
-import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs } from '../../types/Yargs';
-export declare const command = "download";
-export declare const describe: string;
+import { CommonArgs, ConfigArgs, AccountArgs, EnvironmentArgs, YargsCommandModule } from '../../types/Yargs';
 type ProjectDownloadArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
     project?: string;
     dest?: string;
     build?: number;
 };
-export declare function handler(args: ArgumentsCamelCase<ProjectDownloadArgs>): Promise<void>;
-export declare const builder: (yargs: Argv) => Promise<Argv<ProjectDownloadArgs>>;
-export {};
+declare const projectDownloadCommand: YargsCommandModule<unknown, ProjectDownloadArgs>;
+export default projectDownloadCommand;