@hubspot/cli 7.8.0-experimental.0 → 7.8.0

package/lib/projects/localDev/LocalDevLogger.js

@@ -1,6 +1,5 @@
 import { getAccountId, hasLocalStateFlag } from '@hubspot/local-dev-lib/config';
 import { getConfigDefaultAccount } from '@hubspot/local-dev-lib/config';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { uiLogger } from '../../ui/logger.js';
 import { uiBetaTag, uiLine, uiAccountDescription, uiCommandReference, } from '../../ui/index.js';
 import { lib } from '../../../lang/en.js';
@@ -26,7 +25,7 @@ class LocalDevLogger {
     }
     handleError(e, langFunction) {
         if (this.state.debug) {
-            logger.error(e);
+            uiLogger.error(e instanceof Error ? e.message : String(e));
         }
         uiLogger.error(langFunction(e instanceof Error ? e.message : ''));
     }
@@ -112,20 +111,42 @@ class LocalDevLogger {
     uploadInitiated() {
         uiLogger.log(lib.LocalDevProcess.uploadInitiated);
     }
+    deployInitiated() {
+        uiLogger.log(lib.LocalDevProcess.deployInitiated);
+    }
     projectConfigMismatch() {
         uiLogger.log(lib.LocalDevProcess.projectConfigMismatch);
     }
     uploadError(error) {
-        logger.log('');
+        uiLogger.log('');
         logError(error);
         uiLogger.log(lib.LocalDevProcess.uploadFailed);
-        logger.log('');
+        uiLogger.log('');
     }
     uploadSuccess() {
-        logger.log('');
+        uiLogger.log('');
         uiLogger.log(lib.LocalDevProcess.uploadSuccess);
         uiLine();
-        logger.log('');
+        uiLogger.log('');
+    }
+    uploadSuccessAutoDeployDisabled() {
+        uiLogger.warn(lib.LocalDevProcess.uploadSuccessAutoDeployDisabled);
+        uiLine();
+        uiLogger.log('');
+    }
+    deployError(error) {
+        uiLogger.log('');
+        if (error) {
+            logError(error);
+        }
+        uiLogger.log(lib.LocalDevProcess.deployFailed);
+        uiLogger.log('');
+    }
+    deploySuccess() {
+        uiLogger.log('');
+        uiLogger.log(lib.LocalDevProcess.deploySuccess);
+        uiLine();
+        uiLogger.log('');
     }
     monitorConsoleOutput() {
         const originalStdoutWrite = process.stdout.write.bind(process.stdout);

package/lib/projects/localDev/{LocalDevManager.js → LocalDevManager_DEPRECATED.js}

@@ -4,13 +4,12 @@ import chalk from 'chalk';
 import { fetchAppInstallationData } from '@hubspot/local-dev-lib/api/localDevAuth';
 import { fetchPublicAppsForPortal, fetchPublicAppProductionInstallCounts, } from '@hubspot/local-dev-lib/api/appsDev';
 import { getAccountId, getConfigDefaultAccount, } from '@hubspot/local-dev-lib/config';
-import { logger } from '@hubspot/local-dev-lib/logger';
 import { PROJECT_CONFIG_FILE } from '../../constants.js';
 import SpinniesManager from '../../ui/SpinniesManager.js';
-import DevServerManager from './DevServerManager.js';
+import DevServerManager_DEPRECATED from './DevServerManager_DEPRECATED.js';
 import { EXIT_CODES } from '../../enums/exitCodes.js';
 import { getAccountHomeUrl } from '../urls.js';
-import { componentIsApp, componentIsPublicApp, CONFIG_FILES, getAppCardConfigs, getComponentUid, } from '../../projects/structure.js';
+import { componentIsApp, componentIsPublicApp, CONFIG_FILES, getAppCardConfigs, getComponentUid, } from '../structure.js';
 import { ComponentTypes, } from '../../../types/Projects.js';
 import { UI_COLORS, uiCommandReference, uiAccountDescription, uiBetaTag, uiLink, uiLine, } from '../../ui/index.js';
 import { logError } from '../../errorHandlers/index.js';
@@ -314,7 +313,7 @@ class LocalDevManager {
     }
     async devServerSetup() {
         try {
-            await DevServerManager.setup({
+            await DevServerManager_DEPRECATED.setup({
                 components: this.runnableComponents,
                 onUploadRequired: this.logUploadWarning.bind(this),
                 accountId: this.targetAccountId,
@@ -324,7 +323,7 @@ class LocalDevManager {
         }
         catch (e) {
             if (this.debug) {
-                logger.error(e);
+                uiLogger.error(e instanceof Error ? e.message : String(e));
             }
             uiLogger.error(lib.LocalDevManager.devServer.setupError(e instanceof Error ? e.message : ''));
             return false;
@@ -332,14 +331,14 @@ class LocalDevManager {
     }
     async devServerStart() {
         try {
-            await DevServerManager.start({
+            await DevServerManager_DEPRECATED.start({
                 accountId: this.targetAccountId,
                 projectConfig: this.projectConfig,
             });
         }
         catch (e) {
             if (this.debug) {
-                logger.error(e);
+                uiLogger.error(e instanceof Error ? e.message : String(e));
             }
             uiLogger.error(lib.LocalDevManager.devServer.startError(e instanceof Error ? e.message : ''));
             process.exit(EXIT_CODES.ERROR);
@@ -347,23 +346,23 @@ class LocalDevManager {
     }
     devServerFileChange(filePath, event) {
         try {
-            DevServerManager.fileChange({ filePath, event });
+            DevServerManager_DEPRECATED.fileChange({ filePath, event });
         }
         catch (e) {
             if (this.debug) {
-                logger.error(e);
+                uiLogger.error(e instanceof Error ? e.message : String(e));
             }
             uiLogger.error(lib.LocalDevManager.devServer.fileChangeError(e instanceof Error ? e.message : ''));
         }
     }
     async devServerCleanup() {
         try {
-            await DevServerManager.cleanup();
+            await DevServerManager_DEPRECATED.cleanup();
             return true;
         }
         catch (e) {
             if (this.debug) {
-                logger.error(e);
+                uiLogger.error(e instanceof Error ? e.message : String(e));
             }
             uiLogger.error(lib.LocalDevManager.devServer.cleanupError(e instanceof Error ? e.message : ''));
             return false;

package/lib/projects/localDev/LocalDevProcess.d.ts

@@ -1,15 +1,15 @@
 import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types.js';
+import { Project } from '@hubspot/local-dev-lib/types/Project';
 import LocalDevState from './LocalDevState.js';
 import LocalDevLogger from './LocalDevLogger.js';
-import { LocalDevStateConstructorOptions, LocalDevStateListener, LocalDevServerMessage } from '../../../types/LocalDev.js';
+import { LocalDevStateConstructorOptions, LocalDevStateListener, LocalDevServerMessage, LocalDevProjectUploadResult, LocalDevProjectDeployResult } from '../../../types/LocalDev.js';
 declare class LocalDevProcess {
     private state;
     private _logger;
     private devServerManager;
     constructor(options: LocalDevStateConstructorOptions);
     get projectDir(): string;
-    get projectId(): number;
-    get projectName(): string;
+    get projectData(): Project;
     get targetProjectAccountId(): number;
     get targetTestingAccountId(): number;
     get projectNodes(): {
@@ -22,13 +22,15 @@ declare class LocalDevProcess {
     private projectConfigValidForUpload;
     private getIntermediateRepresentation;
     private updateProjectNodes;
-    private updateProjectNodesAfterUpload;
+    private updateProjectNodesAfterDeploy;
     private openLocalDevUi;
+    private updateProjectData;
     handleFileChange(filePath: string, event: string): Promise<void>;
     handleConfigFileChange(): Promise<void>;
     start(): Promise<void>;
     stop(showProgress?: boolean): Promise<void>;
-    uploadProject(): Promise<boolean>;
+    uploadProject(): Promise<LocalDevProjectUploadResult>;
+    deployLatestBuild(force?: boolean): Promise<LocalDevProjectDeployResult>;
     addStateListener<K extends keyof LocalDevState>(key: K, listener: LocalDevStateListener<K>): void;
     sendDevServerMessage(message: LocalDevServerMessage): void;
     removeStateListener<K extends keyof LocalDevState>(key: K, listener: LocalDevStateListener<K>): void;

package/lib/projects/localDev/LocalDevProcess.js

@@ -1,17 +1,21 @@
 import { translateForLocalDev } from '@hubspot/project-parsing-lib';
 import { hasLocalStateFlag } from '@hubspot/local-dev-lib/config';
+import { fetchProject } from '@hubspot/local-dev-lib/api/projects';
 import path from 'path';
 import open from 'open';
 import LocalDevState from './LocalDevState.js';
 import LocalDevLogger from './LocalDevLogger.js';
-import DevServerManagerV2 from './DevServerManagerV2.js';
+import DevServerManager from './DevServerManager.js';
 import { EXIT_CODES } from '../../enums/exitCodes.js';
 import { getProjectConfig } from '../config.js';
 import { handleProjectUpload } from '../upload.js';
+import { handleProjectDeploy } from '../deploy.js';
 import { pollProjectBuildAndDeploy } from '../pollProjectBuildAndDeploy.js';
 import { getLocalDevUiUrl } from '../urls.js';
-import { CONFIG_LOCAL_STATE_FLAGS } from '../../constants.js';
+import { CONFIG_LOCAL_STATE_FLAGS, PROJECT_DEPLOY_STATES, } from '../../constants.js';
 import { isAutoOpenBrowserEnabled } from '../../configOptions.js';
+import { lib } from '../../../lang/en.js';
+import { debugError } from '../../errorHandlers/index.js';
 class LocalDevProcess {
     state;
     _logger;
@@ -19,7 +23,7 @@ class LocalDevProcess {
     constructor(options) {
         this.state = new LocalDevState(options);
         this._logger = new LocalDevLogger(this.state);
-        this.devServerManager = new DevServerManagerV2({
+        this.devServerManager = new DevServerManager({
             localDevState: this.state,
             logger: this._logger,
         });
@@ -27,11 +31,8 @@ class LocalDevProcess {
     get projectDir() {
         return this.state.projectDir;
     }
-    get projectId() {
-        return this.state.projectId;
-    }
-    get projectName() {
-        return this.state.projectName;
+    get projectData() {
+        return this.state.projectData;
     }
     get targetProjectAccountId() {
         return this.state.targetProjectAccountId;
@@ -87,34 +88,43 @@ class LocalDevProcess {
         });
         return true;
     }
-    getIntermediateRepresentation(projectNodesAtLastUpload) {
+    getIntermediateRepresentation(projectNodesAtLastDeploy) {
         return translateForLocalDev({
             projectSourceDir: path.join(this.state.projectDir, this.state.projectConfig.srcDir),
             platformVersion: this.state.projectConfig.platformVersion,
             accountId: this.state.targetProjectAccountId,
         }, {
-            projectNodesAtLastUpload,
+            projectNodesAtLastUpload: projectNodesAtLastDeploy,
             profile: this.state.profile,
         });
     }
     async updateProjectNodes() {
-        const intermediateRepresentation = await this.getIntermediateRepresentation(this.state.projectNodesAtLastUpload);
+        const intermediateRepresentation = await this.getIntermediateRepresentation(this.state.projectNodesAtLastDeploy);
         this.state.projectNodes =
             intermediateRepresentation.intermediateNodesIndexedByUid;
         this.state.projectProfileData = intermediateRepresentation.profileData;
     }
-    async updateProjectNodesAfterUpload() {
+    async updateProjectNodesAfterDeploy() {
         const intermediateRepresentation = await this.getIntermediateRepresentation();
         this.state.projectNodes =
             intermediateRepresentation.intermediateNodesIndexedByUid;
         this.state.projectProfileData = intermediateRepresentation.profileData;
-        this.state.projectNodesAtLastUpload =
+        this.state.projectNodesAtLastDeploy =
             intermediateRepresentation.intermediateNodesIndexedByUid;
     }
     openLocalDevUi() {
         const showWelcomeScreen = !hasLocalStateFlag(CONFIG_LOCAL_STATE_FLAGS.LOCAL_DEV_UI_WELCOME);
         open(getLocalDevUiUrl(this.state.targetTestingAccountId, showWelcomeScreen));
     }
+    async updateProjectData() {
+        try {
+            const { data: projectData } = await fetchProject(this.state.targetProjectAccountId, this.state.projectConfig.name);
+            this.state.projectData = projectData;
+        }
+        catch (e) {
+            debugError(e);
+        }
+    }
     async handleFileChange(filePath, event) {
         await this.updateProjectNodes();
         try {
@@ -139,6 +149,7 @@ class LocalDevProcess {
             this.openLocalDevUi();
         }
         await this.startDevServers();
+        this.state.devServersStarted = true;
         this.logger.monitorConsoleOutput();
     }
     async stop(showProgress = true) {
@@ -162,24 +173,85 @@ class LocalDevProcess {
         const isUploadable = await this.projectConfigValidForUpload();
         if (!isUploadable) {
             this.logger.projectConfigMismatch();
-            return false;
+            return {
+                uploadSuccess: false,
+                buildSuccess: false,
+                deploySuccess: false,
+            };
         }
-        const { uploadError } = await handleProjectUpload({
+        const { uploadError, result } = await handleProjectUpload({
             accountId: this.state.targetProjectAccountId,
             projectConfig: this.state.projectConfig,
             projectDir: this.state.projectDir,
             callbackFunc: pollProjectBuildAndDeploy,
             sendIR: true,
-            skipValidation: true,
         });
+        const deploy = result?.deployResult;
         if (uploadError) {
             this.logger.uploadError(uploadError);
-            return false;
+            return {
+                uploadSuccess: false,
+                buildSuccess: false,
+                deploySuccess: false,
+                deployId: deploy?.deployId,
+            };
         }
-        await this.updateProjectNodesAfterUpload();
-        this.logger.uploadSuccess();
-        this.state.clearUploadWarnings();
-        return true;
+        await this.updateProjectData();
+        if (deploy && deploy.status === PROJECT_DEPLOY_STATES.FAILURE) {
+            return {
+                uploadSuccess: false,
+                buildSuccess: true,
+                deploySuccess: false,
+                deployId: deploy.deployId,
+            };
+        }
+        else if (!deploy) {
+            this.logger.uploadSuccessAutoDeployDisabled();
+        }
+        else {
+            await this.updateProjectNodesAfterDeploy();
+            this.state.clearUploadWarnings();
+            this.logger.uploadSuccess();
+        }
+        return {
+            uploadSuccess: true,
+            buildSuccess: true,
+            deploySuccess: Boolean(deploy),
+            deployId: deploy?.deployId,
+        };
+    }
+    async deployLatestBuild(force = false) {
+        this.logger.deployInitiated();
+        if (!this.state.projectData.latestBuild) {
+            this.logger.deployError(lib.LocalDevProcess.noBuildToDeploy);
+            return {
+                success: false,
+            };
+        }
+        let deploy;
+        try {
+            deploy = await handleProjectDeploy(this.state.targetProjectAccountId, this.state.projectConfig.name, this.state.projectData.latestBuild.buildId, true, force);
+        }
+        catch (error) {
+            this.logger.deployError(error);
+            return {
+                success: false,
+            };
+        }
+        const success = deploy?.status === PROJECT_DEPLOY_STATES.SUCCESS;
+        if (success) {
+            await this.updateProjectData();
+            this.logger.deploySuccess();
+            await this.updateProjectNodesAfterDeploy();
+            this.state.clearUploadWarnings();
+        }
+        else {
+            this.logger.deployError();
+        }
+        return {
+            success,
+            deployId: deploy?.deployId,
+        };
     }
     addStateListener(key, listener) {
         this.state.addListener(key, listener);

package/lib/projects/localDev/LocalDevState.d.ts

@@ -1,5 +1,6 @@
 import { IntermediateRepresentationNodeLocalDev, HSProfileVariables } from '@hubspot/project-parsing-lib/src/lib/types.js';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
+import { Project } from '@hubspot/local-dev-lib/types/Project';
 import { ProjectConfig } from '../../../types/Projects.js';
 import { LocalDevStateConstructorOptions, LocalDevStateListener, AppLocalDevData, LocalDevServerMessage } from '../../../types/LocalDev.js';
 declare class LocalDevState {
@@ -8,26 +9,24 @@ declare class LocalDevState {
     private _profile?;
     private _projectConfig;
     private _projectDir;
-    private _projectId;
-    private _projectName;
+    private _projectData;
     private _debug;
     private _projectNodes;
     private _projectProfileData;
-    private _projectNodesAtLastUpload;
+    private _projectNodesAtLastDeploy;
     private _env;
     private _listeners;
     private _appData;
     private _devServerMessage;
     private _uploadWarnings;
-    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, initialProjectNodes, initialProjectProfileData, profile, env, }: LocalDevStateConstructorOptions);
+    private _devServersStarted;
+    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectData, debug, initialProjectNodes, initialProjectProfileData, profile, env, }: LocalDevStateConstructorOptions);
     private runListeners;
     get targetProjectAccountId(): number;
     get targetTestingAccountId(): number;
     get profile(): string | undefined;
     get projectConfig(): ProjectConfig;
     get projectDir(): string;
-    get projectId(): number;
-    get projectName(): string;
     get debug(): boolean;
     get projectNodes(): {
         [key: string]: IntermediateRepresentationNodeLocalDev;
@@ -37,12 +36,15 @@ declare class LocalDevState {
     });
     get projectProfileData(): HSProfileVariables;
     set projectProfileData(profileData: HSProfileVariables);
-    get projectNodesAtLastUpload(): {
+    get projectNodesAtLastDeploy(): {
         [key: string]: IntermediateRepresentationNodeLocalDev;
     };
-    set projectNodesAtLastUpload(nodes: {
+    set projectNodesAtLastDeploy(nodes: {
         [key: string]: IntermediateRepresentationNodeLocalDev;
     });
+    get projectData(): Project;
+    get projectId(): number;
+    set projectData(projectData: Project);
     get env(): Environment;
     get appData(): Record<string, AppLocalDevData>;
     getAppDataByUid(uid: string): AppLocalDevData | undefined;
@@ -50,6 +52,8 @@ declare class LocalDevState {
     get devServerMessage(): string;
     set devServerMessage(message: LocalDevServerMessage);
     get uploadWarnings(): Set<string>;
+    get devServersStarted(): boolean;
+    set devServersStarted(started: boolean);
     addUploadWarning(warning: string): void;
     clearUploadWarnings(): void;
     addListener<K extends keyof LocalDevState>(key: K, listener: LocalDevStateListener<K>): void;

package/lib/projects/localDev/LocalDevState.js

@@ -5,33 +5,33 @@ class LocalDevState {
     _profile;
     _projectConfig;
     _projectDir;
-    _projectId;
-    _projectName;
+    _projectData;
     _debug;
     _projectNodes;
     _projectProfileData;
-    _projectNodesAtLastUpload;
+    _projectNodesAtLastDeploy;
     _env;
     _listeners;
     _appData;
     _devServerMessage;
     _uploadWarnings;
-    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, initialProjectNodes, initialProjectProfileData, profile, env, }) {
+    _devServersStarted;
+    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectData, debug, initialProjectNodes, initialProjectProfileData, profile, env, }) {
         this._targetProjectAccountId = targetProjectAccountId;
         this._targetTestingAccountId = targetTestingAccountId;
         this._profile = profile;
         this._projectConfig = projectConfig;
         this._projectDir = projectDir;
-        this._projectId = projectId;
-        this._projectName = projectName;
+        this._projectData = projectData;
         this._debug = debug || false;
         this._projectNodes = initialProjectNodes;
-        this._projectNodesAtLastUpload = initialProjectNodes;
+        this._projectNodesAtLastDeploy = initialProjectNodes;
         this._projectProfileData = initialProjectProfileData;
         this._env = env;
         this._appData = {};
         this._devServerMessage = LOCAL_DEV_SERVER_MESSAGE_TYPES.INITIAL;
         this._uploadWarnings = new Set();
+        this._devServersStarted = false;
         this._listeners = {};
     }
     runListeners(key) {
@@ -54,12 +54,6 @@ class LocalDevState {
     get projectDir() {
         return this._projectDir;
     }
-    get projectId() {
-        return this._projectId;
-    }
-    get projectName() {
-        return this._projectName;
-    }
     get debug() {
         return this._debug;
     }
@@ -76,11 +70,20 @@ class LocalDevState {
     set projectProfileData(profileData) {
         this._projectProfileData = profileData;
     }
-    get projectNodesAtLastUpload() {
-        return structuredClone(this._projectNodesAtLastUpload);
+    get projectNodesAtLastDeploy() {
+        return structuredClone(this._projectNodesAtLastDeploy);
     }
-    set projectNodesAtLastUpload(nodes) {
-        this._projectNodesAtLastUpload = nodes;
+    set projectNodesAtLastDeploy(nodes) {
+        this._projectNodesAtLastDeploy = nodes;
+    }
+    get projectData() {
+        return structuredClone(this._projectData);
+    }
+    get projectId() {
+        return this.projectData.id;
+    }
+    set projectData(projectData) {
+        this._projectData = projectData;
     }
     get env() {
         return this._env;
@@ -105,6 +108,13 @@ class LocalDevState {
     get uploadWarnings() {
         return this._uploadWarnings;
     }
+    get devServersStarted() {
+        return this._devServersStarted;
+    }
+    set devServersStarted(started) {
+        this._devServersStarted = started;
+        this.runListeners('devServersStarted');
+    }
     addUploadWarning(warning) {
         this.uploadWarnings.add(warning);
         this.runListeners('uploadWarnings');

package/lib/projects/localDev/LocalDevWebsocketServer.d.ts

@@ -3,17 +3,22 @@ declare class LocalDevWebsocketServer {
     private server?;
     private debug?;
     private localDevProcess;
-    private ALLOWED_ORIGINS;
     constructor(localDevProcess: LocalDevProcess, debug?: boolean);
     private log;
     private logError;
     private sendMessage;
     private handleUpload;
+    private handleDeploy;
+    private handleAppInstallSuccess;
+    private handleAppInstallFailure;
+    private handleAppInstallInitiated;
     private setupMessageHandlers;
+    private sendCliMetadata;
     private sendProjectData;
     private setupProjectNodesListener;
     private setupAppDataListener;
     private setupUploadWarningsListener;
+    private setupDevServersStartedListener;
     private setupStateListeners;
     start(): Promise<void>;
     shutdown(): void;