@hubspot/cli 4.2.1-beta.2 → 4.2.1-beta.3

package/lang/en.lyaml

@@ -67,6 +67,18 @@ en:
               nameBased: "Print information for the account in the config with name equal to \"MyAccount\""
             name: "{{#bold}}Account name{{/bold}}: {{ name }}"
             scopeGroups: "{{#bold}}Scopes available{{/bold}}:"
+          clean:
+            describe: "Checks for inactive accounts and removes them from the CLI config"
+            noResults: "No inactive accounts found to remove."
+            loading:
+              add: "Looking for inactive accounts…"
+            inactiveAccountsFound:
+              one: "1 inactive account found:"
+              other: "{{ count }} inactive accounts found:"
+            confirm:
+              one: "Remove 1 inactive account from the CLI config?"
+              other: "Remove {{ count }} inactive accounts from the CLI config?"
+            removeSuccess: "Removed {{ accountName }} from the CLI config."
       auth:
         describe: "Configure authentication for a HubSpot account. Supported authentication protocols are {{ supportedProtocols }}."
         errors:
@@ -455,21 +467,16 @@ en:
               projectMustExistExplanation: "The project {{ projectName }} does not exist in the target account {{ accountIdentifier}}. This command requires the project to exist in the target account."
               choseNotToCreateProject: "Exiting because this command requires the project to exist in the target account."
               initialUploadMessage: "HubSpot Local Dev Server Startup"
+              declineDefaultSandboxExplanation: "To develop on a different account, run {{ useCommand }} to change your default account, then re-run {{ devCommand }}."
             status:
               creatingProject: "Creating project {{ projectName }} in {{ accountIdentifier }}"
               createdProject: "Created project {{ projectName }} in {{ accountIdentifier }}"
               failedToCreateProject: "Failed to create project in the target account."
-              startupMessage: "Starting local dev server for {{#bold}}{{ projectName }}{{/bold}} ..."
             prompt:
               createProject: "Create new project {{ projectName}} in {{#bold}}[{{ accountIdentifier }}]{{/bold}}?"
-            options:
-              local:
-                describe: "Run the alpha version of this command with some local dev server functionality"
-              localAll:
-                describe: "Run the alpha version of this command with all local dev server functionality"
             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."
+              projectLockedError: "Your project is locked. This may mean that another user is running the {{#bold}}`hs project watch`{{/bold}} command for this project. If this is you, unlock the project in Projects UI."
             examples:
               default: "Start local dev for the current project"
           create:
@@ -595,6 +602,8 @@ en:
             errors:
               downloadFailed: "Something went wrong downloading the project"
               projectNotFound: "Your project {{ projectName }} could not be found in {{ accountId }}"
+            warnings:
+              cannotDownloadWithinProject: "Cancelling project download. Please run the command again outside the context of an existing project."
             options:
               buildNumber:
                 describe: "The build number to download"
@@ -854,68 +863,33 @@ en:
         portConflict: "The port {{ port }} is already in use."
         notInitialized: "The Dev Server Manager must be initialized before it is started."
         noCompatibleComponents: "Skipping call to {{ serverKey }} because there are no compatible components in the project."
-      LocalDevManagerV2:
+      LocalDevManager:
         failedToInitialize: "Missing required arguments to initialize Local Dev"
         noComponents: "There are no components in this project."
+        noDeployedBuild: "There is no deployed build for this project in {{ accountIdentifier }}."
         noRunnableComponents: "There are no components in this project that support local development."
         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"
+        viewInHubSpotLink: "View project in HubSpot"
         exitingStart: "Stopping local dev server ..."
         exitingSucceed: "Successfully exited"
         exitingFail: "Failed to cleanup before exiting"
         uploadWarning:
-          missingComponents: "Your deployed project does not contain the components {{#bold}}'{{ missingComponents }}'{{/bold}}. This may cause issues in local development."
+          appLabel: "[App]"
+          uiExtensionLabel: "[UI Extension]"
+          configEdit: "You edited the configuration file {{#bold}}{{ path }}{{/bold}}. Changes to configuration files cannot be handled by the local dev server."
+          missingComponents: "The deployed build for this project does not contain {{#bold}}'{{ missingComponents }}'{{/bold}}. This may cause issues in local development."
           header: "{{ reason }} To reflect these changes:"
