@hubspot/cli 7.5.5-experimental.0 → 7.5.7-experimental.0

package/api/migrate.d.ts

@@ -55,7 +55,7 @@ export interface MigrationFailed extends MigrationBaseStatus {
 }
 export type MigrationStatus = MigrationInProgress | MigrationInputRequired | MigrationSuccess | MigrationFailed;
 export declare function isMigrationStatus(error: unknown): error is MigrationStatus;
-export declare function listAppsForMigration(accountId: number): HubSpotPromise<ListAppsResponse>;
+export declare function listAppsForMigration(accountId: number, platformVersion: string): HubSpotPromise<ListAppsResponse>;
 export declare function initializeMigration(accountId: number, applicationId: number, platformVersion: string): HubSpotPromise<InitializeMigrationResponse>;
 export declare function continueMigration(portalId: number, migrationId: number, componentUids: Record<string, string>, projectName: string): HubSpotPromise<ContinueMigrationResponse>;
 export declare function checkMigrationStatusV2(accountId: number, id: number): HubSpotPromise<MigrationStatus>;

package/api/migrate.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isMigrationStatus = isMigrationStatus;
 exports.listAppsForMigration = listAppsForMigration;
@@ -7,6 +10,8 @@ exports.continueMigration = continueMigration;
 exports.checkMigrationStatusV2 = checkMigrationStatusV2;
 const projects_1 = require("@hubspot/local-dev-lib/constants/projects");
 const http_1 = require("@hubspot/local-dev-lib/http");
+const logger_1 = require("@hubspot/local-dev-lib/logger");
+const util_1 = __importDefault(require("util"));
 const MIGRATIONS_API_PATH_V2 = 'dfs/migrations/v2';
 function isMigrationStatus(error) {
     return (typeof error === 'object' &&
@@ -14,9 +19,12 @@ function isMigrationStatus(error) {
         'id' in error &&
         'status' in error);
 }
-async function listAppsForMigration(accountId) {
+async function listAppsForMigration(accountId, platformVersion) {
     return http_1.http.get(accountId, {
         url: `${MIGRATIONS_API_PATH_V2}/list-apps`,
+        params: {
+            platformVersion: mapPlatformVersionToEnum(platformVersion),
+        },
     });
 }
 function mapPlatformVersionToEnum(platformVersion) {
@@ -44,8 +52,10 @@ async function continueMigration(portalId, migrationId, componentUids, projectNa
         },
     });
 }
-function checkMigrationStatusV2(accountId, id) {
-    return http_1.http.get(accountId, {
+async function checkMigrationStatusV2(accountId, id) {
+    const response = await http_1.http.get(accountId, {
         url: `${MIGRATIONS_API_PATH_V2}/migrations/${id}/status`,
     });
+    logger_1.logger.debug(util_1.default.inspect(response.data, { depth: null }));
+    return response;
 }

package/commands/project/migrate.d.ts

@@ -1,12 +1,11 @@
 import { ArgumentsCamelCase, Argv, CommandModule } from 'yargs';
 import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs } from '../../types/Yargs';
 export type ProjectMigrateArgs = CommonArgs & AccountArgs & EnvironmentArgs & ConfigArgs & {
-    dest?: string;
     platformVersion: string;
 };
 export declare const command = "migrate";
 export declare const describe: undefined;
-export declare function handler(options: ArgumentsCamelCase<ProjectMigrateArgs>): Promise<never>;
+export declare function handler(options: ArgumentsCamelCase<ProjectMigrateArgs>): Promise<void>;
 export declare function builder(yargs: Argv): Argv<ProjectMigrateArgs>;
 declare const migrateAppCommand: CommandModule<unknown, ProjectMigrateArgs>;
 export default migrateAppCommand;

package/lang/en.d.ts

@@ -2811,7 +2811,7 @@ export declare const lib: {
             invalidAccountTypeTitle: () => string;
             invalidAccountTypeDescription: (useCommand: any, authCommand: any) => string;
             appWithAppIdNotFound: (appId: any) => string;
-            noAppsForProject: string;
+            noAppsForProject: (projectName: string) => string;
             migrationFailed: string;
         };
         prompt: {

package/lang/en.js

@@ -2770,7 +2770,7 @@ exports.lib = {
             invalidAccountTypeTitle: () => `${chalk_1.default.bold('Developer account not targeted')}`,
             invalidAccountTypeDescription: (useCommand, authCommand) => `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.`,
             appWithAppIdNotFound: appId => `Could not find an app with the id ${appId} `,
-            noAppsForProject: 'No apps associated with project {{ projectName }}',
+            noAppsForProject: (projectName) => `No apps associated with project ${projectName}`,
             migrationFailed: 'Migration Failed',
         },
         prompt: {

package/lang/en.lyaml

@@ -651,33 +651,10 @@ en:
           componentsThatWillNotBeMigrated: "[NOTE] These component types are not yet supported for migration but will be available later: {{ components }}"
           errors:
             noAppsForProject: "No apps associated with project {{ projectName }}"
-            noAppsEligible: "No apps in account {{ accountId }} are currently migratable"
             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"
-
         cloneApp:
           describe: "Clone a public app using the projects framework."
           examples:
@@ -715,11 +692,11 @@ en:
             default: "Create a component within your project"
             withFlags: "Use --name and --type flags to bypass the prompt."
         migrate:
-            describe: "Migrate a project to the projects framework."
+            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 a project to the projects framework"
+                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.js

@@ -23,6 +23,7 @@ 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"));
 function getUnmigratableReason(reasonCode) {
     switch (reasonCode) {
         case projects_1.UNMIGRATABLE_REASONS.UP_TO_DATE:
@@ -43,20 +44,31 @@ function filterAppsByProjectName(projectConfig) {
         return !app.projectName;
     };
 }
-async function handleMigrationSetup(derivedAccountId, options, projectConfig) {
-    const { name, dest, appId } = options;
-    const { data: { migratableApps, unmigratableApps }, } = await (0, migrate_1.listAppsForMigration)(derivedAccountId);
+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 &&
+        !allApps.some(app => {
+            return app.appId === appId;
+        })) {
+        throw new Error(en_1.lib.migrate.errors.appWithAppIdNotFound(appId));
+    }
+    return allApps;
+}
+async function selectAppToMigrate(allApps, appId) {
     if (appId &&
         !allApps.some(app => {
             return app.appId === appId;
@@ -98,6 +110,15 @@ async function handleMigrationSetup(derivedAccountId, options, projectConfig) {
     }
     logger_1.logger.log();
     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 {};
     }
@@ -189,6 +210,7 @@ async function finalizeMigration(derivedAccountId, migrationId, uidMap, projectN
     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: en_1.lib.migrate.spinners.migrationComplete,
@@ -258,6 +280,6 @@ async function migrateApp2025_2(derivedAccountId, options, projectConfig) {
 function logInvalidAccountError() {
     (0, ui_1.uiLine)();
     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 accounts use'), (0, ui_1.uiCommandReference)('hs auth')));
+    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/package.json

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