@hubspot/cli 3.0.12-beta.1 → 3.0.13-beta.0

package/commands/project/upload.js

@@ -48,6 +48,8 @@ exports.handler = async options => {
       status,
     } = await pollBuildStatus(accountId, projectConfig.name, buildId);
 
+    uiLine();
+
     if (status === 'FAILURE') {
       exitCode = EXIT_CODES.ERROR;
       return;

package/commands/project/watch.js

@@ -26,6 +26,7 @@ const {
 } = require('@hubspot/cli-lib/api/dfs');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+const { handleKeypress, handleExit } = require('@hubspot/cli-lib/lib/process');
 
 const i18nKey = 'cli.commands.project.subcommands.watch';
 
@@ -48,13 +49,13 @@ const handleBuildStatus = async (accountId, projectName, buildId) => {
   }
 };
 
-const handleSigInt = (accountId, projectName, currentBuildId) => {
-  process.removeAllListeners('SIGINT');
-  process.on('SIGINT', async () => {
+const handleUserInput = (accountId, projectName, currentBuildId) => {
+  const onTerminate = async () => {
+    logger.log(i18n(`${i18nKey}.logs.processExited`));
+
     if (currentBuildId) {
       try {
         await cancelStagedBuild(accountId, projectName);
-        logger.debug(i18n(`${i18nKey}.debug.buildCancelled`));
         process.exit(EXIT_CODES.SUCCESS);
       } catch (err) {
         logApiErrorInstance(
@@ -66,13 +67,20 @@ const handleSigInt = (accountId, projectName, currentBuildId) => {
     } else {
       process.exit(EXIT_CODES.SUCCESS);
     }
+  };
+
+  handleExit(onTerminate);
+  handleKeypress(key => {
+    if ((key.ctrl && key.name === 'c') || key.name === 'q') {
+      onTerminate();
+    }
   });
 };
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);
 
-  const { path: projectPath } = options;
+  const { initialUpload, path: projectPath } = options;
   const accountId = getAccountId(options);
 
   trackCommandUsage('project-watch', { projectPath }, accountId);
@@ -83,11 +91,12 @@ exports.handler = async options => {
 
   await ensureProjectExists(accountId, projectConfig.name);
 
-  const { results } = await fetchProjectBuilds(
+  const { results: builds } = await fetchProjectBuilds(
     accountId,
     projectConfig.name,
     options
   );
+  const hasNoBuilds = !builds || !builds.length;
 
   const startWatching = async () => {
     await createWatcher(
@@ -95,12 +104,12 @@ exports.handler = async options => {
       projectConfig,
       projectDir,
       handleBuildStatus,
-      handleSigInt
+      handleUserInput
     );
   };
 
   // Upload all files if no build exists for this project yet
-  if (!results || !results.length) {
+  if (initialUpload || hasNoBuilds) {
     await handleProjectUpload(
       accountId,
       projectConfig,
@@ -114,10 +123,16 @@ exports.handler = async options => {
 
 exports.builder = yargs => {
   yargs.positional('path', {
-    describe: i18n(`${i18nKey}.describe`),
+    describe: i18n(`${i18nKey}.positionals.path.describe`),
     type: 'string',
   });
 
+  yargs.option('initial-upload', {
+    alias: 'i',
+    describe: i18n(`${i18nKey}.options.initialUpload.describe`),
+    type: 'boolean',
+  });
+
   yargs.example([
     ['$0 project watch myProjectFolder', i18n(`${i18nKey}.examples.default`)],
   ]);

package/lib/projects.js

@@ -32,7 +32,7 @@ const { shouldIgnoreFile } = require('@hubspot/cli-lib/ignoreRules');
 const { getCwd } = require('@hubspot/cli-lib/path');
 const { promptUser } = require('./prompts/promptUtils');
 const { EXIT_CODES } = require('./enums/exitCodes');
-const { uiLine, uiAccountDescription } = require('../lib/ui');
+const { uiLine, uiLink, uiAccountDescription } = require('../lib/ui');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 
 const writeProjectConfig = (configPath, config) => {
@@ -165,7 +165,7 @@ const validateProjectConfig = (projectConfig, projectDir) => {
 const ensureProjectExists = async (
   accountId,
   projectName,
-  { forceCreate, allowCreate } = { forceCreate: false, allowCreate: true }
+  { forceCreate = false, allowCreate = true } = {}
 ) => {
   try {
     await fetchProject(accountId, projectName);
@@ -214,6 +214,11 @@ const getProjectDetailUrl = (projectName, accountId) => {
   return `${baseUrl}/developer-projects/${accountId}/project/${projectName}`;
 };
 
+const getProjectBuildDetailUrl = (projectName, buildId, accountId) => {
+  if (!projectName || !buildId || !accountId) return;
+  return `${getProjectDetailUrl(projectName, accountId)}/build/${buildId}`;
+};
+
 const uploadProjectFiles = async (accountId, projectName, filePath) => {
   const i18nKey = 'cli.commands.project.subcommands.upload';
   const spinnies = new Spinnies({
@@ -336,7 +341,12 @@ const showProjectWelcomeMessage = () => {
   uiLine();
 };
 
-const makePollTaskStatusFunc = ({ statusFn, statusText, statusStrings }) => {
+const makePollTaskStatusFunc = ({
+  statusFn,
+  statusText,
+  statusStrings,
+  linkToHubSpot,
+}) => {
   const isTaskComplete = task => {
     if (
       !task[statusText.SUBTASK_KEY].length ||
@@ -348,7 +358,12 @@ const makePollTaskStatusFunc = ({ statusFn, statusText, statusStrings }) => {
     }
   };
 
-  return async (accountId, taskName, taskId, buildId) => {
+  return async (accountId, taskName, taskId) => {
+    let hubspotLinkText = '';
+    if (linkToHubSpot) {
+      logger.log(`\n${linkToHubSpot(taskName, taskId, accountId)}\n`);
+    }
+
     const spinnies = new Spinnies({
       succeedColor: 'white',
       failColor: 'white',
@@ -359,20 +374,23 @@ const makePollTaskStatusFunc = ({ statusFn, statusText, statusStrings }) => {
 
     const initialTaskStatus = await statusFn(accountId, taskName, taskId);
 
+    const numOfComponents = initialTaskStatus[statusText.SUBTASK_KEY].length;
+    const componentCountText = `\nFound ${numOfComponents} component${
+      numOfComponents !== 1 ? 's' : ''
+    } in this project ...\n`;
+
     spinnies.update('overallTaskStatus', {
-      text: statusStrings.INITIALIZE(
-        taskName,
-        initialTaskStatus[statusText.SUBTASK_KEY].length
-      ),
+      text: `${statusStrings.INITIALIZE(taskName)}${componentCountText}`,
     });
 
     for (let subTask of initialTaskStatus[statusText.SUBTASK_KEY]) {
       const subTaskName = subTask[statusText.SUBTASK_NAME_KEY];
 
       spinnies.add(subTaskName, {
-        text: `${chalk.bold(subTaskName)} #${buildId || taskId} ${
+        text: `${chalk.bold(subTaskName)} #${taskId} ${
           statusText.STATUS_TEXT[statusText.STATES.ENQUEUED]
         }\n`,
+        indent: 2,
       });
     }
 
@@ -416,11 +434,11 @@ const makePollTaskStatusFunc = ({ statusFn, statusText, statusStrings }) => {
 
             if (status === statusText.STATES.SUCCESS) {
               spinnies.succeed('overallTaskStatus', {
-                text: statusStrings.SUCCESS(taskName),
+                text: `${statusStrings.SUCCESS(taskName)}${hubspotLinkText}`,
               });
             } else if (status === statusText.STATES.FAILURE) {
               spinnies.fail('overallTaskStatus', {
-                text: statusStrings.FAIL(taskName),
+                text: `${statusStrings.FAIL(taskName)}${hubspotLinkText}`,
               });
 
               const failedSubtask = subTaskStatus.filter(
@@ -430,7 +448,7 @@ const makePollTaskStatusFunc = ({ statusFn, statusText, statusStrings }) => {
               uiLine();
               logger.log(
                 `${statusStrings.SUBTASK_FAIL(
-                  buildId || taskId,
+                  taskId,
                   failedSubtask.length === 1
                     ? failedSubtask[0][statusText.SUBTASK_NAME_KEY]
                     : failedSubtask.length + ' components'
@@ -459,13 +477,16 @@ const makePollTaskStatusFunc = ({ statusFn, statusText, statusStrings }) => {
 };
 
 const pollBuildStatus = makePollTaskStatusFunc({
+  linkToHubSpot: (projectName, buildId, accountId) =>
+    uiLink(
+      `View build #${buildId} in HubSpot`,
+      getProjectBuildDetailUrl(projectName, buildId, accountId),
+      { useColor: true }
+    ),
   statusFn: getBuildStatus,
   statusText: PROJECT_BUILD_TEXT,
   statusStrings: {
-    INITIALIZE: (name, numOfComponents) =>
-      `Building ${chalk.bold(name)}\n\nFound ${numOfComponents} component${
-        numOfComponents !== 1 ? 's' : ''
-      } in this project ...\n`,
+    INITIALIZE: name => `Building ${chalk.bold(name)}`,
     SUCCESS: name => `Built ${chalk.bold(name)}`,
     FAIL: name => `Failed to build ${chalk.bold(name)}`,
     SUBTASK_FAIL: (taskId, name) =>
@@ -479,10 +500,7 @@ const pollDeployStatus = makePollTaskStatusFunc({
   statusFn: getDeployStatus,
   statusText: PROJECT_DEPLOY_TEXT,
   statusStrings: {
-    INITIALIZE: (name, numOfComponents) =>
-      `Deploying ${chalk.bold(name)}\n\nFound ${numOfComponents} component${
-        numOfComponents !== 1 ? 's' : ''
-      } in this project ...\n`,
+    INITIALIZE: name => `Deploying ${chalk.bold(name)}`,
     SUCCESS: name => `Deployed ${chalk.bold(name)}`,
     FAIL: name => `Failed to deploy ${chalk.bold(name)}`,
     SUBTASK_FAIL: (taskId, name) =>
@@ -501,6 +519,7 @@ module.exports = {
   validateProjectConfig,
   showProjectWelcomeMessage,
   getProjectDetailUrl,
+  getProjectBuildDetailUrl,
   pollBuildStatus,
   pollDeployStatus,
   ensureProjectExists,

package/lib/prompts/personalAccessKeyPrompt.js

@@ -107,7 +107,7 @@ const PERSONAL_ACCESS_KEY = {
   name: 'personalAccessKey',
   message: i18n(`${i18nKey}.enterPersonalAccessKey`),
   validate(val) {
-    if (typeof val !== 'string') {
+    if (!val || typeof val !== 'string') {
       return i18n(`${i18nKey}.errors.invalidPersonalAccessKey`);
     } else if (val[0] === '•') {
       return i18n(`${i18nKey}.errors.invalidPersonalAccessKeyCopy`);

package/lib/serverlessLogs.js

@@ -1,5 +1,4 @@
 const https = require('https');
-const readline = require('readline');
 
 const { logger } = require('@hubspot/cli-lib/logger');
 const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
@@ -9,20 +8,12 @@ const {
   ApiErrorContext,
 } = require('@hubspot/cli-lib/errorHandlers');
 const { base64EncodeString } = require('@hubspot/cli-lib/lib/encoding');
+const { handleKeypress } = require('@hubspot/cli-lib/lib/process');
+
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 const TAIL_DELAY = 5000;
 
-const handleKeypressToExit = exit => {
-  readline.emitKeypressEvents(process.stdin);
-  process.stdin.setRawMode(true);
-  process.stdin.on('keypress', (str, key) => {
-    if (key && ((key.ctrl && key.name == 'c') || key.name === 'escape')) {
-      exit(key.name === 'escape' ? 'esc' : 'ctrl+c');
-    }
-  });
-};
-
 const tailLogs = async ({
   accountId,
   compact,
@@ -76,12 +67,13 @@ const tailLogs = async ({
     }, TAIL_DELAY);
   };
 
-  handleKeypressToExit(exitKey => {
-    spinnies.succeed('tailLogs', {
-      text: `Stopped polling because "${exitKey}" was pressed.`,
-    });
-    process.exit(EXIT_CODES.SUCCESS);
+  handleKeypress(key => {
+    if ((key.ctrl && key.name == 'c') || key.name === 'escape') {
+      spinnies.succeed('tailLogs', { text: `Stopped polling` });
+      process.exit(EXIT_CODES.SUCCESS);
+    }
   });
+
   await tail(initialAfter);
 };
 

package/lib/ui.js

@@ -22,7 +22,14 @@ const uiLine = () => {
  */
 const uiLink = (linkText, url, options = {}) => {
   if (supportsHyperlinks.stdout) {
-    return ['\u001B]8;;', url, '\u0007', linkText, '\u001B]8;;\u0007'].join('');
+    const result = [
+      '\u001B]8;;',
+      url,
+      '\u0007',
+      linkText,
+      '\u001B]8;;\u0007',
+    ].join('');
+    return options.useColor ? chalk.cyan(result) : result;
   } else {
     return options.fallback ? `${linkText}: ${url}` : linkText;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.12-beta.1",
+  "version": "3.0.13-beta.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,8 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^3.0.12-beta.1",
-    "@hubspot/serverless-dev-runtime": "^3.0.12-beta.1",
+    "@hubspot/cli-lib": "^3.0.12",
+    "@hubspot/serverless-dev-runtime": "^3.0.12",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -39,5 +39,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "01b4b086b16f92ec7a0c5022ed0beb4de6a16ae7"
+  "gitHead": "a4c15c0ae8f06064273c51c44a7b7b38863bcd38"
 }

package/bin/hubspot

@@ -1,3 +0,0 @@
-#!/usr/bin/env node
-
-require('./cli');