-          stopDev: "  * Stop {{#bold}}`hs project dev`{{/bold}}"
-          runUpload: "  * Run {{#bold}}`hs project upload`{{/bold}}"
-          runUploadWithAccount: "  * Run {{#bold}}`hs project upload --account={{ accountId }}`{{/bold}}"
-          restartDev: "  * Re-run {{#bold}}`hs project dev`{{/bold}}"
+          stopDev: "  * Stop {{ command }}"
+          runUpload: "  * Run {{ command }}"
+          runUploadWithAccount: "  * Run {{ command }}"
+          restartDev: "  * Re-run {{ command }}"
         devServer:
           cleanupError: "Failed to cleanup local dev server: {{ message }}"
           setupError: "Failed to setup 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"
-        previousStagingBuildCancelled: "Failed to create a staging build because the project was already locked. It is now unlocked. Run the command again."
-        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"
-          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}}"
-            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."
-          manualUploadSkipped: "Manually upload and deploy project to production account: {{#green}}(n){{/green}}"
-          manualUploadConfirmed: "Manually upload and deploy project to production account: {{#green}}(Y){{/green}}"
-          manualUploadRequired: "Project file changes require a manual upload and deploy ..."
-          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 }}"
-          uploadedRemoveChange: "[INFO] Removed {{ filePath }}"
-          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"
+          fileChangeError: "Failed to notify local dev server of file change: {{ message }}"
       projects:
         uploadProjectFiles:
           add: "Uploading {{#bold}}{{ projectName }}{{/bold}} project files to {{ accountIdentifier }}"
@@ -930,6 +904,8 @@ en:
           createPrompt: "The project {{ projectName }} does not exist in {{ accountIdentifier }}. Would you like to create it?"
           createSuccess: "New project {{#bold}}{{ projectName }}{{/bold}} successfully created in {{#bold}}{{ accountIdentifier }}{{/bold}}."
           notFound: "Your project {{#bold}}{{ projectName }}{{/bold}} could not be found in {{#bold}}{{ accountIdentifier }}{{/bold}}."
+        pollFetchProject:
+          checkingProject: "Checking if project exists in {{ accountIdentifier }}"
         makePollTaskStatusFunc:
           componentCountSingular: "Found 1 component in this project"
           componentCount: "Found {{ numComponents }} components in this project"
@@ -945,7 +921,7 @@ en:
           noPlatformVersion: "No platformVersion found in hsproject.json. Falling back to version \"{{ defaultVersion }}\"."
           noPlatformVersionAlt: "No platformVersion found in hsproject.json. Falling back to default version."
       ui:
-        betaTag: "{{#bold}}[beta]{{/bold}}"
+        betaTag: "{{#bold}}[BETA]{{/bold}}"
         betaWarning:
           header: "{{#yellow}}***************************** WARNING ****************************{{/yellow}}"
           footer: "{{#yellow}}******************************************************************{{/yellow}}"
@@ -1011,9 +987,10 @@ en:
       prompts:
         projectDevTargetAccountPrompt:
           createNewSandboxOption: "<Test on a new development sandbox>"
-          chooseDefaultAccountOption: "<{{#bold}}!{{/bold}} Test on this production account {{#bold}}!{{/bold}}>"
+          chooseDefaultAccountOption: "<{{#bold}}\U00002757{{/bold}} Test on this production account {{#bold}}\U00002757{{/bold}}>"
           promptMessage: "[--account] Choose a sandbox under {{ accountIdentifier }} to test with:"
           sandboxLimit: "You’ve reached the limit of {{ limit }} development sandboxes"
+          confirmDefaultSandboxAccount: "Continue testing on {{#bold}}{{ accountName }} ({{ accountType }}){{/bold}}? (Y/n)"
         projectLogsPrompt:
           projectName:
             message: "[--project] Enter the project name:"

package/lib/DevServerManager.js

