Sync from internal - version 8.3.0 (#1594)

Author: joe-yeager

api/migrate.ts

@@ -130,7 +130,12 @@ function mapPlatformVersionToEnum(platformVersion: string): string {
     return PLATFORM_VERSIONS.unstable.toUpperCase();
   }
 
-  return `V${platformVersion.replace('.', '_')}`;
+  const reformattedPlatformVersion = platformVersion
+    .replaceAll('.', '_')
+    .replaceAll('-', '_')
+    .toUpperCase();
+
+  return `V${reformattedPlatformVersion}`;
 }
 
 export async function initializeAppMigration(

commands/account/auth.ts

@@ -16,6 +16,7 @@ import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { commands } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { authenticateNewAccount } from '../../lib/accountAuth.js';
+import { PromptExitError } from '../../lib/errors/PromptExitError.js';
 
 const TRACKING_STATUS = {
   STARTED: 'started',
@@ -61,11 +62,19 @@ async function handler(
 
   handleExit(deleteConfigFileIfEmpty);
 
-  const updatedConfig = await authenticateNewAccount({
-    env: args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD,
-    providedPersonalAccessKey,
-    accountId: parsedUserProvidedAccountId,
-  });
+  let updatedConfig;
+  try {
+    updatedConfig = await authenticateNewAccount({
+      env: args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD,
+      providedPersonalAccessKey,
+      accountId: parsedUserProvidedAccountId,
+    });
+  } catch (e) {
+    if (e instanceof PromptExitError) {
+      process.exit(e.exitCode);
+    }
+    throw e;
+  }
 
   if (!updatedConfig) {
     if (!disableTracking) {

commands/account/use.ts

@@ -24,6 +24,7 @@ import { CommonArgs, YargsCommandModule } from '../../types/Yargs.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 import { HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
 import { authenticateNewAccount } from '../../lib/accountAuth.js';
+import { PromptExitError } from '../../lib/errors/PromptExitError.js';
 import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 
 const command = 'use [account]';
@@ -55,10 +56,18 @@ async function handler(
   }
 
   if (newDefaultAccount === AUTHENTICATE_NEW_ACCOUNT_VALUE) {
-    const updatedConfig = await authenticateNewAccount({
-      env: args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD,
-      setAsDefaultAccount: true,
-    });
+    let updatedConfig;
+    try {
+      updatedConfig = await authenticateNewAccount({
+        env: args.qa ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD,
+        setAsDefaultAccount: true,
+      });
+    } catch (e) {
+      if (e instanceof PromptExitError) {
+        process.exit(e.exitCode);
+      }
+      throw e;
+    }
 
     if (!updatedConfig) {
       process.exit(EXIT_CODES.ERROR);

commands/app/__tests__/migrate.test.ts

@@ -111,7 +111,7 @@ describe('commands/app/migrate', () => {
           }),
           'platform-version': expect.objectContaining({
             type: 'string',
-            default: '2025.2',
+            default: '2026.03',
           }),
         })
       );
@@ -123,7 +123,7 @@ describe('commands/app/migrate', () => {
       expect(optionsSpy).toHaveBeenCalledWith(
         expect.objectContaining({
           'platform-version': expect.objectContaining({
-            default: '2025.2',
+            default: '2026.03',
           }),
         })
       );

commands/app/migrate.ts

@@ -14,7 +14,7 @@ import { migrateApp, MigrateAppArgs } from '../../lib/app/migrate.js';
 import { getIsInProject } from '../../lib/projects/config.js';
 import { makeYargsBuilder } from '../../lib/yargsUtils.js';
 
-const { v2025_2 } = PLATFORM_VERSIONS;
+const { v2025_2, v2026_03_beta, v2026_03 } = PLATFORM_VERSIONS;
 
 const command = 'migrate';
 const describe = commands.project.migrateApp.describe;
@@ -97,8 +97,8 @@ function appMigrateBuilder(yargs: Argv): Argv<MigrateAppArgs> {
     },
     'platform-version': {
       type: 'string',
-      choices: [v2025_2],
-      default: v2025_2,
+      choices: [v2025_2, v2026_03_beta, v2026_03],
+      default: v2026_03,
     },
     unstable: {
       type: 'boolean',

commands/auth.ts

@@ -36,6 +36,7 @@ import { authenticateWithOauth } from '../lib/oauth.js';
 import { EXIT_CODES } from '../lib/enums/exitCodes.js';
 import { uiFeatureHighlight } from '../lib/ui/index.js';
 import { logError } from '../lib/errorHandlers/index.js';
+import { PromptExitError } from '../lib/errors/PromptExitError.js';
 import {
   AccountArgs,
   CommonArgs,
@@ -155,14 +156,14 @@ async function handler(args: ArgumentsCamelCase<AuthArgs>): Promise<void> {
 
       break;
     case PERSONAL_ACCESS_KEY_AUTH_METHOD.value:
-      const { personalAccessKey } = providedPersonalAccessKey
-        ? { personalAccessKey: providedPersonalAccessKey }
-        : await personalAccessKeyPrompt({
-            env,
-            account: parsedUserProvidedAccountId,
-          });
-
       try {
+        const { personalAccessKey } = providedPersonalAccessKey
+          ? { personalAccessKey: providedPersonalAccessKey }
+          : await personalAccessKeyPrompt({
+              env,
+              account: parsedUserProvidedAccountId,
+            });
+
         token = await getAccessToken(personalAccessKey, env);
         defaultName = token.hubName ? toKebabCase(token.hubName) : undefined;
 
@@ -172,6 +173,9 @@ async function handler(args: ArgumentsCamelCase<AuthArgs>): Promise<void> {
           env
         );
       } catch (e) {
+        if (e instanceof PromptExitError) {
+          process.exit(e.exitCode);
+        }
         logError(e);
       }
 

commands/cms/__tests__/upload.test.ts

@@ -8,6 +8,7 @@ import * as modulesLib from '@hubspot/local-dev-lib/cms/modules';
 import * as ignoreRulesLib from '@hubspot/local-dev-lib/ignoreRules';
 import * as themesLib from '@hubspot/local-dev-lib/cms/themes';
 import * as configLib from '@hubspot/local-dev-lib/config';
+import * as handleFieldsJSLib from '@hubspot/local-dev-lib/cms/handleFieldsJS';
 import { uiLogger } from '../../../lib/ui/logger.js';
 import * as errorHandlers from '../../../lib/errorHandlers/index.js';
 import * as commonOpts from '../../../lib/commonOpts.js';
@@ -27,6 +28,7 @@ vi.mock('@hubspot/local-dev-lib/cms/modules');
 vi.mock('@hubspot/local-dev-lib/ignoreRules');
 vi.mock('@hubspot/local-dev-lib/cms/themes');
 vi.mock('@hubspot/local-dev-lib/config');
+vi.mock('@hubspot/local-dev-lib/cms/handleFieldsJS');
 vi.mock('../../../lib/errorHandlers/index.js');
 vi.mock('../../../lib/commonOpts.js');
 vi.mock('../../../lib/prompts/uploadPrompt.js');
@@ -64,6 +66,10 @@ const getConfigAccountIfExistsSpy = vi.spyOn(
   configLib,
   'getConfigAccountIfExists'
 );
+const isConvertableFieldJsSpy = vi.spyOn(
+  handleFieldsJSLib,
+  'isConvertableFieldJs'
+);
 
 describe('commands/cms/upload', () => {
   beforeEach(() => {
@@ -79,6 +85,7 @@ describe('commands/cms/upload', () => {
     getThemePreviewUrlSpy.mockReturnValue(undefined);
     // Mock config to prevent reading actual config file in CI
     getConfigAccountIfExistsSpy.mockReturnValue(undefined);
+    isConvertableFieldJsSpy.mockReturnValue(false);
   });
 
   describe('command', () => {

commands/getStarted.ts

@@ -190,7 +190,7 @@ async function handler(
         HUBSPOT_PROJECT_COMPONENTS_GITHUB_PATH,
         projectDest,
         {
-          sourceDir: '2025.2/private-app-get-started-template',
+          sourceDir: '2026.03/private-app-get-started-template',
           hideLogs: true,
         }
       );

commands/hubdb/clear.ts

@@ -1,6 +1,7 @@
 import { Argv, ArgumentsCamelCase } from 'yargs';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { PromptExitError } from '../../lib/errors/PromptExitError.js';
 import { clearHubDbTableRows } from '@hubspot/local-dev-lib/hubdb';
 import { publishTable } from '@hubspot/local-dev-lib/api/hubdb';
 import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt.js';
@@ -59,6 +60,9 @@ async function handler(
       uiLogger.log(commands.hubdb.subcommands.clear.logs.tableEmpty(tableId));
     }
   } catch (e) {
+    if (e instanceof PromptExitError) {
+      process.exit(e.exitCode);
+    }
     logError(e);
   }
 }

commands/hubdb/delete.ts

@@ -1,6 +1,7 @@
 import { Argv, ArgumentsCamelCase } from 'yargs';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { logError } from '../../lib/errorHandlers/index.js';
+import { PromptExitError } from '../../lib/errors/PromptExitError.js';
 import { deleteTable } from '@hubspot/local-dev-lib/api/hubdb';
 import { trackCommandUsage } from '../../lib/usageTracking.js';
 import { selectHubDBTablePrompt } from '../../lib/prompts/selectHubDBTablePrompt.js';
@@ -61,6 +62,9 @@ async function handler(
     );
     process.exit(EXIT_CODES.SUCCESS);
   } catch (e) {
+    if (e instanceof PromptExitError) {
+      process.exit(e.exitCode);
+    }
     uiLogger.error(
       commands.hubdb.subcommands.delete.errors.delete(args.tableId || '')
     );