@hubspot/cli 4.2.0 → 4.2.1-beta.1

package/commands/sandbox/create.js

@@ -55,7 +55,6 @@ exports.handler = async options => {
     accountConfig.sandboxAccountType &&
     accountConfig.sandboxAccountType !== null
   ) {
-    trackCommandUsage('sandbox-create', { successful: false }, accountId);
     logger.error(
       i18n(`${i18nKey}.failure.creatingWithinSandbox`, {
         sandboxType: getSandboxTypeAsString(accountConfig.sandboxAccountType),
@@ -73,7 +72,6 @@ exports.handler = async options => {
       typePrompt = await sandboxTypePrompt();
     } else {
       logger.error(i18n(`${i18nKey}.failure.optionMissing.type`));
-      trackCommandUsage('sandbox-create', { successful: false }, accountId);
       process.exit(EXIT_CODES.ERROR);
     }
   }
@@ -100,7 +98,6 @@ exports.handler = async options => {
     } else {
       logErrorInstance(err);
     }
-    trackCommandUsage('sandbox-create', { successful: false }, accountId);
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -109,7 +106,6 @@ exports.handler = async options => {
       namePrompt = await sandboxNamePrompt(sandboxType);
     } else {
       logger.error(i18n(`${i18nKey}.failure.optionMissing.name`));
-      trackCommandUsage('sandbox-create', { successful: false }, accountId);
       process.exit(EXIT_CODES.ERROR);
     }
   }
@@ -196,7 +192,6 @@ exports.handler = async options => {
     uiFeatureHighlight(highlightItems);
     process.exit(EXIT_CODES.SUCCESS);
   } catch (error) {
-    trackCommandUsage('sandbox-create', { successful: false }, accountId);
     // Errors are logged in util functions
     process.exit(EXIT_CODES.ERROR);
   }

package/commands/sandbox/delete.js

@@ -44,6 +44,8 @@ exports.handler = async options => {
   const { account, force } = options;
   const config = getConfig();
 
+  trackCommandUsage('sandbox-delete', null);
+
   let accountPrompt;
   if (!account) {
     if (!force) {
@@ -68,8 +70,6 @@ exports.handler = async options => {
   const isDefaultAccount =
     sandboxAccountId === getAccountId(config.defaultPortal);
 
-  trackCommandUsage('sandbox-delete', null, sandboxAccountId);
-
   const baseUrl = getHubSpotWebsiteOrigin(
     getValidEnv(getEnv(sandboxAccountId))
   );
@@ -168,12 +168,6 @@ exports.handler = async options => {
   } catch (err) {
     debugErrorAndContext(err);
 
-    trackCommandUsage(
-      'sandbox-delete',
-      { successful: false },
-      sandboxAccountId
-    );
-
     if (err instanceof HubSpotAuthError) {
       // Intercept invalid key error
       // This command uses the parent portal PAK to delete a sandbox, so we must specify which account needs a new key

package/commands/sandbox/sync.js

@@ -44,7 +44,11 @@ exports.handler = async options => {
   const accountConfig = getAccountConfig(accountId);
   const env = getValidEnv(getEnv(accountId));
 
-  trackCommandUsage('sandbox-sync', null, accountId);
+  trackCommandUsage(
+    'sandbox-sync',
+    { type: accountConfig.sandboxAccountType },
+    accountId
+  );
 
   if (
     // Check if default account is a sandbox, otherwise exit
@@ -53,7 +57,6 @@ exports.handler = async options => {
     accountConfig.sandboxAccountType === null
   ) {
     logger.error(i18n(`${i18nKey}.failure.notSandbox`));
-    trackCommandUsage('sandbox-sync', { successful: false }, accountId);
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -66,7 +69,6 @@ exports.handler = async options => {
         sandboxName: getAccountName(accountConfig),
       })
     );
-    trackCommandUsage('sandbox-sync', { successful: false }, accountId);
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -98,7 +100,6 @@ exports.handler = async options => {
     } else {
       logErrorInstance(error);
     }
-    trackCommandUsage('sandbox-sync', { successful: false }, accountId);
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -128,7 +129,6 @@ exports.handler = async options => {
         },
       ]);
       if (!confirmed) {
-        trackCommandUsage('sandbox-sync', { successful: false }, accountId);
         process.exit(EXIT_CODES.SUCCESS);
       }
     }
@@ -166,13 +166,11 @@ exports.handler = async options => {
         },
       ]);
       if (!confirmed) {
-        trackCommandUsage('sandbox-sync', { successful: false }, accountId);
         process.exit(EXIT_CODES.SUCCESS);
       }
     }
   } else {
     logger.error('Sync must be run in a sandbox account.');
-    trackCommandUsage('sandbox-sync', { successful: false }, accountId);
     process.exit(EXIT_CODES.ERROR);
   }
 
@@ -193,7 +191,6 @@ exports.handler = async options => {
 
     process.exit(EXIT_CODES.SUCCESS);
   } catch (error) {
-    trackCommandUsage('sandbox-sync', { successful: false }, accountId);
     process.exit(EXIT_CODES.ERROR);
   }
 };

package/commands/theme/marketplace-validate.js

@@ -1,5 +1,4 @@
-const Spinnies = require('spinnies');
-
+const SpinniesManager = require('../../lib/SpinniesManager');
 const {
   addConfigOptions,
   addAccountOptions,
@@ -31,8 +30,9 @@ exports.handler = async options => {
 
   trackCommandUsage('validate', null, accountId);
 
-  const spinnies = new Spinnies();
-  spinnies.add('marketplaceValidation', {
+  SpinniesManager.init();
+
+  SpinniesManager.add('marketplaceValidation', {
     text: i18n(`${i18nKey}.logs.validatingTheme`, {
       path: src,
     }),
@@ -42,7 +42,7 @@ exports.handler = async options => {
   const validationId = await kickOffValidation(accountId, assetType, src);
   await pollForValidationFinish(accountId, validationId);
 
-  spinnies.remove('marketplaceValidation');
+  SpinniesManager.remove('marketplaceValidation');
 
   const validationResults = await fetchValidationResults(
     accountId,

package/lang/en.lyaml

@@ -448,8 +448,7 @@ en:
           dev:
             describe: "Start local dev for the current project"
             logs:
-              betaMessage: "{{#yellow}}{{#bold}}[beta]{{/bold}}{{/yellow}} HubSpot projects local development"
-              learnMoreLink: "Learn more about the projects local dev server"
+              betaMessage: "HubSpot projects local development"
               nonSandboxWarning: "Testing in a sandbox is strongly recommended. To switch the target account, select an option below or run {{#bold}}`hs accounts use`{{/bold}} before running the command again."
               placeholderAccountSelection: "Using default account as target account (for now)"
               projectMustExistExplanation: "The project {{ projectName }} does not exist in the target account {{ accountIdentifier}}. This command requires the project to exist in the target account."
@@ -464,8 +463,8 @@ en:
               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"
+              extension:
+                describe: "The extension that you would like to run locally"
             errors:
               noProjectConfig: "No project detected. Please run this command again from a project directory."
               projectLockedError: "Your project is locked. This may mean that another user is running the {{#bold}}`hs project dev`{{/bold}} command for this project. If this is you, unlock the project in Projects UI."
@@ -849,7 +848,20 @@ en:
     lib:
       DevServerManager:
         portConflict: "The port {{ port }} is already in use."
+      LocalDevManagerV2:
+        failedToInitialize: "Missing required arguments to initialize Local Dev"
+        betaMessage: "HubSpot projects local development"
+        running: "Running {{#bold}}{{ projectName }}{{/bold}} locally on {{ accountIdentifier }}, waiting for changes ..."
+        quitHelper: "Press {{#bold}}'q'{{/bold}} to stop the local dev server"
+        viewInHubSpotLink: "View in HubSpot"
+        exitingStart: "Stopping local dev server ..."
+        exitingSucceed: "Successfully exited"
+        exitingFail: "Failed to cleanup before exiting"
+        devServer:
+          cleanupError: "Failed to cleanup local dev server: {{ message }}"
+          startError: "Failed to start local dev server: {{ message }}"
       LocalDevManager:
+        failedToInitialize: "Missing required arguments to initialize Local Dev Manager"
         exitingStart: "Stopping local dev server ..."
         exitingSucceed: "Successfully exited"
         exitingFail: "Failed to clean up before exiting"
@@ -857,16 +869,16 @@ en:
         cancelledFromUI: "The dev process has been cancelled from the UI. Any changes made since cancelling have not been uploaded. To resume dev mode, rerun {{#yellow}}`hs project dev`{{/yellow}}."
         header:
           betaMessage: "{{#yellow}}{{#bold}}[beta]{{/bold}}{{/yellow}} HubSpot projects local development"
-          learnMoreLink: "Learn more about the projects local dev server"
-          running: "Running {{ projectName}} locally on {{ accountIdentifier }}, waiting for changes ..."
+          running: "Running {{#bold}}{{ projectName }}{{/bold}} locally on {{ accountIdentifier }}, waiting for changes ..."
           quitHelper: "Press {{#bold}}'q'{{/bold}} to stop the local dev server"
           viewInHubSpotLink: "View in HubSpot"
           status:
             clean: "{{#bold}}Status:{{/bold}} {{#green}}Everything up to date{{/green}}"
+            buildError: "{{#bold}}Status:{{/bold}} {{#red}}Latest build failed{{/red}}"
+            deployError: "{{#bold}}Status:{{/bold}} {{#red}}Latest deploy failed{{/red}}"
             uploadPending: "{{#bold}}Status:{{/bold}} {{#yellow}}Upload is pending{{/yellow}}"
             noUploadsAllowed: "{{#bold}}Status:{{/bold}} {{#red}}Change requires upload, but uploads are not allowed{{/red}}"
             manualUploadRequired: "{{#bold}}Status:{{/bold}} {{#yellow}}Change requires manual upload{{/yellow}}"
-            supportedChange: "{{#bold}}Status:{{/bold}} {{#green}}Change handled by local dev server{{/green}}"
             manualUpload: "{{#bold}}Status:{{/bold}} {{#green}}Manually uploading pending changes{{/green}}"
         upload:
           noUploadsAllowed: "The change to {{ filePath }} requires an upload, but the CLI cannot upload to a project that is using a github integration."
@@ -876,6 +888,8 @@ en:
           manualUploadExplanation1: "{{#yellow}}> Dev server is running on a {{#bold}}non-sandbox account{{/bold}}.{{/yellow}}"
           manualUploadExplanation2: "{{#yellow}}> Uploading changes may overwrite production data.{{/yellow}}"
           manualUploadPrompt: "? Manually upload and deploy project? {{#green}}Y/n{{/green}}"
+          extensionNotAllowed: "Extension not allowed for {{ filePath }}"
+          fileIgnored: "File ignored: {{ filePath }}"
           uploadingAddChange: "[INFO] Uploading {{ filePath }}"
           uploadedAddChange: "[INFO] Uploaded {{ filePath }}"
           uploadingRemoveChange: "[INFO] Removing {{ filePath }}"
@@ -883,6 +897,9 @@ en:
           uploadingChanges: "{{#bold}}Building #{{ buildId }} and deploying recent changes on {{ accountIdentifier }}{{/bold}}"
           uploadedChangesSucceeded: "{{#bold}}Built #{{ buildId }} and deployed recent changes on {{ accountIdentifier }}{{/bold}}"
           uploadedChangesFailed: "{{#bold}}Failed to build #{{ buildId }} and deploy recent changes on {{ accountIdentifier }}{{/bold}}"
+        devServer:
+          startError: "{{#red}}[ERROR]{{/red}} Failed to start local dev server"
+          cleanupError: "{{#red}}[ERROR]{{/red}} Failed to cleanup local dev server"
       projects:
         uploadProjectFiles:
           add: "Uploading {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
@@ -909,6 +926,7 @@ en:
           feedbackHeader: "We'd love to hear your feedback!"
           feedbackMessage: "How are you liking the new projects and developer tools? \n > Run `{{#yellow}}hs feedback{{/yellow}}` to let us know what you think!\n"
       ui:
+        betaTag: "{{#bold}}[beta]{{/bold}}"
         betaWarning:
           header: "{{#yellow}}***************************** WARNING ****************************{{/yellow}}"
           footer: "{{#yellow}}******************************************************************{{/yellow}}"

package/lib/DevServerManager.js

@@ -1,8 +1,9 @@
 const express = require('express');
 const bodyParser = require('body-parser');
 const cors = require('cors');
-const { i18n } = require('./lang');
+const { walk } = require('@hubspot/cli-lib/lib/walk');
 const { getProjectDetailUrl } = require('./projects');
+const { i18n } = require('./lang');
 const { EXIT_CODES } = require('./enums/exitCodes');
 const { logger } = require('@hubspot/cli-lib/logger');
 
@@ -12,10 +13,21 @@ const DEFAULT_PORT = 8080;
 
 class DevServerManager {
   constructor() {
+    this.initialized = false;
     this.server = null;
+    this.path = null;
     this.devServers = {};
   }
 
+  safeLoadServer() {
+    try {
+      const { DevModeInterface } = require('@hubspot/ui-extensions-dev-server');
+      this.devServers['uie'] = DevModeInterface;
+    } catch (e) {
+      logger.debug('Failed to load dev server interface: ', e);
+    }
+  }
+
   async iterateDevServers(callback) {
     const serverKeys = Object.keys(this.devServers);
 
@@ -26,7 +38,17 @@ class DevServerManager {
     }
   }
 
-  async start({ projectConfig, accountId, port }) {
+  generateURL(path) {
+    return this.path ? `${this.path}/${path}` : null;
+  }
+
+  async start({
+    accountId,
+    debug,
+    extension,
+    projectConfig,
+    projectSourceDir,
+  }) {
     const app = express();
 
     // Install Middleware
@@ -46,46 +68,49 @@ class DevServerManager {
     app.get('/hs/project', (req, res) => {
       res.redirect(getProjectDetailUrl(projectConfig.name, accountId));
     });
-    app.get('/hs/learnMore', (req, res) => {
-      //TODO link to docs
-      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).on('error', err => {
+    this.server = await app.listen(DEFAULT_PORT).on('error', err => {
       if (err.code === 'EADDRINUSE') {
-        logger.error(
-          i18n(`${i18nKey}.portConflict`, { port: port || DEFAULT_PORT })
-        );
+        logger.error(i18n(`${i18nKey}.portConflict`, { port: DEFAULT_PORT }));
         logger.log();
         process.exit(EXIT_CODES.ERROR);
       }
     });
 
-    return this.server.address()
+    const projectFiles = await walk(projectSourceDir);
+
+    // Initialize component servers
+    await this.iterateDevServers(async serverInterface => {
+      if (serverInterface.start) {
+        await serverInterface.start({
+          accountId,
+          debug,
+          extension,
+          projectConfig,
+          projectFiles,
+        });
+      }
+    });
+
+    this.path = this.server.address()
       ? `http://localhost:${this.server.address().port}`
       : null;
-  }
 
-  async notify() {
-    return { uploadRequired: true };
-  }
-
-  async execute() {
-    return;
+    this.initialized = true;
   }
 
   async cleanup() {
-    if (this.server) {
-      await this.server.close();
+    if (this.initialized) {
+      await this.iterateDevServers(async serverInterface => {
+        if (serverInterface.cleanup) {
+          await serverInterface.cleanup();
+        }
+      });
+
+      if (this.server) {
+        await this.server.close();
+      }
     }
   }
 }