@hubspot/cli 8.0.10-experimental.2 → 8.0.10-experimental.4

package/api/migrate.js

@@ -23,7 +23,11 @@ function mapPlatformVersionToEnum(platformVersion) {
     if (platformVersion === PLATFORM_VERSIONS.unstable) {
         return PLATFORM_VERSIONS.unstable.toUpperCase();
     }
-    return `V${platformVersion.replace('.', '_')}`;
+    const reformattedPlatformVersion = platformVersion
+        .replace('.', '_')
+        .replace('-', '_')
+        .toUpperCase();
+    return `V${reformattedPlatformVersion}`;
 }
 export async function initializeAppMigration(accountId, applicationId, platformVersion) {
     return http.post(accountId, {

package/commands/app/migrate.js

@@ -8,7 +8,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
 import { migrateApp } 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 } = PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = commands.project.migrateApp.describe;
 export function handlerGenerator(commandTrackingName) {
@@ -67,7 +67,7 @@ function appMigrateBuilder(yargs) {
         },
         'platform-version': {
             type: 'string',
-            choices: [v2025_2],
+            choices: [v2025_2, v2026_03_beta],
             default: v2025_2,
         },
         unstable: {

package/commands/cms/__tests__/upload.test.js

@@ -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';
@@ -26,6 +27,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');
@@ -53,6 +55,7 @@ const hasUploadErrorsSpy = vi.spyOn(uploadFolderLib, 'hasUploadErrors');
 const processExitSpy = vi.spyOn(process, 'exit');
 const logErrorSpy = vi.spyOn(errorHandlers, 'logError');
 const getConfigAccountIfExistsSpy = vi.spyOn(configLib, 'getConfigAccountIfExists');
+const isConvertableFieldJsSpy = vi.spyOn(handleFieldsJSLib, 'isConvertableFieldJs');
 describe('commands/cms/upload', () => {
     beforeEach(() => {
         // @ts-expect-error Mock implementation
@@ -67,6 +70,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', () => {
         it('should have the correct command structure', () => {

package/commands/cms/theme/preview.js

@@ -1,16 +1,12 @@
 import fs from 'fs';
 import path from 'path';
-import cliProgress from 'cli-progress';
 import { commands } from '../../../lang/en.js';
 import { getCwd } from '@hubspot/local-dev-lib/path';
-import { FILE_UPLOAD_RESULT_TYPES } from '@hubspot/local-dev-lib/constants/files';
 import { getThemeJSONPath } from '@hubspot/local-dev-lib/cms/themes';
-import { createDevServer } from '@hubspot/cms-dev-server';
-import { getUploadableFileList } from '../../../lib/upload.js';
+import { spawnDevServer } from '../../../lib/theme/cmsDevServerProcess.js';
 import { trackCommandUsage } from '../../../lib/usageTracking.js';
 import { previewPrompt, previewProjectPrompt, } from '../../../lib/prompts/previewPrompt.js';
 import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
-import { ApiErrorContext, logError } from '../../../lib/errorHandlers/index.js';
 import { getProjectConfig } from '../../../lib/projects/config.js';
 import { findProjectComponents } from '../../../lib/projects/structure.js';
 import { ComponentTypes } from '../../../types/Projects.js';
@@ -73,67 +69,16 @@ async function determineSrcAndDest(args) {
 async function handler(args) {
     const { derivedAccountId, noSsl, resetSession, port, generateFieldsTypes } = args;
     const { absoluteSrc, dest } = await determineSrcAndDest(args);
-    const filePaths = await getUploadableFileList(absoluteSrc, false);
-    function startProgressBar(numFiles) {
-        const initialUploadProgressBar = new cliProgress.SingleBar({
-            gracefulExit: true,
-            format: '[{bar}] {percentage}% | {value}/{total} | {label}',
-            hideCursor: true,
-        }, cliProgress.Presets.rect);
-        initialUploadProgressBar.start(numFiles, 0, {
-            label: commands.cms.subcommands.theme.subcommands.preview
-                .initialUploadProgressBar.start,
-        });
-        let uploadsHaveStarted = false;
-        const uploadOptions = {
-            onAttemptCallback: () => {
-                /* Intentionally blank */
-            },
-            onSuccessCallback: () => {
-                initialUploadProgressBar.increment();
-                if (!uploadsHaveStarted) {
-                    uploadsHaveStarted = true;
-                    initialUploadProgressBar.update(0, {
-                        label: commands.cms.subcommands.theme.subcommands.preview
-                            .initialUploadProgressBar.uploading,
-                    });
-                }
-            },
-            onFirstErrorCallback: () => {
-                /* Intentionally blank */
-            },
-            onRetryCallback: () => {
-                /* Intentionally blank */
-            },
-            onFinalErrorCallback: () => initialUploadProgressBar.increment(),
-            onFinishCallback: (results) => {
-                initialUploadProgressBar.update(numFiles, {
-                    label: commands.cms.subcommands.theme.subcommands.preview
-                        .initialUploadProgressBar.finish,
-                });
-                initialUploadProgressBar.stop();
-                results.forEach(result => {
-                    if (result.resultType == FILE_UPLOAD_RESULT_TYPES.FAILURE) {
-                        uiLogger.error(commands.cms.subcommands.theme.subcommands.preview.errors.uploadFailed(result.file, dest));
-                        logError(result.error, new ApiErrorContext({
-                            accountId: derivedAccountId,
-                            request: dest,
-                            payload: result.file,
-                        }));
-                    }
-                });
-            },
-        };
-        return uploadOptions;
-    }
     trackCommandUsage('preview', {}, derivedAccountId);
-    if (port) {
-        process.env['PORT'] = port.toString();
-    }
-    createDevServer(absoluteSrc, false, '', '', !noSsl, generateFieldsTypes, {
-        filePaths,
+    // Spawn dev server in isolated subprocess to avoid React version conflicts
+    // File listing and progress bars are handled within the subprocess
+    await spawnDevServer({
+        absoluteSrc,
+        accountName: derivedAccountId?.toString(),
+        noSsl,
+        port,
+        generateFieldsTypes,
         resetSession: resetSession || false,
-        startProgressBar,
         dest,
     });
 }

package/commands/project/__tests__/migrate.test.js

@@ -9,7 +9,7 @@ import { uiBetaTag, uiCommandReference } from '../../../lib/ui/index.js';
 vi.mock('../../../lib/app/migrate');
 vi.mock('../../../lib/projects/config');
 vi.mock('../../../lib/ui');
-const { v2025_2 } = PLATFORM_VERSIONS;
+const { v2025_2, v2026_03_beta, v2026_03 } = PLATFORM_VERSIONS;
 describe('commands/project/migrate', () => {
     const yargsMock = yargs;
     const optionsSpy = vi.spyOn(yargsMock, 'option').mockReturnValue(yargsMock);
@@ -48,7 +48,7 @@ describe('commands/project/migrate', () => {
             migrateCommand.builder(yargsMock);
             expect(optionsSpy).toHaveBeenCalledWith('platform-version', {
                 type: 'string',
-                choices: [v2025_2],
+                choices: [v2025_2, v2026_03_beta, v2026_03],
                 default: v2025_2,
             });
             expect(optionsSpy).toHaveBeenCalledWith('unstable', {

package/commands/project/migrate.js

@@ -9,11 +9,11 @@ import { commands, lib } from '../../lang/en.js';
 import { uiLogger } from '../../lib/ui/logger.js';
 import { renderInline } from '../../ui/render.js';
 import { getWarningBox } from '../../ui/components/StatusMessageBoxes.js';
-import { getHasMigratableThemes, migrateThemes2025_2, } from '../../lib/theme/migrate.js';
+import { getHasMigratableThemes, migrateThemesV2, } from '../../lib/theme/migrate.js';
 import { hasFeature } from '../../lib/hasFeature.js';
 import { FEATURES } from '../../lib/constants.js';
 import { trackCommandMetadataUsage, trackCommandUsage, } from '../../lib/usageTracking.js';
-const { v2025_2 } = PLATFORM_VERSIONS;
+const { v2025_2, v2026_03_beta, v2026_03 } = PLATFORM_VERSIONS;
 const command = 'migrate';
 const describe = commands.project.migrate.describe;
 async function handler(args) {
@@ -26,8 +26,8 @@ async function handler(args) {
     }
     if (projectConfig?.projectConfig) {
         await renderInline(getWarningBox({
-            title: lib.migrate.projectMigrationWarningTitle,
-            message: lib.migrate.projectMigrationWarning,
+            title: lib.migrate.projectMigrationWarningTitle(platformVersion),
+            message: lib.migrate.projectMigrationWarning(platformVersion),
         }));
     }
     try {
@@ -38,7 +38,7 @@ async function handler(args) {
                 uiLogger.error(commands.project.migrate.errors.noThemeMigrationAccess(derivedAccountId));
                 return process.exit(EXIT_CODES.ERROR);
             }
-            await migrateThemes2025_2(derivedAccountId, {
+            await migrateThemesV2(derivedAccountId, {
                 ...args,
                 platformVersion: unstable
                     ? PLATFORM_VERSIONS.unstable
@@ -67,7 +67,7 @@ function projectMigrateBuilder(yargs) {
     yargs
         .option('platform-version', {
         type: 'string',
-        choices: [v2025_2],
+        choices: [v2025_2, v2026_03_beta, v2026_03],
         default: v2025_2,
     })
         .option('unstable', {

package/lang/en.d.ts

@@ -3919,8 +3919,8 @@ export declare const lib: {
         componentsToBeMigrated: (components: string) => string;
         componentsThatWillNotBeMigrated: (components: string) => string;
         sourceContentsMoved: (newLocation: string) => string;
-        projectMigrationWarningTitle: string;
-        projectMigrationWarning: string;
+        projectMigrationWarningTitle: (platformVersion: string) => string;
+        projectMigrationWarning: (platformVersion: string) => string;
         exitWithoutMigrating: string;
         success: {
             downloadedProject: (projectName: string, projectDest: string) => string;
@@ -3977,4 +3977,14 @@ export declare const lib: {
             copyingProjectFilesFailed: string;
         };
     };
+    theme: {
+        cmsDevServerProcess: {
+            installStarted: (targetVersion: string) => string;
+            installSucceeded: string;
+            installFailed: string;
+            serverStartError: (error: Error) => string;
+            serverExit: (code: number) => string;
+            serverKill: (signal: NodeJS.Signals) => string;
+        };
+    };
 };

package/lang/en.js

@@ -3942,8 +3942,8 @@ export const lib = {
         componentsToBeMigrated: (components) => `The following features will be migrated: ${components}`,
         componentsThatWillNotBeMigrated: (components) => `[NOTE] These features are not yet supported for migration but will be available later: ${components}`,
         sourceContentsMoved: (newLocation) => `The contents of your old source directory have been moved to ${newLocation}, move any required files to the new source directory.`,
-        projectMigrationWarningTitle: 'Important: Migrating to platformVersion 2025.2 is irreversible',
-        projectMigrationWarning: uiBetaTag(`Running the ${uiCommandReference('hs project migrate')} command will permanently upgrade your project to platformVersion 2025.2. This action cannot be undone. To ensure you have access to your original files, they will be copied to a new directory (archive) for safekeeping.\n\nThis command will guide you through the process, prompting you to enter the required fields and will download the new project source code into your project source directory.`, false),
+        projectMigrationWarningTitle: (platformVersion) => `Important: Migrating to platformVersion ${platformVersion} is irreversible`,
+        projectMigrationWarning: (platformVersion) => uiBetaTag(`Running the ${uiCommandReference('hs project migrate')} command will permanently upgrade your project to platformVersion ${platformVersion}. This action cannot be undone. To ensure you have access to your original files, they will be copied to a new directory (archive) for safekeeping.\n\nThis command will guide you through the process, prompting you to enter the required fields and will download the new project source code into your project source directory.`, false),
         exitWithoutMigrating: 'Exiting without migrating',
         success: {
             downloadedProject: (projectName, projectDest) => `Saved ${projectName} to ${projectDest}`,
@@ -4000,4 +4000,14 @@ export const lib = {
             copyingProjectFilesFailed: 'Unable to copy migrated project files',
         },
     },
+    theme: {
+        cmsDevServerProcess: {
+            installStarted: (targetVersion) => `Installing cms-dev-server ${targetVersion}...`,
+            installSucceeded: 'cms-dev-server setup complete',
+            installFailed: 'Failed to install cms-dev-server',
+            serverStartError: (error) => `Failed to start dev server: ${error}`,
+            serverExit: (code) => `Dev server exited with code ${code}`,
+            serverKill: (signal) => `Dev server killed with signal ${signal}`,
+        },
+    },
 };

package/lib/__tests__/serverlessLogs.test.js

@@ -41,6 +41,7 @@ describe('lib/serverlessLogs', () => {
                 status: 200,
                 statusText: 'OK',
                 headers: {},
+                // eslint-disable-next-line
                 config: { headers: {} },
             }));
             const tailCall = vi.fn(() => Promise.resolve({
@@ -55,6 +56,7 @@ describe('lib/serverlessLogs', () => {
                 status: 200,
                 statusText: 'OK',
                 headers: {},
+                // eslint-disable-next-line
                 config: { headers: {} },
             }));
             // @ts-ignore - headers is not used in the actual function and does not need to be mocked
@@ -74,7 +76,12 @@ describe('lib/serverlessLogs', () => {
                     id: '1234',
                     executionTime: 510,
                     log: 'Log message',
-                    error: { message: '', type: '', stackTrace: [], statusCode: null },
+                    error: {
+                        message: '',
+                        type: '',
+                        stackTrace: [],
+                        statusCode: null,
+                    },
                     status: 'SUCCESS',
                     createdAt: 1620232011451,
                     memory: '70/128 MB',
@@ -83,6 +90,7 @@ describe('lib/serverlessLogs', () => {
                 status: 200,
                 statusText: 'OK',
                 headers: {},
+                // eslint-disable-next-line
                 config: { headers: {} },
             }));
             const latestLogResponse = {
@@ -119,6 +127,7 @@ describe('lib/serverlessLogs', () => {
                 status: 200,
                 statusText: 'OK',
                 headers: {},
+                // eslint-disable-next-line
                 config: { headers: {} },
             }));
             // @ts-ignore - headers is not used in the actual function and does not need to be mocked

package/lib/theme/__tests__/migrate.test.js

@@ -5,7 +5,7 @@ import { writeProjectConfig, } from '../../projects/config.js';
 import { ensureProjectExists } from '../../projects/ensureProjectExists.js';
 import { isV2Project } from '../../projects/platformVersion.js';
 import { fetchMigrationApps } from '../../app/migrate.js';
-import { getHasMigratableThemes, validateMigrationAppsAndThemes, handleThemesMigration, migrateThemes2025_2, } from '../migrate.js';
+import { getHasMigratableThemes, validateMigrationAppsAndThemes, handleThemesMigration, migrateThemesV2, } from '../migrate.js';
 import { lib } from '../../../lang/en.js';
 vi.mock('@hubspot/project-parsing-lib/themes');
 vi.mock('../../prompts/promptUtils');
@@ -144,11 +144,6 @@ describe('lib/theme/migrate', () => {
         });
     });
     describe('validateMigrationAppsAndThemes', () => {
-        it('should throw an error when themes are already migrated (v2 API)', async () => {
-            mockedUseV2Api.mockReturnValue(true);
-            const projectConfig = createLoadedProjectConfig(PROJECT_NAME);
-            await expect(validateMigrationAppsAndThemes(0, projectConfig)).rejects.toThrow(lib.migrate.errors.project.themesAlreadyMigrated);
-        });
         it('should throw an error when apps and themes are both present', async () => {
             const projectConfig = createLoadedProjectConfig(PROJECT_NAME);
             await expect(validateMigrationAppsAndThemes(1, projectConfig)).rejects.toThrow(lib.migrate.errors.project.themesAndAppsNotAllowed);
@@ -230,25 +225,25 @@ describe('lib/theme/migrate', () => {
                 projectConfig: undefined,
                 projectDir: MOCK_PROJECT_DIR,
             };
-            await expect(migrateThemes2025_2(ACCOUNT_ID, options, themeCount, invalidProjectConfig)).rejects.toThrow(lib.migrate.errors.project.invalidConfig);
+            await expect(migrateThemesV2(ACCOUNT_ID, options, themeCount, invalidProjectConfig)).rejects.toThrow(lib.migrate.errors.project.invalidConfig);
         });
         it('should throw an error when project does not exist', async () => {
             mockedEnsureProjectExists.mockResolvedValue({ projectExists: false });
-            await expect(migrateThemes2025_2(ACCOUNT_ID, options, themeCount, projectConfig)).rejects.toThrow(lib.migrate.errors.project.doesNotExist(ACCOUNT_ID));
+            await expect(migrateThemesV2(ACCOUNT_ID, options, themeCount, projectConfig)).rejects.toThrow(lib.migrate.errors.project.doesNotExist(ACCOUNT_ID));
         });
         it('should proceed with migration when user confirms', async () => {
-            await migrateThemes2025_2(ACCOUNT_ID, options, themeCount, projectConfig);
+            await migrateThemesV2(ACCOUNT_ID, options, themeCount, projectConfig);
             expect(mockedFetchMigrationApps).toHaveBeenCalledWith(ACCOUNT_ID, PLATFORM_VERSION, { projectConfig });
             expect(mockedConfirmPrompt).toHaveBeenCalledWith(lib.migrate.prompt.proceed, { defaultAnswer: false });
             expect(mockedMigrateThemes).toHaveBeenCalledWith(MOCK_PROJECT_DIR, `${MOCK_PROJECT_DIR}/src`);
         });
         it('should exit without migrating when user cancels', async () => {
             mockedConfirmPrompt.mockResolvedValue(false);
-            await migrateThemes2025_2(ACCOUNT_ID, options, themeCount, projectConfig);
+            await migrateThemesV2(ACCOUNT_ID, options, themeCount, projectConfig);
             expect(mockedMigrateThemes).not.toHaveBeenCalled();
         });
         it('should validate migration apps and themes', async () => {
-            await migrateThemes2025_2(ACCOUNT_ID, options, themeCount, projectConfig);
+            await migrateThemesV2(ACCOUNT_ID, options, themeCount, projectConfig);
             // The validation is called internally, so we verify it through the error handling
             expect(mockedFetchMigrationApps).toHaveBeenCalled();
         });

package/lib/theme/cmsDevServerProcess.d.ts

@@ -0,0 +1,12 @@
+import { ChildProcess } from 'child_process';
+interface DevServerOptions {
+    absoluteSrc: string;
+    accountName?: string;
+    noSsl?: boolean;
+    port?: number;
+    generateFieldsTypes?: boolean;
+    resetSession?: boolean;
+    dest: string;
+}
+export declare function spawnDevServer(options: DevServerOptions): Promise<ChildProcess>;
+export {};

package/lib/theme/cmsDevServerProcess.js

@@ -0,0 +1,148 @@
+import { spawn } from 'child_process';
+import path from 'path';
+import fs from 'fs';
+import os from 'os';
+import { fileURLToPath } from 'url';
+import { getConfigFilePath } from '@hubspot/local-dev-lib/config';
+import SpinniesManager from '../ui/SpinniesManager.js';
+import { lib } from '../../lang/en.js';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+// cms-dev-server version to install to isolated cache
+const TARGET_CMS_DEV_SERVER_VERSION = '1.2.16';
+/**
+ * Ensures cms-dev-server is installed in an isolated cache directory.
+ * This prevents React version conflicts with the CLI.
+ */
+async function ensureCmsDevServerCache(targetVersion) {
+    const cacheDir = path.join(os.homedir(), '.hscli', '.module-cache');
+    const packageJsonPath = path.join(cacheDir, 'node_modules', '@hubspot', 'cms-dev-server', 'package.json');
+    // Check if already installed with correct version
+    let needsInstall = true;
+    if (fs.existsSync(packageJsonPath)) {
+        try {
+            const installedPackage = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+            if (installedPackage.version === targetVersion) {
+                needsInstall = false;
+            }
+        }
+        catch (e) {
+            // If we can't read the package.json, reinstall
+            needsInstall = true;
+        }
+    }
+    if (needsInstall) {
+        // Show spinner during install (can take 10-30 seconds)
+        SpinniesManager.init({
+            succeedColor: 'white',
+        });
+        SpinniesManager.add('cms-dev-server-install', {
+            text: lib.theme.cmsDevServerProcess.installStarted(targetVersion),
+        });
+        // Create cache directory
+        fs.mkdirSync(cacheDir, { recursive: true });
+        // Clear old installation if exists
+        const nodeModulesDir = path.join(cacheDir, 'node_modules');
+        if (fs.existsSync(nodeModulesDir)) {
+            fs.rmSync(nodeModulesDir, { recursive: true, force: true });
+        }
+        // Install cms-dev-server with production dependencies only (async to allow spinner)
+        await new Promise((resolve, reject) => {
+            const installProcess = spawn('npm', [
+                'install',
+                `@hubspot/cms-dev-server@${targetVersion}`,
+                '--production',
+                '--no-save',
+                '--loglevel=error',
+            ], {
+                cwd: cacheDir,
+                stdio: 'ignore', // Suppress npm output
+            });
+            installProcess.on('close', code => {
+                if (code === 0) {
+                    SpinniesManager.succeed('cms-dev-server-install', {
+                        text: lib.theme.cmsDevServerProcess.installSucceeded,
+                    });
+                    resolve();
+                }
+                else {
+                    SpinniesManager.fail('cms-dev-server-install', {
+                        text: lib.theme.cmsDevServerProcess.installFailed,
+                    });
+                    reject(new Error(lib.theme.cmsDevServerProcess.installFailed));
+                }
+            });
+            installProcess.on('error', error => {
+                SpinniesManager.fail('cms-dev-server-install', {
+                    text: lib.theme.cmsDevServerProcess.installFailed,
+                });
+                reject(error);
+            });
+        });
+    }
+    return cacheDir;
+}
+export async function spawnDevServer(options) {
+    const { absoluteSrc, accountName, noSsl, port, generateFieldsTypes, resetSession, dest, } = options;
+    // Ensure cms-dev-server is installed in isolated cache
+    const cacheDir = await ensureCmsDevServerCache(TARGET_CMS_DEV_SERVER_VERSION);
+    // Get config path to pass to createDevServer
+    let configPath = '';
+    try {
+        configPath = process.env.HUBSPOT_CONFIG_PATH || getConfigFilePath();
+    }
+    catch (e) {
+        // Config file doesn't exist - cms-dev-server will handle this gracefully
+    }
+    // Copy the runner script to the cache directory so imports resolve from there
+    // This is critical: Node resolves ES module imports relative to the script location,
+    // not the cwd. By copying the script to the cache directory, imports will resolve
+    // from the cache's node_modules (React 18) instead of the CLI's node_modules (React 19)
+    const sourceRunnerPath = path.join(__dirname, 'cmsDevServerRunner.js');
+    const targetRunnerPath = path.join(cacheDir, 'cmsPreviewRunner.js');
+    fs.copyFileSync(sourceRunnerPath, targetRunnerPath);
+    // Set environment variables to pass configuration to the runner script
+    const env = { ...process.env };
+    env.CMS_DEV_SERVER_SRC = absoluteSrc;
+    env.CMS_DEV_SERVER_DEST = dest;
+    env.CMS_DEV_SERVER_CONFIG = configPath;
+    env.CMS_DEV_SERVER_ACCOUNT = accountName || '';
+    env.CMS_DEV_SERVER_SSL = (!noSsl).toString();
+    env.CMS_DEV_SERVER_FIELD_GEN = Boolean(generateFieldsTypes).toString();
+    env.CMS_DEV_SERVER_RESET_SESSION = Boolean(resetSession).toString();
+    if (port) {
+        env.PORT = port.toString();
+    }
+    // Suppress Node.js deprecation warnings
+    env.NODE_NO_WARNINGS = '1';
+    // Spawn Node with the runner script from the isolated cache directory
+    // This ensures complete isolation from CLI's React 19
+    const devServer = spawn('node', [targetRunnerPath], {
+        stdio: 'inherit',
+        env,
+        cwd: cacheDir,
+    });
+    // Handle process events
+    devServer.on('error', error => {
+        console.error(lib.theme.cmsDevServerProcess.serverStartError(error));
+        process.exit(1);
+    });
+    devServer.on('exit', (code, signal) => {
+        if (code !== 0 && code !== null) {
+            console.error(lib.theme.cmsDevServerProcess.serverExit(code));
+            process.exit(code);
+        }
+        if (signal) {
+            console.error(lib.theme.cmsDevServerProcess.serverKill(signal));
+            process.exit(1);
+        }
+    });
+    // Handle CLI termination
+    process.once('SIGINT', () => {
+        devServer.kill('SIGINT');
+    });
+    process.once('SIGTERM', () => {
+        devServer.kill('SIGTERM');
+    });
+    return devServer;
+}

package/lib/theme/cmsDevServerRunner.d.ts

@@ -0,0 +1,14 @@
+/**
+ * This script runs in an isolated cache directory with cms-dev-server installed.
+ * It is spawned as a separate process to avoid React version conflicts with the CLI.
+ *
+ * Arguments are passed via environment variables:
+ * - CMS_DEV_SERVER_SRC: Source directory path
+ * - CMS_DEV_SERVER_DEST: Destination path
+ * - CMS_DEV_SERVER_CONFIG: Config file path (optional)
+ * - CMS_DEV_SERVER_ACCOUNT: Account name (optional)
+ * - CMS_DEV_SERVER_SSL: 'true' or 'false'
+ * - CMS_DEV_SERVER_FIELD_GEN: 'true' or 'false'
+ * - CMS_DEV_SERVER_RESET_SESSION: 'true' or 'false'
+ */
+export {};

package/lib/theme/cmsDevServerRunner.js

@@ -0,0 +1,90 @@
+// @ts-nocheck
+/**
+ * This script runs in an isolated cache directory with cms-dev-server installed.
+ * It is spawned as a separate process to avoid React version conflicts with the CLI.
+ *
+ * Arguments are passed via environment variables:
+ * - CMS_DEV_SERVER_SRC: Source directory path
+ * - CMS_DEV_SERVER_DEST: Destination path
+ * - CMS_DEV_SERVER_CONFIG: Config file path (optional)
+ * - CMS_DEV_SERVER_ACCOUNT: Account name (optional)
+ * - CMS_DEV_SERVER_SSL: 'true' or 'false'
+ * - CMS_DEV_SERVER_FIELD_GEN: 'true' or 'false'
+ * - CMS_DEV_SERVER_RESET_SESSION: 'true' or 'false'
+ */
+// Suppress library deprecation warnings (e.g., body-parser)
+process.noDeprecation = true;
+// Dynamic imports to use the isolated cms-dev-server installation
+const { createDevServer } = await import('@hubspot/cms-dev-server');
+const { walk } = await import('@hubspot/local-dev-lib/fs');
+const { createIgnoreFilter } = await import('@hubspot/local-dev-lib/ignoreRules');
+const { isAllowedExtension } = await import('@hubspot/local-dev-lib/path');
+const { FILE_UPLOAD_RESULT_TYPES } = await import('@hubspot/local-dev-lib/constants/files');
+const cliProgress = (await import('cli-progress')).default;
+// Read configuration from environment variables
+const src = process.env.CMS_DEV_SERVER_SRC;
+const dest = process.env.CMS_DEV_SERVER_DEST;
+const configPath = process.env.CMS_DEV_SERVER_CONFIG || '';
+const accountName = process.env.CMS_DEV_SERVER_ACCOUNT || '';
+const sslEnabled = process.env.CMS_DEV_SERVER_SSL === 'true';
+const fieldGenEnabled = process.env.CMS_DEV_SERVER_FIELD_GEN === 'true';
+const resetSession = process.env.CMS_DEV_SERVER_RESET_SESSION === 'true';
+// Get uploadable files for preview
+let filePaths = [];
+try {
+    filePaths = await walk(src);
+}
+catch (e) {
+    console.error('Error walking directory:', e);
+}
+filePaths = filePaths
+    .filter(file => isAllowedExtension(file))
+    .filter(createIgnoreFilter(false));
+// Create progress bar for initial upload
+function startProgressBar(numFiles) {
+    const initialUploadProgressBar = new cliProgress.SingleBar({
+        gracefulExit: true,
+        format: '[{bar}] {percentage}% | {value}/{total} | {label}',
+        hideCursor: true,
+    }, cliProgress.Presets.rect);
+    initialUploadProgressBar.start(numFiles, 0, {
+        label: 'Preparing upload...',
+    });
+    let uploadsHaveStarted = false;
+    return {
+        onAttemptCallback: () => { },
+        onSuccessCallback: () => {
+            initialUploadProgressBar.increment();
+            if (!uploadsHaveStarted) {
+                uploadsHaveStarted = true;
+                initialUploadProgressBar.update(0, {
+                    label: 'Uploading files...',
+                });
+            }
+        },
+        onFirstErrorCallback: () => { },
+        onRetryCallback: () => { },
+        onFinalErrorCallback: () => initialUploadProgressBar.increment(),
+        // eslint-disable-next-line
+        onFinishCallback: (results) => {
+            initialUploadProgressBar.update(numFiles, {
+                label: 'Upload complete',
+            });
+            initialUploadProgressBar.stop();
+            results.forEach(result => {
+                if (result.resultType === FILE_UPLOAD_RESULT_TYPES.FAILURE) {
+                    console.error(`Failed to upload ${result.file}`);
+                }
+            });
+        },
+    };
+}
+const themePreviewOptions = {
+    filePaths,
+    startProgressBar,
+    resetSession,
+    dest,
+};
+createDevServer(src, false, // storybook
+configPath, accountName, sslEnabled, fieldGenEnabled, themePreviewOptions);
+export {};

package/lib/theme/migrate.d.ts

@@ -10,4 +10,4 @@ export declare function getHasMigratableThemes(projectConfig?: LoadedProjectConf
 }>;
 export declare function validateMigrationAppsAndThemes(hasApps: number, projectConfig?: LoadedProjectConfig): Promise<void>;
 export declare function handleThemesMigration(projectConfig: LoadedProjectConfig, platformVersion: string): Promise<void>;
-export declare function migrateThemes2025_2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateThemesArgs>, themeCount: number, projectConfig: LoadedProjectConfig): Promise<void>;
+export declare function migrateThemesV2(derivedAccountId: number, options: ArgumentsCamelCase<MigrateThemesArgs>, themeCount: number, projectConfig: LoadedProjectConfig): Promise<void>;

package/lib/theme/migrate.js

@@ -7,7 +7,6 @@ import { lib } from '../../lang/en.js';
 import { PROJECT_CONFIG_FILE } from '../constants.js';
 import { uiLogger } from '../ui/logger.js';
 import { debugError } from '../errorHandlers/index.js';
-import { isV2Project } from '../projects/platformVersion.js';
 import { confirmPrompt } from '../prompts/promptUtils.js';
 import { fetchMigrationApps } from '../app/migrate.js';
 export async function getHasMigratableThemes(projectConfig) {
@@ -22,9 +21,6 @@ export async function getHasMigratableThemes(projectConfig) {
     };
 }
 export async function validateMigrationAppsAndThemes(hasApps, projectConfig) {
-    if (isV2Project(projectConfig?.projectConfig?.platformVersion)) {
-        throw new Error(lib.migrate.errors.project.themesAlreadyMigrated);
-    }
     if (hasApps > 0 && projectConfig) {
         throw new Error(lib.migrate.errors.project.themesAndAppsNotAllowed);
     }
@@ -61,7 +57,7 @@ export async function handleThemesMigration(projectConfig, platformVersion) {
     uiLogger.log('');
     uiLogger.log(lib.migrate.success.themesMigrationSuccess(platformVersion));
 }
-export async function migrateThemes2025_2(derivedAccountId, options, themeCount, projectConfig) {
+export async function migrateThemesV2(derivedAccountId, options, themeCount, projectConfig) {
     if (!projectConfig?.projectConfig || !projectConfig?.projectDir) {
         throw new Error(lib.migrate.errors.project.invalidConfig);
     }

package/lib/usageTracking.js

@@ -44,11 +44,14 @@ export async function trackCommandUsage(command, meta = {}, accountId) {
     uiLogger.debug(`Attempting to track usage of "${command}" command`);
     let authType = 'unknown';
     if (accountId) {
-        const accountConfig = getConfigAccountById(accountId);
-        authType =
-            accountConfig && accountConfig.authType
-                ? accountConfig.authType
-                : API_KEY_AUTH_METHOD.value;
+        try {
+            const accountConfig = getConfigAccountById(accountId);
+            authType =
+                accountConfig && accountConfig.authType
+                    ? accountConfig.authType
+                    : API_KEY_AUTH_METHOD.value;
+        }
+        catch (e) { }
     }
     return trackCliInteraction({
         action: 'cli-command',

package/package.json

@@ -1,14 +1,13 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.0.10-experimental.2",
+    "version": "8.0.10-experimental.4",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "type": "module",
     "dependencies": {
-        "@hubspot/cms-dev-server": "1.2.16",
-        "@hubspot/local-dev-lib": "5.1.2",
-        "@hubspot/project-parsing-lib": "0.2.0-experimental.2",
+        "@hubspot/local-dev-lib": "5.2.0",
+        "@hubspot/project-parsing-lib": "0.12.1",
         "@hubspot/serverless-dev-runtime": "7.0.7",
         "@hubspot/ui-extensions-dev-server": "2.0.0",
         "@inquirer/prompts": "7.1.0",