@hubspot/cli 8.9.0-beta.1 → 8.9.1-beta.0

package/lang/en.d.ts

@@ -1,4 +1,5 @@
 import { HubSpotConfigAccount } from '@hubspot/local-dev-lib/types/Accounts';
+import { LocallyChangedComponents } from '../types/Projects.js';
 export declare const commands: {
     generalErrors: {
         srcIsProject: (src: string, command: string) => string;
@@ -3394,7 +3395,9 @@ export declare const lib: {
                 checking: string;
                 upToDate: string;
                 notUpToDate: string;
+                changedFiles: (changed: LocallyChangedComponents) => string;
                 notUpToDateExplanation: (profile?: string) => string;
+                unableToCompare: string;
             };
             createNewProjectForLocalDev: {
                 projectMustExistExplanation: (projectName: string, accountId: number) => string;

package/lang/en.js

@@ -3419,7 +3419,21 @@ export const lib = {
                 checking: 'Checking if your deployed build is up to date...',
                 upToDate: 'Deployed build is up to date.',
                 notUpToDate: `Your project contains undeployed local changes.`,
+                changedFiles: (changed) => {
+                    const sections = [];
+                    if (changed.added.length > 0) {
+                        sections.push(`${chalk.bold('Features Added:')}\n${changed.added.map(f => `  - ${f}`).join('\n')}`);
+                    }
+                    if (changed.updated.length > 0) {
+                        sections.push(`${chalk.bold('Features Modified:')}\n${changed.updated.map(f => `  - ${f}`).join('\n')}`);
+                    }
+                    if (changed.removed.length > 0) {
+                        sections.push(`${chalk.bold('Features Removed:')}\n${changed.removed.map(f => `  - ${f}`).join('\n')}`);
+                    }
+                    return sections.join('\n\n');
+                },
                 notUpToDateExplanation: (profile) => `Run ${uiCommandReference(`hs project upload${profile ? ` --profile ${profile}` : ''}`)} to upload these changes to HubSpot, then re-run ${uiCommandReference(`hs project dev${profile ? ` --profile ${profile}` : ''}`)} to continue local development.`,
+                unableToCompare: `Unable to check if local *-hsmeta.json files match the deployed build. Run ${uiCommandReference('hs project upload')} to upload any local changes before continuing.`,
             },
             createNewProjectForLocalDev: {
                 projectMustExistExplanation: (projectName, accountId) => `The project ${projectName} does not exist in the target account ${uiAccountDescription(accountId)}. This command requires the project to exist in the target account.`,

package/lib/projects/localDev/UIExtensionsDevModeInterface.js

@@ -20,11 +20,13 @@ class UIExtensionsDevModeInterface {
         });
     }
     async start() {
+        const appId = Object.values(this.localDevState.appData)[0]?.id;
         return UIEDevModeInterface.start({
             accountId: this.localDevState.targetTestingAccountId,
             // @ts-expect-error TODO: reconcile types between CLI and UIE Dev Server
             projectConfig: this.localDevState.projectConfig,
             requestPorts,
+            appId,
         });
     }
     async fileChange(filePath, event) {

package/lib/projects/localDev/helpers/project.d.ts

@@ -1,7 +1,7 @@
 import { type IntermediateRepresentationNode, type IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/translate';
 import { Build } from '@hubspot/local-dev-lib/types/Build';
 import { Project } from '@hubspot/local-dev-lib/types/Project';
-import { ProjectConfig } from '../../../../types/Projects.js';
+import { LocallyChangedComponents, ProjectConfig } from '../../../../types/Projects.js';
 import { ExitFunction } from '../../../../types/Yargs.js';
 export declare function createNewProjectForLocalDev(projectConfig: ProjectConfig, targetAccountId: number, shouldCreateWithoutConfirmation: boolean, hasPublicApps: boolean, exit: ExitFunction): Promise<Project>;
 export declare function createInitialBuildForNewProject(projectConfig: ProjectConfig, projectDir: string, targetAccountId: number, exit: ExitFunction, sendIR?: boolean, profile?: string): Promise<Build>;
@@ -11,7 +11,8 @@ export declare function compareLocalProjectToDeployed(projectConfig: ProjectConf
 export declare function getDeployedProjectNodes(projectConfig: ProjectConfig, accountId: number, deployedBuildId: number, profile?: string): Promise<{
     [key: string]: IntermediateRepresentationNode;
 }>;
-export declare function isDeployedProjectUpToDateWithLocal(projectConfig: ProjectConfig, accountId: number, deployedBuildId: number, localProjectNodes: {
+export declare function hasLocalComponentChanges(changed: LocallyChangedComponents): boolean;
+export declare function getLocallyChangedComponents(projectConfig: ProjectConfig, accountId: number, deployedBuildId: number, localProjectNodes: {
     [key: string]: IntermediateRepresentationNodeLocalDev;
-}, profile?: string): Promise<boolean>;
+}, profile?: string): Promise<LocallyChangedComponents>;
 export declare function checkAndInstallDependencies(): Promise<void>;

package/lib/projects/localDev/helpers/project.js

@@ -1,25 +1,24 @@
 import fs from 'fs-extra';
 import os from 'os';
 import path from 'path';
-import { createProject } from '@hubspot/local-dev-lib/api/projects';
-import { downloadProject } from '@hubspot/local-dev-lib/api/projects';
+import { createProject, downloadProject, } from '@hubspot/local-dev-lib/api/projects';
 import { extractZipArchive } from '@hubspot/local-dev-lib/archive';
 import { sanitizeFileName } from '@hubspot/local-dev-lib/path';
 import { isDeepEqual } from '@hubspot/local-dev-lib/isDeepEqual';
 import { translate, } from '@hubspot/project-parsing-lib/translate';
+import { AUTO_GENERATED_COMPONENT_TYPES } from '@hubspot/project-parsing-lib/constants';
+import { mapToUserFacingType } from '@hubspot/project-parsing-lib/transform';
 import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
-import { PROJECT_ERROR_TYPES, PROJECT_BUILD_TEXT, PROJECT_DEPLOY_TEXT, PROJECT_CONFIG_FILE, } from '../../../constants.js';
+import { PROJECT_BUILD_TEXT, PROJECT_CONFIG_FILE, PROJECT_DEPLOY_TEXT, PROJECT_ERROR_TYPES, } from '../../../constants.js';
 import { lib } from '../../../../lang/en.js';
 import { uiLogger } from '../../../ui/logger.js';
-import { uiLine } from '../../../ui/index.js';
+import { uiAccountDescription, uiLine } from '../../../ui/index.js';
 import { confirmPrompt } from '../../../prompts/promptUtils.js';
-import { uiAccountDescription } from '../../../ui/index.js';
 import SpinniesManager from '../../../ui/SpinniesManager.js';
 import { EXIT_CODES } from '../../../enums/exitCodes.js';
 import { handleProjectUpload } from '../../upload.js';
 import { pollProjectBuildAndDeploy } from '../../pollProjectBuildAndDeploy.js';
-import { debugError, logError } from '../../../errorHandlers/index.js';
-import { ApiErrorContext } from '../../../errorHandlers/index.js';
+import { ApiErrorContext, debugError, logError, } from '../../../errorHandlers/index.js';
 import { getProjectPackageJsonLocations, hasMissingPackages, installPackages, } from '../../../dependencyManagement.js';
 // Prompt the user to create a new project if one doesn't exist on their target account
 export async function createNewProjectForLocalDev(projectConfig, targetAccountId, shouldCreateWithoutConfirmation, hasPublicApps, exit) {
@@ -133,8 +132,8 @@ export async function compareLocalProjectToDeployed(projectConfig, accountId, de
     SpinniesManager.add('compareLocalProjectToDeployed', {
         text: lib.localDevHelpers.project.compareLocalProjectToDeployed.checking,
     });
-    const isUpToDate = await isDeployedProjectUpToDateWithLocal(projectConfig, accountId, deployedBuildId, localProjectNodes, profile);
-    if (isUpToDate) {
+    const changedComponents = await getLocallyChangedComponents(projectConfig, accountId, deployedBuildId, localProjectNodes, profile);
+    if (!hasLocalComponentChanges(changedComponents)) {
         SpinniesManager.succeed('compareLocalProjectToDeployed', {
             text: lib.localDevHelpers.project.compareLocalProjectToDeployed.upToDate,
         });
@@ -145,6 +144,8 @@ export async function compareLocalProjectToDeployed(projectConfig, accountId, de
                 .notUpToDate,
         });
         uiLogger.log('');
+        uiLogger.log(lib.localDevHelpers.project.compareLocalProjectToDeployed.changedFiles(changedComponents));
+        uiLogger.log('');
         uiLogger.log(lib.localDevHelpers.project.compareLocalProjectToDeployed.notUpToDateExplanation(profile));
         return exit(EXIT_CODES.SUCCESS);
     }
@@ -185,14 +186,47 @@ export async function getDeployedProjectNodes(projectConfig, accountId, deployed
         }
     }
 }
-export async function isDeployedProjectUpToDateWithLocal(projectConfig, accountId, deployedBuildId, localProjectNodes, profile) {
+function filterAutoGeneratedNodes(nodes) {
+    return Object.fromEntries(Object.entries(nodes).filter(([, node]) => !AUTO_GENERATED_COMPONENT_TYPES.includes(mapToUserFacingType(node.componentType))));
+}
+export function hasLocalComponentChanges(changed) {
+    return (changed.added.length > 0 ||
+        changed.updated.length > 0 ||
+        changed.removed.length > 0);
+}
+export async function getLocallyChangedComponents(projectConfig, accountId, deployedBuildId, localProjectNodes, profile) {
+    const result = {
+        added: [],
+        updated: [],
+        removed: [],
+    };
     try {
         const deployedProjectNodes = await getDeployedProjectNodes(projectConfig, accountId, deployedBuildId, profile);
-        return isDeepEqual(localProjectNodes, deployedProjectNodes, ['localDev']);
+        const filteredLocal = filterAutoGeneratedNodes(localProjectNodes);
+        const filteredDeployed = filterAutoGeneratedNodes(deployedProjectNodes);
+        const allUids = new Set([
+            ...Object.keys(filteredLocal),
+            ...Object.keys(filteredDeployed),
+        ]);
+        for (const uid of allUids) {
+            const local = filteredLocal[uid];
+            const deployed = filteredDeployed[uid];
+            if (!local) {
+                result.removed.push(path.join(projectConfig.srcDir, deployed.metaFilePath));
+            }
+            else if (!deployed) {
+                result.added.push(path.join(projectConfig.srcDir, local.metaFilePath));
+            }
+            else if (!isDeepEqual(local, deployed, ['localDev', 'componentDeps'])) {
+                result.updated.push(path.join(projectConfig.srcDir, local.metaFilePath));
+            }
+        }
+        return result;
     }
     catch (err) {
         debugError(err);
-        return false;
+        uiLogger.warn(lib.localDevHelpers.project.compareLocalProjectToDeployed.unableToCompare);
+        return result;
     }
 }
 export async function checkAndInstallDependencies() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/cli",
-    "version": "8.9.0-beta.1",
+    "version": "8.9.1-beta.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
@@ -10,10 +10,10 @@
         "!**/__tests__/**"
     ],
     "dependencies": {
-        "@hubspot/local-dev-lib": "5.8.0",
+        "@hubspot/local-dev-lib": "5.8.1",
         "@hubspot/project-parsing-lib": "0.17.0",
         "@hubspot/serverless-dev-runtime": "7.0.7",
-        "@hubspot/ui-extensions-dev-server": "2.0.8",
+        "@hubspot/ui-extensions-dev-server": "2.0.9",
         "@inquirer/prompts": "7.1.0",
         "@modelcontextprotocol/sdk": "1.29.0",
         "archiver": "7.0.1",

package/types/Projects.d.ts

@@ -147,3 +147,8 @@ export type Component<T = GenericComponentConfig> = {
     runnable: boolean;
     path: string;
 };
+export type LocallyChangedComponents = {
+    added: string[];
+    updated: string[];
+    removed: string[];
+};