@@ -1,17 +1,12 @@
-const express = require('express');
-const bodyParser = require('body-parser');
-const cors = require('cors');
 const httpClient = require('@hubspot/cli-lib/http');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getProjectDetailUrl } = require('./projects');
 const { COMPONENT_TYPES } = require('./projectStructure');
 const { i18n } = require('./lang');
-const { EXIT_CODES } = require('./enums/exitCodes');
 const { promptUser } = require('./prompts/promptUtils');
+const { DevModeInterface } = require('@hubspot/ui-extensions-dev-server');
 
 const i18nKey = 'cli.lib.DevServerManager';
 
-const DEFAULT_PORT = 8080;
 const SERVER_KEYS = {
   app: 'app',
 };
@@ -23,20 +18,13 @@ class DevServerManager {
     this.componentsByType = {};
     this.server = null;
     this.path = null;
-    this.devServers = {};
-    this.debug = false;
-  }
-
-  safeLoadServer() {
-    try {
-      const { DevModeInterface } = require('@hubspot/ui-extensions-dev-server');
-      this.devServers[SERVER_KEYS.app] = {
+    this.devServers = {
+      [SERVER_KEYS.app]: {
         componentType: COMPONENT_TYPES.app,
         serverInterface: DevModeInterface,
-      };
-    } catch (e) {
-      logger.debug('Failed to load dev server interface: ', e);
-    }
+      },
+    };
+    this.debug = false;
   }
 
   async iterateDevServers(callback) {
@@ -57,10 +45,6 @@ class DevServerManager {
     }
   }
 
-  generateURL(path) {
-    return this.path ? `${this.path}/${path}` : null;
-  }
-
   arrangeComponentsByType(components) {
     return components.reduce((acc, component) => {
       if (!acc[component.type]) {
@@ -73,18 +57,14 @@ class DevServerManager {
     }, {});
   }
 
-  async setup({ alpha, components, debug, onUploadRequired }) {
+  async setup({ components, debug, onUploadRequired }) {
     this.debug = debug;
-
     this.componentsByType = this.arrangeComponentsByType(components);
 
-    this.safeLoadServer();
-
     await this.iterateDevServers(
       async (serverInterface, compatibleComponents) => {
         if (serverInterface.setup) {
           await serverInterface.setup({
-            alpha,
             components: compatibleComponents,
             debug,
             onUploadRequired,
@@ -97,42 +77,11 @@ class DevServerManager {
     this.initialized = true;
   }
 
-  async start({ alpha, accountId, projectConfig }) {
+  async start({ accountId, projectConfig }) {
     if (this.initialized) {
-      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));
-      });
-
-      // Start server
-      this.server = await app.listen(DEFAULT_PORT).on('error', err => {
-        if (err.code === 'EADDRINUSE') {
-          logger.error(i18n(`${i18nKey}.portConflict`, { port: DEFAULT_PORT }));
-          logger.log();
-          process.exit(EXIT_CODES.ERROR);
-        }
-      });
-
-      // Initialize component servers
       await this.iterateDevServers(async serverInterface => {
         if (serverInterface.start) {
           await serverInterface.start({
-            alpha,
             accountId,
             debug: this.debug,
             httpClient,
@@ -140,10 +89,6 @@ class DevServerManager {
           });
         }
       });
-
-      this.path = this.server.address()
-        ? `http://localhost:${this.server.address().port}`
-        : null;
     } else {
       throw new Error(i18n(`${i18nKey}.notInitialized`));
     }
@@ -151,6 +96,16 @@ class DevServerManager {
     this.started = true;
   }
 
+  fileChange({ filePath, event }) {
+    if (this.started) {
+      this.iterateDevServers(async serverInterface => {
+        if (serverInterface.fileChange) {
+          await serverInterface.fileChange(filePath, event);
+        }
+      });
+    }
+  }
+
   async cleanup() {
     if (this.started) {
       await this.iterateDevServers(async serverInterface => {
@@ -158,10 +113,6 @@ class DevServerManager {
           await serverInterface.cleanup();
         }
       });
-
-      if (this.server) {
-        await this.server.close();
-      }
     }
   }
 }