@hubspot/ui-extensions-dev-server 0.8.4 → 0.8.6

package/dist/lib/DevModeInterface.d.ts

@@ -18,6 +18,12 @@ interface StartArguments {
     accountId?: number;
     debug?: boolean;
     httpClient?: ServiceConfiguration['httpClient'];
+    requestPorts?: (requestPortsData: Array<{
+        instanceId: string;
+        port?: number;
+    }>) => Promise<{
+        [instanceId: string]: number;
+    }>;
     projectConfig?: ProjectConfig;
 }
 interface AppExtensionMapping {
@@ -33,7 +39,7 @@ declare class DevModeInterface {
     _getPlatformVersion(projectConfig?: ProjectConfig): PlatformVersion;
     setup({ components, debug, extensionConfig, onUploadRequired, promptUser, }: SetupArguments): Promise<void>;
     fileChange(filePath: string, __event: unknown): Promise<void>;
-    start({ accountId, debug, httpClient, projectConfig }: StartArguments): Promise<void>;
+    start({ requestPorts, accountId, debug, httpClient, projectConfig, }: StartArguments): Promise<void>;
     cleanup(): Promise<void>;
 }
 declare const _default: DevModeInterface;

package/dist/lib/DevModeInterface.js

@@ -13,6 +13,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const dev_1 = require("./dev");
 const constants_1 = require("./constants");
+const constants_2 = require("./constants");
 const config_1 = require("./config");
 // @ts-expect-error no type defs
 const logger_1 = require("@hubspot/cli-lib/logger");
@@ -45,13 +46,13 @@ class DevModeInterface {
     _getPlatformVersion(projectConfig) {
         const { platformVersion } = projectConfig !== null && projectConfig !== void 0 ? projectConfig : {};
         if (!platformVersion) {
-            return constants_1.PLATFORM_VERSION.V20231;
+            return constants_2.PLATFORM_VERSION.V20231;
         }
         switch (platformVersion) {
-            case constants_1.PLATFORM_VERSION.V20231:
-                return constants_1.PLATFORM_VERSION.V20231;
-            case constants_1.PLATFORM_VERSION.V20232:
-                return constants_1.PLATFORM_VERSION.V20232;
+            case constants_2.PLATFORM_VERSION.V20231:
+                return constants_2.PLATFORM_VERSION.V20231;
+            case constants_2.PLATFORM_VERSION.V20232:
+                return constants_2.PLATFORM_VERSION.V20232;
             default:
                 return (0, utils_1.throwUnhandledPlatformVersionError)(platformVersion);
         }
@@ -76,10 +77,14 @@ class DevModeInterface {
                     type: 'checkbox',
                     name: 'extensions',
                     message: 'Which extension(s) would you like to run?',
-                    validate: input => {
+                    validate: (input) => {
                         if (!input || input.length === 0) {
                             return 'Select at least one extension to run';
                         }
+                        const appNames = new Set(input.map(choice => choice.data.appName));
+                        if (appNames.size > 1) {
+                            return 'Running multiple extensions is only supported for a single application';
+                        }
                         return true;
                     },
                     choices,
@@ -101,16 +106,33 @@ class DevModeInterface {
             }
         });
     }
-    start({ accountId, debug, httpClient, projectConfig }) {
+    start({ requestPorts, accountId, debug, httpClient, projectConfig, }) {
         return __awaiter(this, void 0, void 0, function* () {
             if (debug !== undefined) {
                 (0, logger_1.setLogLevel)(debug ? logger_1.LOG_LEVEL.DEBUG : logger_1.LOG_LEVEL.LOG);
             }
+            let expressPort = constants_1.EXPRESS_DEFAULT_PORT;
+            let webSocketPort = constants_1.WEBSOCKET_DEFAULT_PORT;
+            if (requestPorts) {
+                try {
+                    const portData = yield requestPorts([
+                        { instanceId: constants_1.EXPRESS_SERVER_ID, port: constants_1.EXPRESS_DEFAULT_PORT },
+                        { instanceId: constants_1.VITE_DEV_SERVER_ID, port: constants_1.WEBSOCKET_DEFAULT_PORT },
+                    ]);
+                    expressPort = portData[constants_1.EXPRESS_SERVER_ID];
+                    webSocketPort = portData[constants_1.VITE_DEV_SERVER_ID];
+                }
+                catch (e) {
+                    logger_1.logger.debug('Call to port manager failed, using default ports');
+                }
+            }
             this.devServerState = new DevServerState_1.DevServerState({
                 extensionConfigs: this.configs,
                 accountId,
                 httpClient,
                 platformVersion: this._getPlatformVersion(projectConfig),
+                expressPort,
+                webSocketPort,
             });
             this.shutdown = yield (0, dev_1.startDevMode)(this.devServerState);
             this.devServerState.extensionsMetadata.forEach(metadata => {

package/dist/lib/DevServerState.d.ts

@@ -4,8 +4,8 @@ interface DevServerStateArgs {
     extensionConfigs?: ExtensionConfig[];
     accountId: number | undefined;
     httpClient: ServiceConfiguration['httpClient'] | undefined;
-    expressPort?: number;
-    webSocketPort?: number;
+    expressPort: number;
+    webSocketPort: number;
     platformVersion: PlatformVersion;
 }
 export declare class DevServerState {

package/dist/lib/DevServerState.js

@@ -7,9 +7,7 @@ exports.DevServerState = void 0;
 const constants_1 = require("./constants");
 const path_1 = __importDefault(require("path"));
 class DevServerState {
-    constructor({ extensionConfigs, accountId, httpClient, expressPort = constants_1.VITE_DEFAULT_PORT, webSocketPort = constants_1.WEBSOCKET_PORT, platformVersion, }) {
-        this._webSocketPort = constants_1.WEBSOCKET_PORT;
-        this._expressPort = constants_1.VITE_DEFAULT_PORT;
+    constructor({ extensionConfigs, accountId, httpClient, expressPort, webSocketPort, platformVersion, }) {
         if (!extensionConfigs) {
             throw new Error('Unable to load the required extension configuration files');
         }

package/dist/lib/constants.d.ts

@@ -1,8 +1,10 @@
 export declare const OUTPUT_DIR = "dist";
 export declare const MAIN_APP_CONFIG = "app.json";
 export declare const MANIFEST_FILE = "manifest.json";
-export declare const VITE_DEFAULT_PORT = 5173;
-export declare const WEBSOCKET_PORT = 5174;
+export declare const EXPRESS_SERVER_ID = "ui-extensions-dev-server";
+export declare const VITE_DEV_SERVER_ID = "ui-extensions-vite-dev-server";
+export declare const EXPRESS_DEFAULT_PORT = 5173;
+export declare const WEBSOCKET_DEFAULT_PORT = 5174;
 export declare const ROLLUP_OPTIONS: {
     external: string[];
     output: {

package/dist/lib/constants.js

@@ -1,11 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PLATFORM_VERSION = exports.SERVER_CAPABILITIES = exports.WEBSOCKET_MESSAGE_VERSION = exports.EXTENSIONS_MESSAGE_VERSION = exports.ROLLUP_OPTIONS = exports.WEBSOCKET_PORT = exports.VITE_DEFAULT_PORT = exports.MANIFEST_FILE = exports.MAIN_APP_CONFIG = exports.OUTPUT_DIR = void 0;
+exports.PLATFORM_VERSION = exports.SERVER_CAPABILITIES = exports.WEBSOCKET_MESSAGE_VERSION = exports.EXTENSIONS_MESSAGE_VERSION = exports.ROLLUP_OPTIONS = exports.WEBSOCKET_DEFAULT_PORT = exports.EXPRESS_DEFAULT_PORT = exports.VITE_DEV_SERVER_ID = exports.EXPRESS_SERVER_ID = exports.MANIFEST_FILE = exports.MAIN_APP_CONFIG = exports.OUTPUT_DIR = void 0;
 exports.OUTPUT_DIR = 'dist';
 exports.MAIN_APP_CONFIG = 'app.json';
 exports.MANIFEST_FILE = 'manifest.json';
-exports.VITE_DEFAULT_PORT = 5173;
-exports.WEBSOCKET_PORT = 5174;
+exports.EXPRESS_SERVER_ID = 'ui-extensions-dev-server';
+exports.VITE_DEV_SERVER_ID = 'ui-extensions-vite-dev-server';
+exports.EXPRESS_DEFAULT_PORT = 5173;
+exports.WEBSOCKET_DEFAULT_PORT = 5174;
 exports.ROLLUP_OPTIONS = {
     // Deps to exclude from the bundle
     external: ['react', 'react-dom', '@remote-ui/react'],

package/dist/lib/dev.js

@@ -18,8 +18,6 @@ const path_1 = __importDefault(require("path"));
 const server_1 = __importDefault(require("./server"));
 const devBuildPlugin_1 = __importDefault(require("./plugins/devBuildPlugin"));
 // @ts-expect-error no type defs
-const logger_1 = require("@hubspot/cli-lib/logger");
-// @ts-expect-error no type defs
 const detect_port_1 = __importDefault(require("detect-port"));
 function _createViteDevServer(devServerState) {
     return __awaiter(this, void 0, void 0, function* () {
@@ -66,12 +64,7 @@ function startDevMode(devServerState) {
         if (!devServerState || !devServerState.extensionsMetadata) {
             throw new Error('Unable to determine which extension to run');
         }
-        const { expressPort, webSocketPort } = devServerState;
-        yield throwIfPortTaken(expressPort);
-        const actualWebSocketPort = yield (0, detect_port_1.default)(webSocketPort);
-        if (actualWebSocketPort !== webSocketPort) {
-            logger_1.logger.debug(`WebSocket port ${webSocketPort} is in use; using next available port ${actualWebSocketPort}`);
-        }
+        yield throwIfPortTaken(devServerState.webSocketPort);
         const viteDevServer = yield _createViteDevServer(devServerState);
         const shutdownServer = yield (0, server_1.default)({
             devServerState,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/ui-extensions-dev-server",
-  "version": "0.8.4",
+  "version": "0.8.6",
   "description": "",
   "scripts": {
     "test": "jest",
@@ -63,5 +63,5 @@
       "optional": true
     }
   },
-  "gitHead": "41e3484343d34136e81540d774a101ccf99642b3"
+  "gitHead": "621bee406c8dfa9ca133f1d76f4bde725a2b9f43"
 }