@hubspot/cli 7.4.1 → 7.4.2-beta.0

package/lang/en.lyaml

@@ -650,37 +650,12 @@ en:
           componentsToBeMigrated: "The following component types will be migrated: {{ components }}"
           componentsThatWillNotBeMigrated: "[NOTE] These component types are not yet supported for migration but will be available later: {{ components }}"
           errors:
-            noAppsEligible: "No apps in account {{ accountId }} are currently migratable"
+            noAppsForProject: "No apps associated with project {{ projectName }}"
             noAccountConfig: "There is no account associated with {{ accountId }} in the config file. Please choose another account and try again, or authenticate {{ accountId }} using {{ authCommand }}."
-            invalidAccountTypeTitle: "{{#bold}}Developer account not targeted{{/bold}}"
-            invalidAccountTypeDescription: "Only public apps created in a developer account can be converted to a project component. Select a connected developer account with {{useCommand}} or {{authCommand}} and try again."
             projectAlreadyExists: "A project with name {{ projectName }} already exists. Please choose another name."
             invalidApp: "Could not migrate appId {{ appId }}. This app cannot be migrated at this time. Please choose another public app."
-            appWithAppIdNotFound: "Could not find an app with the id {{ appId }} "
             migrationFailed: 'Migration Failed'
-          prompt:
-            chooseApp: 'Which app would you like to migrate?'
-            inputName: '[--name] What would you like to name the project?'
-            inputDest: '[--dest] Where would you like to save the project?'
-            uidForComponent: 'What UID would you like to use for {{ componentName }}?'
-            proceed: 'Would you like to proceed?'
-          spinners:
-            beginningMigration: "Beginning migration"
-            unableToStartMigration: "Unable to begin migration"
-            finishingMigration: "Wrapping up migration"
-            migrationComplete: "Migration completed"
-            migrationFailed: "Migration failed"
-            downloadingProjectContents: "Downloading migrated project files"
-            downloadingProjectContentsComplete: "Migrated project files downloaded"
-            downloadingProjectContentsFailed: "Unable to download migrated project files"
-            copyingProjectFiles: "Copying migrated project files"
-            copyingProjectFilesComplete: "Migrated project files copied"
-            copyingProjectFilesFailed: "Unable to copy migrated project files"
-          unmigratableReasons:
-            upToDate: 'App is already up to date'
-            isPrivateApp: 'Private apps are not currently migratable'
-            listedInMarketplace: 'Listed apps are not currently migratable'
-            generic: "Unable to migrate app: {{ reasonCode }}"
+            notAllowedWithinProject: 'This command cannot be run from within a project directory. Run the command again from outside a project directory. If you are trying to migrate a project, run {{ command }}'
         cloneApp:
           describe: "Clone a public app using the projects framework."
           examples:
@@ -717,6 +692,12 @@ en:
           examples:
             default: "Create a component within your project"
             withFlags: "Use --name and --type flags to bypass the prompt."
+        migrate:
+            describe: "Migrate an existing project to the new version of the projects framework."
+            errors:
+                noProjectConfig: "No project detected. Please run this command again from a project directory."
+            examples:
+                default: "Migrate an existing project to the new version of the projects framework."
         deploy:
           describe: "Deploy a project build."
           deployBuildIdPrompt: "[--build] Deploy which build?"

package/lib/app/migrate.d.ts

@@ -1,5 +1,11 @@
 import { ArgumentsCamelCase } from 'yargs';
-import { MigrateAppOptions } from '../../types/Yargs';
-export declare function downloadProjectFiles(derivedAccountId: number, projectName: string, buildId: number, projectDest: string): Promise<void>;
-export declare function migrateApp2025_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppOptions>): Promise<void>;
-export declare function logInvalidAccountError(i18nKey: string): void;
+import { LoadedProjectConfig } from '../projects';
+import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs } from '../../types/Yargs';
+export type MigrateAppArgs = CommonArgs & AccountArgs & EnvironmentArgs & ConfigArgs & {
+    name?: string;
+    dest?: string;
+    appId?: number;
+    platformVersion: string;
+};
+export declare function migrateApp2025_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppArgs>, projectConfig?: LoadedProjectConfig): Promise<void>;
+export declare function logInvalidAccountError(): void;

package/lib/app/migrate.js

