@hubspot/cli 7.6.0-beta.1 → 7.6.0-beta.10

package/lib/projects/localDev/LocalDevProcess.js

@@ -1,26 +1,25 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const project_parsing_lib_1 = require("@hubspot/project-parsing-lib");
-const path_1 = __importDefault(require("path"));
-const LocalDevState_1 = __importDefault(require("./LocalDevState"));
-const LocalDevLogger_1 = __importDefault(require("./LocalDevLogger"));
-const DevServerManagerV2_1 = __importDefault(require("./DevServerManagerV2"));
-const exitCodes_1 = require("../../enums/exitCodes");
-const transform_1 = require("@hubspot/project-parsing-lib/src/lib/transform");
-const config_1 = require("../config");
-const upload_1 = require("../upload");
-const buildAndDeploy_1 = require("../buildAndDeploy");
+import { translateForLocalDev } from '@hubspot/project-parsing-lib';
+import { hasLocalStateFlag } from '@hubspot/local-dev-lib/config';
+import path from 'path';
+import open from 'open';
+import LocalDevState from './LocalDevState.js';
+import LocalDevLogger from './LocalDevLogger.js';
+import DevServerManagerV2 from './DevServerManagerV2.js';
+import { EXIT_CODES } from '../../enums/exitCodes.js';
+import { getProjectConfig } from '../config.js';
+import { handleProjectUpload } from '../upload.js';
+import { pollProjectBuildAndDeploy } from '../buildAndDeploy.js';
+import { getLocalDevUiUrl } from '../urls.js';
+import { CONFIG_LOCAL_STATE_FLAGS } from '../../constants.js';
+import { isAutoOpenBrowserEnabled } from '../../configOptions.js';
 class LocalDevProcess {
     state;
     _logger;
     devServerManager;
     constructor(options) {
-        this.state = new LocalDevState_1.default(options);
-        this._logger = new LocalDevLogger_1.default(this.state);
-        this.devServerManager = new DevServerManagerV2_1.default({
+        this.state = new LocalDevState(options);
+        this._logger = new LocalDevLogger(this.state);
+        this.devServerManager = new DevServerManagerV2({
             localDevState: this.state,
             logger: this._logger,
         });
@@ -46,9 +45,6 @@ class LocalDevProcess {
     get logger() {
         return this._logger;
     }
-    get configFilesUpdatedSinceLastUpload() {
-        return this.state.configFilesUpdatedSinceLastUpload;
-    }
     async setupDevServers() {
         try {
             await this.devServerManager.setup();
@@ -65,7 +61,7 @@ class LocalDevProcess {
         }
         catch (e) {
             this.logger.devServerStartError(e);
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            process.exit(EXIT_CODES.ERROR);
         }
     }
     async cleanupDevServers() {
@@ -78,22 +74,8 @@ class LocalDevProcess {
             return false;
         }
     }
-    compareLocalProjectToDeployed() {
-        const deployedComponentNames = this.state.deployedBuild.subbuildStatuses.map(subbuildStatus => subbuildStatus.buildName);
-        const missingProjectNodes = [];
-        Object.values(this.projectNodes).forEach(node => {
-            if (!deployedComponentNames.includes(node.uid)) {
-                const userFriendlyName = (0, transform_1.mapToUserFriendlyName)(node.componentType);
-                const label = userFriendlyName ? `[${userFriendlyName}] ` : '';
-                missingProjectNodes.push(`${label}${node.uid}`);
-            }
-        });
-        if (missingProjectNodes.length) {
-            this.logger.missingComponentsWarning(missingProjectNodes);
-        }
-    }
     async projectConfigValidForUpload() {
-        const { projectConfig } = await (0, config_1.getProjectConfig)();
+        const { projectConfig } = await getProjectConfig();
         if (!projectConfig) {
             return false;
         }
@@ -105,17 +87,32 @@ class LocalDevProcess {
         });
         return true;
     }
-    async updateProjectNodes() {
-        const intermediateRepresentation = await (0, project_parsing_lib_1.translateForLocalDev)({
-            projectSourceDir: path_1.default.join(this.state.projectDir, this.state.projectConfig.srcDir),
+    getIntermediateRepresentation(projectNodesAtLastUpload) {
+        return translateForLocalDev({
+            projectSourceDir: path.join(this.state.projectDir, this.state.projectConfig.srcDir),
             platformVersion: this.state.projectConfig.platformVersion,
             accountId: this.state.targetProjectAccountId,
         }, {
-            configFilesUpdatedSinceLastUpload: this.state.configFilesUpdatedSinceLastUpload,
+            projectNodesAtLastUpload,
+            profile: this.state.profile,
         });
+    }
+    async updateProjectNodes() {
+        const intermediateRepresentation = await this.getIntermediateRepresentation(this.state.projectNodesAtLastUpload);
         this.state.projectNodes =
             intermediateRepresentation.intermediateNodesIndexedByUid;
     }
+    async updateProjectNodesAfterUpload() {
+        const intermediateRepresentation = await this.getIntermediateRepresentation();
+        this.state.projectNodes =
+            intermediateRepresentation.intermediateNodesIndexedByUid;
+        this.state.projectNodesAtLastUpload =
+            intermediateRepresentation.intermediateNodesIndexedByUid;
+    }
+    openLocalDevUi() {
+        const showWelcomeScreen = !hasLocalStateFlag(CONFIG_LOCAL_STATE_FLAGS.LOCAL_DEV_UI_WELCOME);
+        open(getLocalDevUiUrl(this.state.targetTestingAccountId, showWelcomeScreen));
+    }
     async handleFileChange(filePath, event) {
         await this.updateProjectNodes();
         try {
@@ -125,30 +122,22 @@ class LocalDevProcess {
             this.logger.fileChangeError(e);
         }
     }
-    async handleConfigFileChange(filePath, event) {
-        if (event === 'add' || event === 'change') {
-            this.state.addUpdatedConfigFileUpdatedSinceLastUpload(filePath);
-        }
+    async handleConfigFileChange() {
         await this.updateProjectNodes();
         this.logger.uploadWarning();
     }
     async start() {
         this.logger.resetSpinnies();
-        // Local dev currently relies on the existence of a deployed build in the target account
-        if (!this.state.deployedBuild) {
-            this.logger.noDeployedBuild();
-            process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
-        }
         const setupSucceeded = await this.setupDevServers();
         if (!setupSucceeded) {
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            process.exit(EXIT_CODES.ERROR);
         }
         this.logger.startupMessage();
+        if (isAutoOpenBrowserEnabled()) {
+            this.openLocalDevUi();
+        }
         await this.startDevServers();
         this.logger.monitorConsoleOutput();
-        // Verify that there are no mismatches between components in the local project
-        // and components in the deployed build of the project.
-        this.compareLocalProjectToDeployed();
     }
     async stop(showProgress = true) {
         if (showProgress) {
@@ -159,12 +148,12 @@ class LocalDevProcess {
             if (showProgress) {
                 this.logger.cleanupError();
             }
-            process.exit(exitCodes_1.EXIT_CODES.ERROR);
+            process.exit(EXIT_CODES.ERROR);
         }
         if (showProgress) {
             this.logger.cleanupSuccess();
         }
-        process.exit(exitCodes_1.EXIT_CODES.SUCCESS);
+        process.exit(EXIT_CODES.SUCCESS);
     }
     async uploadProject() {
         this.logger.uploadInitiated();
@@ -173,11 +162,11 @@ class LocalDevProcess {
             this.logger.projectConfigMismatch();
             return false;
         }
-        const { uploadError } = await (0, upload_1.handleProjectUpload)({
+        const { uploadError } = await handleProjectUpload({
             accountId: this.state.targetProjectAccountId,
             projectConfig: this.state.projectConfig,
             projectDir: this.state.projectDir,
-            callbackFunc: buildAndDeploy_1.pollProjectBuildAndDeploy,
+            callbackFunc: pollProjectBuildAndDeploy,
             sendIR: true,
             skipValidation: true,
         });
@@ -185,17 +174,19 @@ class LocalDevProcess {
             this.logger.uploadError(uploadError);
             return false;
         }
-        this.state.resetConfigFilesUpdatedSinceLastUpload();
-        this.updateProjectNodes();
+        await this.updateProjectNodesAfterUpload();
         this.logger.uploadSuccess();
-        this.logger.clearUploadWarnings();
+        this.state.clearUploadWarnings();
         return true;
     }
-    addStateListener(key, listener, callOnInit = false) {
-        this.state.addListener(key, listener, callOnInit);
+    addStateListener(key, listener) {
+        this.state.addListener(key, listener);
     }
     sendDevServerMessage(message) {
         this.state.devServerMessage = message;
     }
+    removeStateListener(key, listener) {
+        this.state.removeListener(key, listener);
+    }
 }
-exports.default = LocalDevProcess;
+export default LocalDevProcess;

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

@@ -1,50 +1,55 @@
-import { Build } from '@hubspot/local-dev-lib/types/Build';
-import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types';
+import { IntermediateRepresentationNodeLocalDev } from '@hubspot/project-parsing-lib/src/lib/types.js';
 import { Environment } from '@hubspot/local-dev-lib/types/Config';
-import { ProjectConfig } from '../../../types/Projects';
-import { LocalDevStateConstructorOptions, LocalDevStateListener, AppLocalDevData, LocalDevServerMessage } from '../../../types/LocalDev';
+import { ProjectConfig } from '../../../types/Projects.js';
+import { LocalDevStateConstructorOptions, LocalDevStateListener, AppLocalDevData, LocalDevServerMessage } from '../../../types/LocalDev.js';
 declare class LocalDevState {
     private _targetProjectAccountId;
     private _targetTestingAccountId;
+    private _profile?;
     private _projectConfig;
     private _projectDir;
     private _projectId;
     private _projectName;
     private _debug;
-    private _deployedBuild?;
-    private _isGithubLinked;
     private _projectNodes;
+    private _projectNodesAtLastUpload;
     private _env;
     private _listeners;
-    private _configFilesUpdatedSinceLastUpload;
     private _appData;
     private _devServerMessage;
-    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, deployedBuild, isGithubLinked, initialProjectNodes, env, }: LocalDevStateConstructorOptions);
+    private _uploadWarnings;
+    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, initialProjectNodes, 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 deployedBuild(): Build | undefined;
-    get isGithubLinked(): boolean;
     get projectNodes(): {
         [key: string]: IntermediateRepresentationNodeLocalDev;
     };
     set projectNodes(nodes: {
         [key: string]: IntermediateRepresentationNodeLocalDev;
     });
+    get projectNodesAtLastUpload(): {
+        [key: string]: IntermediateRepresentationNodeLocalDev;
+    };
+    set projectNodesAtLastUpload(nodes: {
+        [key: string]: IntermediateRepresentationNodeLocalDev;
+    });
     get env(): Environment;
-    get configFilesUpdatedSinceLastUpload(): Set<string>;
-    addUpdatedConfigFileUpdatedSinceLastUpload(filePath: string): void;
-    resetConfigFilesUpdatedSinceLastUpload(): void;
     get appData(): Record<string, AppLocalDevData>;
     getAppDataByUid(uid: string): AppLocalDevData | undefined;
     setAppDataForUid(uid: string, appData: AppLocalDevData): void;
     get devServerMessage(): string;
     set devServerMessage(message: LocalDevServerMessage);
-    addListener<K extends keyof LocalDevState>(key: K, listener: LocalDevStateListener<K>, callOnInit?: boolean): void;
+    get uploadWarnings(): Set<string>;
+    addUploadWarning(warning: string): void;
+    clearUploadWarnings(): void;
+    addListener<K extends keyof LocalDevState>(key: K, listener: LocalDevStateListener<K>): void;
+    removeListener<K extends keyof LocalDevState>(key: K, listener: LocalDevStateListener<K>): void;
 }
 export default LocalDevState;

package/lib/projects/localDev/LocalDevState.js

@@ -1,37 +1,35 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const constants_1 = require("../../constants");
+import { LOCAL_DEV_SERVER_MESSAGE_TYPES } from '../../constants.js';
 class LocalDevState {
     _targetProjectAccountId;
     _targetTestingAccountId;
+    _profile;
     _projectConfig;
     _projectDir;
     _projectId;
     _projectName;
     _debug;
-    _deployedBuild;
-    _isGithubLinked;
     _projectNodes;
+    _projectNodesAtLastUpload;
     _env;
     _listeners;
-    _configFilesUpdatedSinceLastUpload;
     _appData;
     _devServerMessage;
-    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, deployedBuild, isGithubLinked, initialProjectNodes, env, }) {
+    _uploadWarnings;
+    constructor({ targetProjectAccountId, targetTestingAccountId, projectConfig, projectDir, projectId, projectName, debug, initialProjectNodes, profile, env, }) {
         this._targetProjectAccountId = targetProjectAccountId;
         this._targetTestingAccountId = targetTestingAccountId;
+        this._profile = profile;
         this._projectConfig = projectConfig;
         this._projectDir = projectDir;
         this._projectId = projectId;
         this._projectName = projectName;
         this._debug = debug || false;
-        this._deployedBuild = deployedBuild;
-        this._isGithubLinked = isGithubLinked;
         this._projectNodes = initialProjectNodes;
+        this._projectNodesAtLastUpload = initialProjectNodes;
         this._env = env;
-        this._configFilesUpdatedSinceLastUpload = new Set();
         this._appData = {};
-        this._devServerMessage = constants_1.LOCAL_DEV_SERVER_MESSAGE_TYPES.INITIAL;
+        this._devServerMessage = LOCAL_DEV_SERVER_MESSAGE_TYPES.INITIAL;
+        this._uploadWarnings = new Set();
         this._listeners = {};
     }
     runListeners(key) {
@@ -45,10 +43,11 @@ class LocalDevState {
     get targetTestingAccountId() {
         return this._targetTestingAccountId;
     }
+    get profile() {
+        return this._profile;
+    }
     get projectConfig() {
-        return {
-            ...this._projectConfig,
-        };
+        return structuredClone(this._projectConfig);
     }
     get projectDir() {
         return this._projectDir;
@@ -62,35 +61,24 @@ class LocalDevState {
     get debug() {
         return this._debug;
     }
-    get deployedBuild() {
-        return (this._deployedBuild && {
-            ...this._deployedBuild,
-        });
-    }
-    get isGithubLinked() {
-        return this._isGithubLinked;
-    }
     get projectNodes() {
-        return { ...this._projectNodes };
+        return structuredClone(this._projectNodes);
     }
     set projectNodes(nodes) {
         this._projectNodes = nodes;
         this.runListeners('projectNodes');
     }
-    get env() {
-        return this._env;
-    }
-    get configFilesUpdatedSinceLastUpload() {
-        return this._configFilesUpdatedSinceLastUpload;
+    get projectNodesAtLastUpload() {
+        return structuredClone(this._projectNodesAtLastUpload);
     }
-    addUpdatedConfigFileUpdatedSinceLastUpload(filePath) {
-        this._configFilesUpdatedSinceLastUpload.add(filePath);
+    set projectNodesAtLastUpload(nodes) {
+        this._projectNodesAtLastUpload = nodes;
     }
-    resetConfigFilesUpdatedSinceLastUpload() {
-        this._configFilesUpdatedSinceLastUpload.clear();
+    get env() {
+        return this._env;
     }
     get appData() {
-        return { ...this._appData };
+        return structuredClone(this._appData);
     }
     getAppDataByUid(uid) {
         return { ...this._appData[uid] };
@@ -106,14 +94,28 @@ class LocalDevState {
         this._devServerMessage = message;
         this.runListeners('devServerMessage');
     }
-    addListener(key, listener, callOnInit = false) {
+    get uploadWarnings() {
+        return this._uploadWarnings;
+    }
+    addUploadWarning(warning) {
+        this.uploadWarnings.add(warning);
+        this.runListeners('uploadWarnings');
+    }
+    clearUploadWarnings() {
+        this.uploadWarnings.clear();
+        this.runListeners('uploadWarnings');
+    }
+    addListener(key, listener) {
         if (!this._listeners[key]) {
             this._listeners[key] = [];
         }
         this._listeners[key].push(listener);
-        if (callOnInit) {
-            listener(this[key]);
+        listener(this[key]);
+    }
+    removeListener(key, listener) {
+        if (this._listeners[key]) {
+            this._listeners[key].splice(this._listeners[key].indexOf(listener), 1);
         }
     }
 }
-exports.default = LocalDevState;
+export default LocalDevState;

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

@@ -1,4 +1,4 @@
-import LocalDevProcess from './LocalDevProcess';
+import LocalDevProcess from './LocalDevProcess.js';
 declare class LocalDevWatcher {
     private localDevProcess;
     private watcher;

package/lib/projects/localDev/LocalDevWatcher.js

@@ -1,11 +1,6 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const path_1 = __importDefault(require("path"));
-const chokidar_1 = __importDefault(require("chokidar"));
-const constants_1 = require("../../constants");
+import path from 'path';
+import chokidar from 'chokidar';
+import { PROJECT_CONFIG_FILE } from '../../constants.js';
 const WATCH_EVENTS = {
     add: 'add',
     change: 'change',
@@ -21,17 +16,17 @@ class LocalDevWatcher {
     }
     handleWatchEvent(filePath, event, configPaths) {
         if (configPaths.includes(filePath)) {
-            return this.localDevProcess.handleConfigFileChange(filePath, event);
+            return this.localDevProcess.handleConfigFileChange();
         }
         return this.localDevProcess.handleFileChange(filePath, event);
     }
     start() {
-        this.watcher = chokidar_1.default.watch(this.localDevProcess.projectDir, {
+        this.watcher = chokidar.watch(this.localDevProcess.projectDir, {
             ignoreInitial: true,
             ignored: ['**/dist'],
         });
         const configPaths = Object.values(this.localDevProcess.projectNodes).map(component => component.localDev.componentConfigPath);
-        const projectConfigPath = path_1.default.join(this.localDevProcess.projectDir, constants_1.PROJECT_CONFIG_FILE);
+        const projectConfigPath = path.join(this.localDevProcess.projectDir, PROJECT_CONFIG_FILE);
         configPaths.push(projectConfigPath);
         this.watcher.on('add', filePath => {
             this.handleWatchEvent(filePath, WATCH_EVENTS.add, configPaths);
@@ -50,4 +45,4 @@ class LocalDevWatcher {
         await this.watcher?.close();
     }
 }
-exports.default = LocalDevWatcher;
+export default LocalDevWatcher;

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

@@ -1,18 +1,19 @@
-import LocalDevProcess from './LocalDevProcess';
+import LocalDevProcess from './LocalDevProcess.js';
 declare class LocalDevWebsocketServer {
     private server?;
-    private _websocket?;
     private debug?;
     private localDevProcess;
     private ALLOWED_ORIGINS;
     constructor(localDevProcess: LocalDevProcess, debug?: boolean);
-    private websocket;
     private log;
     private logError;
     private sendMessage;
     private handleUpload;
     private setupMessageHandlers;
     private sendProjectData;
+    private setupProjectNodesListener;
+    private setupAppDataListener;
+    private setupUploadWarningsListener;
     private setupStateListeners;
     start(): Promise<void>;
     shutdown(): void;