@hubspot/cli 4.1.8-beta.3 → 4.1.8-beta.4

package/commands/project/dev.js

@@ -47,7 +47,7 @@ const {
 
 const i18nKey = 'cli.commands.project.subcommands.dev';
 
-exports.command = 'dev [--account] [--mockServers]';
+exports.command = 'dev [--account] [--port]';
 exports.describe = null; //i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
@@ -271,11 +271,11 @@ exports.handler = async options => {
 
   const LocalDev = new LocalDevManager({
     debug: options.debug,
-    mockServers: options.mockServers,
     projectConfig,
     projectDir,
     targetAccountId,
     uploadPermission,
+    port: options.port,
   });
 
   await LocalDev.start();
@@ -289,11 +289,11 @@ exports.builder = yargs => {
   addUseEnvironmentOptions(yargs, true);
   addTestingOptions(yargs, true);
 
-  yargs.option('mockServers', {
-    describe: 'mock servers',
-    type: 'boolean',
-    default: false,
+  yargs.option('port', {
+    describe: i18n(`${i18nKey}.options.port.describe`),
+    type: 'number',
   });
+
   yargs.example([['$0 project dev', i18n(`${i18nKey}.examples.default`)]]);
 
   return yargs;

package/lang/en.lyaml

@@ -465,6 +465,9 @@ en:
             prompt:
               createProject: "Create new project {{ projectName}} in {{#bold}}[{{ accountIdentifier }}]{{/bold}}?"
               targetNonSandbox: "Continue testing in a non-sandbox account?"
+            options:
+              port:
+                describe: "The port that the running server will listen on"
             errors:
               noProjectConfig: "No project detected. Please run this command again from a project directory."
             examples:

package/lib/DevServerManager.js

@@ -0,0 +1,74 @@
+const express = require('express');
+const bodyParser = require('body-parser');
+const cors = require('cors');
+const { getProjectDetailUrl } = require('./projects');
+
+const DEFAULT_PORT = 8080;
+
+class DevServerManager {
+  constructor() {
+    this.server = null;
+    this.devServers = {};
+  }
+
+  async iterateDevServers(callback) {
+    const serverKeys = Object.keys(this.devServers);
+
+    for (let i = 0; i < serverKeys.length; i++) {
+      const serverKey = serverKeys[i];
+      const serverInterface = this.devServers[serverKey];
+      await callback(serverInterface, serverKey);
+    }
+  }
+
+  async start({ projectConfig, accountId, port }) {
+    const app = express();
+
+    // Install Middleware
+    app.use(bodyParser.json({ limit: '50mb' }));
+    app.use(bodyParser.urlencoded({ limit: '50mb', extended: true }));
+    app.use(cors());
+
+    // Configure
+    app.set('trust proxy', true);
+
+    // Initialize a base route
+    app.get('/', (req, res) => {
+      res.send('HubSpot local dev server');
+    });
+
+    // Initialize URL redirects
+    app.get('/hs/project', (req, res) => {
+      res.redirect(getProjectDetailUrl(projectConfig.name, accountId));
+    });
+
+    // Initialize component servers
+    await this.iterateDevServers(async (serverInterface, serverKey) => {
+      if (serverInterface.start) {
+        const serverApp = await serverInterface.start(serverKey);
+        app.use(`/${serverKey}`, serverApp);
+      }
+    });
+
+    // Start server
+    this.server = app.listen(port || DEFAULT_PORT);
+
+    return `http://localhost:${this.server.address().port}`;
+  }
+
+  async notify() {
+    return { uploadRequired: true };
+  }
+
+  async execute() {
+    return;
+  }
+
+  async cleanup() {
+    if (this.server) {
+      await this.server.close();
+    }
+  }
+}
+
+module.exports = new DevServerManager();

package/lib/LocalDevManager.js

@@ -22,11 +22,9 @@ const {
   queueBuild,
 } = require('@hubspot/cli-lib/api/dfs');
 const SpinniesManager = require('./SpinniesManager');
+const DevServerManager = require('./DevServerManager');
 const { EXIT_CODES } = require('./enums/exitCodes');
-const {
-  getProjectDetailUrl,
-  pollProjectBuildAndDeploy,
-} = require('./projects');
+const { pollProjectBuildAndDeploy } = require('./projects');
 const { uiAccountDescription, uiLink } = require('./ui');
 
 const i18nKey = 'cli.lib.LocalDevManager';
@@ -45,6 +43,7 @@ const UPLOAD_PERMISSIONS = {
   manual: 'manual',
   never: 'never',
 };
+
 class LocalDevManager {
   constructor(options) {
     this.targetAccountId = options.targetAccountId;
@@ -53,7 +52,6 @@ class LocalDevManager {
     this.uploadPermission =
       options.uploadPermission || UPLOAD_PERMISSIONS.always;
     this.debug = options.debug || false;
-    this.mockServers = options.mockServers || false;
     this.projectSourceDir = path.join(
       this.projectDir,
       this.projectConfig.srcDir
@@ -64,6 +62,8 @@ class LocalDevManager {
     this.standbyChanges = [];
     this.debouncedBuild = null;
     this.currentStagedBuildId = null;
+    this.port = options.port;
+    this.devServerPath = null;
 
     if (!this.targetAccountId || !this.projectConfig || !this.projectDir) {
       process.exit(EXIT_CODES.ERROR);
@@ -90,8 +90,9 @@ class LocalDevManager {
 
     this.uploadQueue.start();
 
-    this.logConsoleHeader();
     await this.startServers();
+
+    this.logConsoleHeader();
     await this.startWatching();
     this.updateKeypressListeners();
   }
@@ -159,14 +160,10 @@ class LocalDevManager {
       indent: 1,
       category: 'header',
     });
-    const projectDetailUrl = getProjectDetailUrl(
-      this.projectConfig.name,
-      this.targetAccountId
-    );
     this.spinnies.add('viewInHubSpotLink', {
       text: uiLink(
         i18n(`${i18nKey}.header.viewInHubSpotLink`),
-        projectDetailUrl,
+        this.generateLocalURL(`/hs/project`),
         {
           inSpinnies: true,
         }
@@ -230,6 +227,10 @@ class LocalDevManager {
     });
   }
 
+  generateLocalURL(path) {
+    return this.devServerPath ? `${this.devServerPath}${path}` : null;
+  }
+
   updateDevModeStatus(langKey) {
     this.spinnies.update('devModeStatus', {
       text: i18n(`${i18nKey}.header.status.${langKey}`),
@@ -297,11 +298,13 @@ class LocalDevManager {
       remotePath: path.relative(this.projectSourceDir, filePath),
     };
 
-    const isSupportedChange = await this.notifyServers(changeInfo);
+    const notifyResponse = await this.notifyServers(changeInfo);
 
-    if (isSupportedChange) {
+    if (!notifyResponse.uploadRequired) {
       this.updateDevModeStatus('supportedChange');
       this.addChangeToStandbyQueue({ ...changeInfo, supported: true });
+
+      await this.executeServers(notifyResponse, changeInfo);
       return;
     }
 
@@ -510,23 +513,24 @@ class LocalDevManager {
   }
 
   async startServers() {
-    // TODO spin up local dev servers
-    return true;
+    this.devServerPath = await DevServerManager.start({
+      accountId: this.targetAccountId,
+      projectConfig: this.projectConfig,
+      port: this.port,
+    });
   }
 
   async notifyServers(changeInfo) {
-    const { remotePath } = changeInfo;
+    const notifyResponse = await DevServerManager.notify(changeInfo);
+    return notifyResponse;
+  }
 
-    // TODO notify servers of the change
-    if (this.mockServers) {
-      return !remotePath.endsWith('app.json');
-    }
-    return false;
+  async executeServers(notifyResponse, changeInfo) {
+    await DevServerManager.execute(notifyResponse, changeInfo);
   }
 
   async cleanupServers() {
-    // TODO tell servers to cleanup
-    return;
+    await DevServerManager.cleanup();
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.1.8-beta.3",
+  "version": "4.1.8-beta.4",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,16 +8,18 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "4.1.8-beta.3",
-    "@hubspot/serverless-dev-runtime": "4.1.8-beta.3",
+    "@hubspot/cli-lib": "^4.1.12",
+    "@hubspot/serverless-dev-runtime": "4.1.8-beta.4",
     "archiver": "^5.3.0",
+    "body-parser": "^1.19.0",
     "chalk": "^4.1.2",
     "chokidar": "^3.0.1",
     "cli-progress": "^3.11.2",
+    "cors": "^2.8.5",
     "express": "^4.17.1",
     "findup-sync": "^4.0.0",
     "fs-extra": "^8.1.0",
-    "inquirer": "^8.2.0",
+    "inquirer": "8.2.0",
     "js-yaml": "^4.1.0",
     "moment": "^2.29.1",
     "open": "^7.0.3",
@@ -41,5 +43,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1b4eaa68c074fc230a21538fabd1160be6cc2c18"
+  "gitHead": "650d373d034efb5736b357200fc496d5da605e37"
 }