@@ -3,7 +3,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.downloadProjectFiles = downloadProjectFiles;
 exports.migrateApp2025_2 = migrateApp2025_2;
 exports.logInvalidAccountError = logInvalidAccountError;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
@@ -18,49 +17,66 @@ const Migration_1 = require("@hubspot/local-dev-lib/types/Migration");
 const projects_2 = require("@hubspot/local-dev-lib/api/projects");
 const promptUtils_1 = require("../prompts/promptUtils");
 const ui_1 = require("../ui");
-const lang_1 = require("../lang");
 const projects_3 = require("../projects");
 const SpinniesManager_1 = __importDefault(require("../ui/SpinniesManager"));
 const polling_1 = require("../polling");
 const migrate_1 = require("../../api/migrate");
+const fs_1 = __importDefault(require("fs"));
+const en_1 = require("../../lang/en");
+const util_1 = __importDefault(require("util"));
+const hasFeature_1 = require("../hasFeature");
 function getUnmigratableReason(reasonCode) {
     switch (reasonCode) {
         case projects_1.UNMIGRATABLE_REASONS.UP_TO_DATE:
-            return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.upToDate');
+            return en_1.lib.migrate.errors.unmigratableReasons.upToDate;
         case projects_1.UNMIGRATABLE_REASONS.IS_A_PRIVATE_APP:
-            return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.isPrivateApp');
+            return en_1.lib.migrate.errors.unmigratableReasons.isPrivateApp;
         case projects_1.UNMIGRATABLE_REASONS.LISTED_IN_MARKETPLACE:
-            return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.listedInMarketplace');
+            return en_1.lib.migrate.errors.unmigratableReasons.listedInMarketplace;
         default:
-            return (0, lang_1.i18n)('commands.project.subcommands.migrateApp.unmigratableReasons.generic', {
-                reasonCode,
-            });
+            return en_1.lib.migrate.errors.unmigratableReasons.generic(reasonCode);
     }
 }
-async function handleMigrationSetup(derivedAccountId, options) {
-    const { name, dest, appId } = options;
-    const { data: { migratableApps, unmigratableApps }, } = await (0, migrate_1.listAppsForMigration)(derivedAccountId);
-    const migratableAppsWithoutProject = migratableApps.filter((app) => !app.projectName);
-    const unmigratableAppsWithoutProject = unmigratableApps.filter((app) => !app.projectName);
-    const allAppsWithoutProject = [
-        ...migratableAppsWithoutProject,
-        ...unmigratableAppsWithoutProject,
-    ];
-    if (allAppsWithoutProject.length === 0) {
-        const reasons = unmigratableAppsWithoutProject.map(app => `${chalk_1.default.bold(app.appName)}: ${getUnmigratableReason(app.unmigratableReason)}`);
-        throw new Error(`${(0, lang_1.i18n)(`commands.project.subcommands.migrateApp.errors.noAppsEligible`, {
-            accountId: (0, ui_1.uiAccountDescription)(derivedAccountId),
-        })}${reasons.length ? `\n  - ${reasons.join('\n  - ')}` : ''}`);
+function filterAppsByProjectName(projectConfig) {
+    return (app) => {
+        if (projectConfig) {
+            return app.projectName === projectConfig?.projectConfig?.name;
+        }
+        return !app.projectName;
+    };
+}
+async function fetchMigrationApps(appId, derivedAccountId, platformVersion, projectConfig) {
+    const { data: { migratableApps, unmigratableApps }, } = await (0, migrate_1.listAppsForMigration)(derivedAccountId, platformVersion);
+    const filteredMigratableApps = migratableApps.filter(filterAppsByProjectName(projectConfig));
+    const filteredUnmigratableApps = unmigratableApps.filter(filterAppsByProjectName(projectConfig));
+    const allApps = [...filteredMigratableApps, ...filteredUnmigratableApps];
+    if (allApps.length > 1 && projectConfig) {
+        throw new Error(en_1.lib.migrate.errors.project.multipleApps);
+    }
+    if (allApps.length === 0 && projectConfig) {
+        throw new Error(en_1.lib.migrate.errors.noAppsForProject(projectConfig?.projectConfig?.name || ''));
+    }
+    if (allApps.length === 0 ||
+        filteredUnmigratableApps.length === allApps.length) {
+        const reasons = filteredUnmigratableApps.map(app => `${chalk_1.default.bold(app.appName)}: ${getUnmigratableReason(app.unmigratableReason)}`);
+        throw new Error(en_1.lib.migrate.errors.noAppsEligible((0, ui_1.uiAccountDescription)(derivedAccountId), reasons));
     }
     if (appId &&
-        !allAppsWithoutProject.some(app => {
+        !allApps.some(app => {
             return app.appId === appId;
         })) {
-        throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.chooseApp', {
-            appId,
-        }));
+        throw new Error(en_1.lib.migrate.errors.appWithAppIdNotFound(appId));
     }
-    const appChoices = allAppsWithoutProject.map(app => ({
+    return allApps;
+}
+async function selectAppToMigrate(allApps, appId) {
+    if (appId &&
+        !allApps.some(app => {
+            return app.appId === appId;
+        })) {
+        throw new Error(en_1.lib.migrate.errors.appWithAppIdNotFound(appId));
+    }
+    const appChoices = allApps.map(app => ({
         name: app.isMigratable
             ? app.appName
             : `[${chalk_1.default.yellow('DISABLED')}] ${app.appName} `,
@@ -71,12 +87,12 @@ async function handleMigrationSetup(derivedAccountId, options) {
     }));
     let appIdToMigrate = appId;
     if (!appIdToMigrate) {
-        const { appId: selectedAppId } = await (0, promptUtils_1.listPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.chooseApp'), {
+        const { appId: selectedAppId } = await (0, promptUtils_1.listPrompt)(en_1.lib.migrate.prompt.chooseApp, {
             choices: appChoices,
         });
         appIdToMigrate = selectedAppId;
     }
-    const selectedApp = allAppsWithoutProject.find(app => app.appId === appIdToMigrate);
+    const selectedApp = allApps.find(app => app.appId === appIdToMigrate);
     const migratableComponents = [];
     const unmigratableComponents = [];
     selectedApp?.migrationComponents.forEach(component => {
@@ -88,37 +104,51 @@ async function handleMigrationSetup(derivedAccountId, options) {
         }
     });
     if (migratableComponents.length !== 0) {
-        logger_1.logger.log((0, lang_1.i18n)('commands.project.subcommands.migrateApp.componentsToBeMigrated', {
-            components: `\n - ${migratableComponents.join('\n - ')}`,
-        }));
+        logger_1.logger.log(en_1.lib.migrate.componentsToBeMigrated(`\n - ${migratableComponents.join('\n - ')}`));
     }
     if (unmigratableComponents.length !== 0) {
-        logger_1.logger.log((0, lang_1.i18n)('commands.project.subcommands.migrateApp.componentsThatWillNotBeMigrated', {
-            components: `\n - ${unmigratableComponents.join('\n - ')}`,
-        }));
+        logger_1.logger.log(en_1.lib.migrate.componentsThatWillNotBeMigrated(`\n - ${unmigratableComponents.join('\n - ')}`));
     }
     logger_1.logger.log();
-    const proceed = await (0, promptUtils_1.confirmPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.proceed'));
+    const proceed = await (0, promptUtils_1.confirmPrompt)(en_1.lib.migrate.prompt.proceed);
+    return {
+        proceed,
+        appIdToMigrate,
+    };
+}
+async function handleMigrationSetup(derivedAccountId, options, projectConfig) {
+    const { name, dest, appId } = options;
+    const allApps = await fetchMigrationApps(appId, derivedAccountId, options.platformVersion, projectConfig);
+    const { proceed, appIdToMigrate } = await selectAppToMigrate(allApps, appId);
     if (!proceed) {
         return {};
     }
-    const projectName = name ||
-        (await (0, promptUtils_1.inputPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.inputName')));
+    // If it's a project we don't want to prompt for dest and name, so just return early
+    if (projectConfig &&
+        projectConfig?.projectConfig &&
+        projectConfig?.projectDir) {
+        return {
+            appIdToMigrate,
+            projectName: projectConfig.projectConfig.name,
+            projectDest: projectConfig.projectDir,
+        };
+    }
+    const projectName = projectConfig?.projectConfig?.name ||
+        name ||
+        (await (0, promptUtils_1.inputPrompt)(en_1.lib.migrate.prompt.inputName));
     const { projectExists } = await (0, projects_3.ensureProjectExists)(derivedAccountId, projectName, { allowCreate: false, noLogs: true });
     if (projectExists) {
-        throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.errors.projectAlreadyExists', {
-            projectName,
-        }));
+        throw new Error(en_1.lib.migrate.errors.project.alreadyExists(projectName));
     }
     const projectDest = dest ||
-        (await (0, promptUtils_1.inputPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.inputDest'), {
+        (await (0, promptUtils_1.inputPrompt)(en_1.lib.migrate.prompt.inputDest, {
             defaultAnswer: path_1.default.resolve((0, path_2.getCwd)(), (0, path_2.sanitizeFileName)(projectName)),
         }));
     return { appIdToMigrate, projectName, projectDest };
 }
 async function beginMigration(derivedAccountId, appId, platformVersion) {
     SpinniesManager_1.default.add('beginningMigration', {
-        text: (0, lang_1.i18n)('commands.project.subcommands.migrateApp.spinners.beginningMigration'),
+        text: en_1.lib.migrate.spinners.beginningMigration,
     });
     const uidMap = {};
     const { data } = await (0, migrate_1.initializeMigration)(derivedAccountId, appId, platformVersion);
@@ -126,7 +156,7 @@ async function beginMigration(derivedAccountId, appId, platformVersion) {
     const pollResponse = await pollMigrationStatus(derivedAccountId, migrationId, [Migration_1.MIGRATION_STATUS.INPUT_REQUIRED]);
     if (pollResponse.status !== Migration_1.MIGRATION_STATUS.INPUT_REQUIRED) {
         SpinniesManager_1.default.fail('beginningMigration', {
-            text: (0, lang_1.i18n)('commands.project.subcommands.migrateApp.spinners.unableToStartMigration'),
+            text: en_1.lib.migrate.spinners.unableToStartMigration,
         });
         return;
     }
@@ -135,11 +165,9 @@ async function beginMigration(derivedAccountId, appId, platformVersion) {
     if (Object.values(componentsRequiringUids).length !== 0) {
         for (const [componentId, component] of Object.entries(componentsRequiringUids)) {
             const { componentHint, componentType } = component;
-            uidMap[componentId] = await (0, promptUtils_1.inputPrompt)((0, lang_1.i18n)('commands.project.subcommands.migrateApp.prompt.uidForComponent', {
-                componentName: componentHint
-                    ? `${componentHint} [${(0, transform_1.mapToUserFacingType)(componentType)}]`
-                    : (0, transform_1.mapToUserFacingType)(componentType),
-            }), {
+            uidMap[componentId] = await (0, promptUtils_1.inputPrompt)(en_1.lib.migrate.prompt.uidForComponent(componentHint
+                ? `${(0, transform_1.mapToUserFacingType)(componentType)} '${componentHint}'`
+                : (0, transform_1.mapToUserFacingType)(componentType)), {
                 validate: (uid) => {
                     const result = (0, project_parsing_lib_1.validateUid)(uid);
                     return result === undefined ? true : result;
@@ -162,7 +190,7 @@ async function finalizeMigration(derivedAccountId, migrationId, uidMap, projectN
     let pollResponse;
     try {
         SpinniesManager_1.default.add('finishingMigration', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.finishingMigration`),
+            text: en_1.lib.migrate.spinners.finishingMigration,
         });
         await (0, migrate_1.continueMigration)(derivedAccountId, migrationId, uidMap, projectName);
         pollResponse = await pollMigrationStatus(derivedAccountId, migrationId, [
@@ -171,55 +199,78 @@ async function finalizeMigration(derivedAccountId, migrationId, uidMap, projectN
     }
     catch (error) {
         SpinniesManager_1.default.fail('finishingMigration', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationFailed`),
+            text: en_1.lib.migrate.spinners.migrationFailed,
         });
-        throw error;
+        if ((0, migrate_1.isMigrationStatus)(error) && error.status === Migration_1.MIGRATION_STATUS.FAILURE) {
+            throw new Error(error.projectErrorDetail);
+        }
+        throw new Error(en_1.lib.migrate.errors.migrationFailed, {
+            cause: error,
+        });
+    }
+    if (pollResponse.status !== Migration_1.MIGRATION_STATUS.SUCCESS) {
+        throw new Error(en_1.lib.migrate.errors.migrationFailed);
     }
+    logger_1.logger.debug(util_1.default.inspect(pollResponse, { depth: null }));
     if (pollResponse.status === Migration_1.MIGRATION_STATUS.SUCCESS) {
         SpinniesManager_1.default.succeed('finishingMigration', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationComplete`),
+            text: en_1.lib.migrate.spinners.migrationComplete,
         });
-        return pollResponse.buildId;
-    }
-    else {
-        SpinniesManager_1.default.fail('finishingMigration', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.migrationFailed`),
-        });
-        if (pollResponse.status === Migration_1.MIGRATION_STATUS.FAILURE) {
-            logger_1.logger.error(pollResponse.componentErrorDetails);
-            throw new Error(pollResponse.projectErrorsDetail);
-        }
-        throw new Error((0, lang_1.i18n)('commands.project.subcommands.migrateApp.errors.migrationFailed'));
     }
+    return pollResponse.buildId;
 }
-async function downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest) {
+async function downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest, projectConfig) {
     try {
         SpinniesManager_1.default.add('fetchingMigratedProject', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.downloadingProjectContents`),
+            text: en_1.lib.migrate.spinners.downloadingProjectContents,
         });
         const { data: zippedProject } = await (0, projects_2.downloadProject)(derivedAccountId, projectName, buildId);
-        const absoluteDestPath = projectDest
-            ? path_1.default.resolve((0, path_2.getCwd)(), projectDest)
-            : (0, path_2.getCwd)();
+        let absoluteDestPath;
+        if (projectConfig?.projectConfig && projectConfig?.projectDir) {
+            const { projectDir } = projectConfig;
+            absoluteDestPath = projectDir;
+            const { srcDir } = projectConfig.projectConfig;
+            const archiveDest = path_1.default.join(projectDir, 'archive');
+            // Move the existing source directory to archive
+            fs_1.default.renameSync(path_1.default.join(projectDir, srcDir), archiveDest);
+        }
+        else {
+            absoluteDestPath = projectDest
+                ? path_1.default.resolve((0, path_2.getCwd)(), projectDest)
+                : (0, path_2.getCwd)();
+        }
         await (0, archive_1.extractZipArchive)(zippedProject, (0, path_2.sanitizeFileName)(projectName), absoluteDestPath, {
             includesRootDir: true,
             hideLogs: true,
         });
         SpinniesManager_1.default.succeed('fetchingMigratedProject', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.downloadingProjectContentsComplete`),
+            text: en_1.lib.migrate.spinners.downloadingProjectContentsComplete,
         });
         logger_1.logger.success(`Saved ${projectName} to ${projectDest}`);
     }
     catch (error) {
         SpinniesManager_1.default.fail('fetchingMigratedProject', {
-            text: (0, lang_1.i18n)(`commands.project.subcommands.migrateApp.spinners.downloadingProjectContentsFailed`),
+            text: en_1.lib.migrate.spinners.downloadingProjectContentsFailed,
         });
         throw error;
     }
 }
-async function migrateApp2025_2(derivedAccountId, options) {
+async function migrateApp2025_2(derivedAccountId, options, projectConfig) {
     SpinniesManager_1.default.init();
-    const { appIdToMigrate, projectName, projectDest } = await handleMigrationSetup(derivedAccountId, options);
+    const ungatedForUnifiedApps = await (0, hasFeature_1.hasFeature)(derivedAccountId, 'Developers:UnifiedApps:PrivateBeta');
+    if (!ungatedForUnifiedApps) {
+        throw new Error(en_1.lib.migrate.errors.notUngatedForUnifiedApps((0, ui_1.uiAccountDescription)(derivedAccountId)));
+    }
+    if (projectConfig) {
+        if (!projectConfig?.projectConfig || !projectConfig?.projectDir) {
+            throw new Error(en_1.lib.migrate.errors.project.invalidConfig);
+        }
+        const { projectExists } = await (0, projects_3.ensureProjectExists)(derivedAccountId, projectConfig.projectConfig.name, { allowCreate: false, noLogs: true });
+        if (!projectExists) {
+            throw new Error(en_1.lib.migrate.errors.project.doesNotExist);
+        }
+    }
+    const { appIdToMigrate, projectName, projectDest } = await handleMigrationSetup(derivedAccountId, options, projectConfig);
     if (!appIdToMigrate || !projectName || !projectDest) {
         return;
     }
@@ -228,15 +279,12 @@ async function migrateApp2025_2(derivedAccountId, options) {
         return;
     }
     const { migrationId, uidMap } = migrationInProgress;
-    const buildId = await finalizeMigration(derivedAccountId, migrationId, uidMap, projectName);
-    await downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest);
+    const buildId = await finalizeMigration(derivedAccountId, migrationId, uidMap, projectConfig?.projectConfig?.name || projectName);
+    await downloadProjectFiles(derivedAccountId, projectName, buildId, projectDest, projectConfig);
 }
-function logInvalidAccountError(i18nKey) {
+function logInvalidAccountError() {
     (0, ui_1.uiLine)();
-    logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.errors.invalidAccountTypeTitle`));
-    logger_1.logger.log((0, lang_1.i18n)(`${i18nKey}.errors.invalidAccountTypeDescription`, {
-        useCommand: (0, ui_1.uiCommandReference)('hs accounts use'),
-        authCommand: (0, ui_1.uiCommandReference)('hs auth'),
-    }));
+    logger_1.logger.error(en_1.lib.migrate.errors.invalidAccountTypeTitle);
+    logger_1.logger.log(en_1.lib.migrate.errors.invalidAccountTypeDescription((0, ui_1.uiCommandReference)('hs account use'), (0, ui_1.uiCommandReference)('hs auth')));
     (0, ui_1.uiLine)();
 }

package/lib/app/migrate_legacy.d.ts

@@ -1,4 +1,4 @@
 import { CLIAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { ArgumentsCamelCase } from 'yargs';
-import { MigrateAppOptions } from '../../types/Yargs';
-export declare function migrateApp2023_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppOptions>, accountConfig: CLIAccount): Promise<void>;
+import { MigrateAppArgs } from './migrate';
+export declare function migrateApp2023_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateAppArgs>, accountConfig: CLIAccount): Promise<void>;

package/lib/app/migrate_legacy.js

@@ -28,16 +28,18 @@ const migrate_1 = require("./migrate");
 async function migrateApp2023_2(derivedAccountId, options, accountConfig) {
     const accountName = (0, ui_1.uiAccountDescription)(derivedAccountId);
     if (!(0, accountTypes_1.isAppDeveloperAccount)(accountConfig)) {
-        (0, migrate_1.logInvalidAccountError)('commands.project.subcommands.migrateApp');
+        (0, migrate_1.logInvalidAccountError)();
         process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
     }
-    const { appId } = 'appId' in options
-        ? options
-        : await (0, selectPublicAppPrompt_1.selectPublicAppPrompt)({
+    let appId = options.appId;
+    if (!appId) {
+        const { appId: selectAppId } = await (0, selectPublicAppPrompt_1.selectPublicAppPrompt)({
             accountId: derivedAccountId,
             accountName,
             isMigratingApp: true,
         });
+        appId = selectAppId;
+    }
     try {
         const { data: selectedApp } = await (0, appsDev_1.fetchPublicAppMetadata)(appId, derivedAccountId);
         // preventProjectMigrations returns true if we have not added app to allowlist config.

package/lib/projects/index.d.ts

@@ -2,10 +2,11 @@ import { Project } from '@hubspot/local-dev-lib/types/Project';
 import { ProjectConfig } from '../../types/Projects';
 export declare function writeProjectConfig(configPath: string, config: ProjectConfig): boolean;
 export declare function getIsInProject(dir?: string): boolean;
-export declare function getProjectConfig(dir?: string): Promise<{
+export interface LoadedProjectConfig {
     projectDir: string | null;
     projectConfig: ProjectConfig | null;
-}>;
+}
+export declare function getProjectConfig(dir?: string): Promise<LoadedProjectConfig>;
 export declare function validateProjectConfig(projectConfig: ProjectConfig | null, projectDir: string | null): asserts projectConfig is ProjectConfig;
 export declare function ensureProjectExists(accountId: number, projectName: string, { forceCreate, allowCreate, noLogs, withPolling, uploadCommand, }?: {
     forceCreate?: boolean | undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.4.1",
+    "version": "7.4.2-beta.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",

package/types/Yargs.d.ts

@@ -27,13 +27,3 @@ export type ProjectDevArgs = CommonArgs & ConfigArgs & EnvironmentArgs;
 export type TestingArgs = {
     qa?: boolean;
 };
-export type MigrateAppOptions = CommonArgs & AccountArgs & EnvironmentArgs & ConfigArgs & {
-    name: string;
-    dest: string;
-    appId: number;
-    platformVersion: string;
-};
-export type CloneAppArgs = ConfigArgs & EnvironmentArgs & AccountArgs & CommonArgs & {
-    dest: string;
-    appId: number;
-};