@hubspot/cli 3.0.13-beta.2 → 4.0.0

package/bin/cli.js

@@ -58,47 +58,74 @@ const getTerminalWidth = () => {
   return width;
 };
 
+const handleFailure = (msg, err, yargs) => {
+  if (msg) {
+    logger.error(msg);
+  } else if (err) {
+    logErrorInstance(err);
+  }
+
+  if (msg === null) {
+    yargs.showHelp();
+    process.exit(EXIT_CODES.SUCCESS);
+  } else {
+    process.exit(EXIT_CODES.ERROR);
+  }
+};
+
+const performChecks = argv => {
+  // "hs config set default-account" has moved to "hs accounts use"
+  if (
+    argv._[0] === 'config' &&
+    argv._[1] === 'set' &&
+    argv._[2] === 'default-account'
+  ) {
+    logger.error(i18n(`${i18nKey}.setDefaultAccountMoved`));
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  // Require "project" command when running upload/watch inside of a project
+  if (argv._.length === 1 && ['upload', 'watch'].includes(argv._[0])) {
+    if (getIsInProject(argv.src)) {
+      logger.error(
+        i18n(`${i18nKey}.srcIsProject`, {
+          src: argv.src || './',
+          command: argv._.join(' '),
+        })
+      );
+      process.exit(EXIT_CODES.ERROR);
+    } else {
+      return true;
+    }
+  } else {
+    return true;
+  }
+};
+
 const argv = yargs
   .usage('Tools for working with HubSpot')
   .middleware([setLogLevel])
   .exitProcess(false)
-  .fail((msg, err, yargs) => {
-    if (msg) {
-      logger.error(msg);
-    } else if (err) {
-      logErrorInstance(err);
-    }
-
-    if (msg === null) {
-      yargs.showHelp();
-      process.exit(EXIT_CODES.SUCCESS);
-    } else {
-      process.exit(EXIT_CODES.ERROR);
-    }
-  })
+  .fail(handleFailure)
   .option('debug', {
     alias: 'd',
     default: false,
     describe: 'set log level to debug',
     type: 'boolean',
   })
-  .check(argv => {
-    if (argv._.length === 1 && ['upload', 'watch'].includes(argv._[0])) {
-      if (getIsInProject(argv.src)) {
-        logger.error(
-          i18n(`${i18nKey}.srcIsProject`, {
-            src: argv.src,
-            command: argv._.join(' '),
-          })
-        );
-        process.exit(EXIT_CODES.ERROR);
-      } else {
-        return true;
-      }
-    } else {
-      return true;
-    }
+  .option('noHyperlinks', {
+    default: false,
+    describe: 'prevent hyperlinks from displaying in the ui',
+    hidden: true,
+    type: 'boolean',
+  })
+  .option('noColor', {
+    default: false,
+    describe: 'prevent color from displaying in the ui',
+    hidden: true,
+    type: 'boolean',
   })
+  .check(performChecks)
   .command(authCommand)
   .command(initCommand)
   .command(logsCommand)

package/commands/accounts/use.js

@@ -33,7 +33,7 @@ const selectAccountFromConfig = async config => {
   return selectedDefault;
 };
 
-exports.command = 'use [account]';
+exports.command = 'use [--account]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
@@ -68,14 +68,17 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  yargs.positional('account', {
-    describe: i18n(`${i18nKey}.positionals.account.describe`),
+  yargs.option('account', {
+    describe: i18n(`${i18nKey}.options.account.describe`),
     type: 'string',
   });
   yargs.example([
     ['$0 accounts use', i18n(`${i18nKey}.examples.default`)],
-    ['$0 accounts use MyAccount', i18n(`${i18nKey}.examples.nameBased`)],
-    ['$0 accounts use 1234567', i18n(`${i18nKey}.examples.idBased`)],
+    [
+      '$0 accounts use --account=MyAccount',
+      i18n(`${i18nKey}.examples.nameBased`),
+    ],
+    ['$0 accounts use --account=1234567', i18n(`${i18nKey}.examples.idBased`)],
   ]);
 
   return yargs;

package/commands/config/set.js

@@ -33,7 +33,7 @@ const selectOptions = async () => {
 };
 
 const handleConfigUpdate = async (accountId, options) => {
-  const { defaultMode, httpTimeout, allowUsageTracking } = options;
+  const { allowUsageTracking, defaultMode, httpTimeout } = options;
 
   if (typeof defaultMode !== 'undefined') {
     await setDefaultMode({ defaultMode, accountId });
@@ -89,5 +89,8 @@ exports.builder = yargs => {
 
   yargs.example([['$0 config set', i18n(`${i18nKey}.examples.default`)]]);
 
+  //TODO remove this when "hs accounts use" is fully rolled out
+  yargs.strict(false);
+
   return yargs;
 };

package/commands/project/logs.js

@@ -120,7 +120,7 @@ const handleFunctionLog = async (accountId, options) => {
   return false;
 };
 
-exports.command = 'logs [--project] [--app] [--function]';
+exports.command = 'logs [--project] [--app] [--function] [--endpoint]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
@@ -128,21 +128,22 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  logger.log(options);
   const {
     projectName: promptProjectName,
     appName: promptAppName,
     functionName: promptFunctionName,
+    endpointName: promptEndpointName,
   } = await projectLogsPrompt(accountId, options);
 
   const projectName = options.project || promptProjectName;
   const appName = options.app || promptAppName;
   const functionName =
     options.function || promptFunctionName || options.endpoint;
+  const endpointName = options.endpoint || promptEndpointName;
 
   let relativeAppPath;
 
-  if (appName && !options.endpoint) {
+  if (appName && !endpointName) {
     await ensureProjectExists(accountId, projectName, {
       allowCreate: false,
     });
@@ -168,21 +169,31 @@ exports.handler = async options => {
 
   trackCommandUsage('project-logs', { latest: options.latest }, accountId);
 
-  const logsInfo = [
-    [accountId, `"${projectName}"`, `"${appName}"`, functionName],
-  ];
+  const logsInfo = [accountId, `"${projectName}"`];
+  let tableHeader;
 
-  logsInfo.unshift(
-    getTableHeader([
+  if (endpointName) {
+    logsInfo.push(`"${endpointName}"`);
+    tableHeader = getTableHeader([
+      i18n(`${i18nKey}.table.accountHeader`),
+      i18n(`${i18nKey}.table.projectHeader`),
+      i18n(`${i18nKey}.table.endpointHeader`),
+    ]);
+  } else {
+    logsInfo.push(`"${appName}"`);
+    logsInfo.push(functionName);
+    tableHeader = getTableHeader([
       i18n(`${i18nKey}.table.accountHeader`),
       i18n(`${i18nKey}.table.projectHeader`),
       i18n(`${i18nKey}.table.appHeader`),
       i18n(`${i18nKey}.table.functionHeader`),
-    ])
-  );
+    ]);
+  }
 
   logger.log(i18n(`${i18nKey}.logs.showingLogs`));
-  logger.log(getTableContents(logsInfo, { border: { bodyLeft: '  ' } }));
+  logger.log(
+    getTableContents([tableHeader, logsInfo], { border: { bodyLeft: '  ' } })
+  );
 
   logger.log(
     uiLink(
@@ -197,7 +208,7 @@ exports.handler = async options => {
     ...options,
     projectName,
     appPath: relativeAppPath,
-    functionName,
+    functionName: functionName || endpointName,
   });
 
   if (showFinalMessage) {
@@ -217,7 +228,6 @@ exports.builder = yargs => {
       endpoint: {
         alias: 'endpoint',
         describe: i18n(`${i18nKey}.options.endpoint.describe`),
-        hidden: true,
         requiresArg: true,
         type: 'string',
       },
@@ -253,10 +263,11 @@ exports.builder = yargs => {
     })
     .conflicts('follow', 'limit');
 
+  yargs.example([['$0 project logs', i18n(`${i18nKey}.examples.default`)]]);
   yargs.example([
     [
-      '$0 project logs --project="my-project" --app="app" --function=my-function',
-      i18n(`${i18nKey}.examples.default`),
+      '$0 project logs --project=my-project --app=app --function=my-function',
+      i18n(`${i18nKey}.examples.withOptions`),
     ],
   ]);
 

package/commands/upload.js

@@ -26,6 +26,7 @@ const {
   getAccountId,
   getMode,
 } = require('../lib/commonOpts');
+const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { getThemePreviewUrl } = require('@hubspot/cli-lib/lib/files');
@@ -34,7 +35,7 @@ const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const i18nKey = 'cli.commands.upload';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
-exports.command = 'upload <src> <dest>';
+exports.command = 'upload [--src] [--dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 const logThemePreview = (filePath, accountId) => {
@@ -50,8 +51,6 @@ const logThemePreview = (filePath, accountId) => {
 };
 
 exports.handler = async options => {
-  const { src, dest } = options;
-
   await loadAndValidateOptions(options);
 
   if (!validateMode(options)) {
@@ -60,6 +59,12 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
   const mode = getMode(options);
+
+  const uploadPromptAnswers = await uploadPrompt(options);
+
+  const src = options.src || uploadPromptAnswers.src;
+  const dest = options.dest || uploadPromptAnswers.dest;
+
   const absoluteSrcPath = path.resolve(getCwd(), src);
   let stats;
   try {

package/commands/watch.js

@@ -13,6 +13,7 @@ const {
   getAccountId,
   getMode,
 } = require('../lib/commonOpts');
+const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
@@ -20,11 +21,11 @@ const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const i18nKey = 'cli.commands.watch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
-exports.command = 'watch <src> <dest>';
+exports.command = 'watch [--src] [--dest]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
-  const { src, dest, remove, initialUpload, disableInitial, notify } = options;
+  const { remove, initialUpload, disableInitial, notify } = options;
 
   await loadAndValidateOptions(options);
 
@@ -35,6 +36,11 @@ exports.handler = async options => {
   const accountId = getAccountId(options);
   const mode = getMode(options);
 
+  const uploadPromptAnswers = await uploadPrompt(options);
+
+  const src = options.src || uploadPromptAnswers.src;
+  const dest = options.dest || uploadPromptAnswers.dest;
+
   const absoluteSrcPath = path.resolve(getCwd(), src);
   try {
     const stats = fs.statSync(absoluteSrcPath);

package/lib/hasFlag.js

@@ -0,0 +1,15 @@
+const process = require('process');
+
+// See https://github.com/sindresorhus/has-flag/blob/main/index.js (License: https://github.com/sindresorhus/has-flag/blob/main/license)
+
+function hasFlag(flag, argv = process.argv) {
+  const prefix = flag.startsWith('-') ? '' : flag.length === 1 ? '-' : '--';
+  const position = argv.indexOf(prefix + flag);
+  const terminatorPosition = argv.indexOf('--');
+  return (
+    position !== -1 &&
+    (terminatorPosition === -1 || position < terminatorPosition)
+  );
+}
+
+module.exports = hasFlag;

package/lib/projects.js

@@ -211,7 +211,7 @@ const getProjectDetailUrl = (projectName, accountId) => {
   if (!projectName) return;
 
   const baseUrl = getHubSpotWebsiteOrigin(
-    getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
+    getEnv(accountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
   );
 
   return `${baseUrl}/developer-projects/${accountId}/project/${projectName}`;
@@ -483,8 +483,7 @@ const pollBuildStatus = makePollTaskStatusFunc({
   linkToHubSpot: (projectName, buildId, accountId) =>
     uiLink(
       `View build #${buildId} in HubSpot`,
-      getProjectBuildDetailUrl(projectName, buildId, accountId),
-      { useColor: true }
+      getProjectBuildDetailUrl(projectName, buildId, accountId)
     ),
   statusFn: getBuildStatus,
   statusText: PROJECT_BUILD_TEXT,

package/lib/prompts/projectsLogsPrompt.js

@@ -7,22 +7,55 @@ const { EXIT_CODES } = require('../enums/exitCodes');
 
 const i18nKey = 'cli.lib.prompts.projectLogsPrompt';
 
+const SERVERLESS_FUNCTION_TYPES = {
+  APP_FUNCTION: 'app-function',
+  PUBLIC_ENDPOINT: 'public-endpoint',
+};
+
 const projectLogsPrompt = (accountId, promptOptions = {}) => {
   return promptUser([
     {
       name: 'projectName',
-      message: i18n(`${i18nKey}.projectName`),
+      message: i18n(`${i18nKey}.projectName.message`),
       when: !promptOptions.project,
       default: async () => {
         const { projectConfig } = await getProjectConfig();
         return projectConfig && projectConfig.name ? projectConfig.name : null;
       },
+      validate: name =>
+        !name.length ? i18n(`${i18nKey}.projectName.error`) : true,
+    },
+    {
+      name: 'logType',
+      type: 'list',
+      message: i18n(`${i18nKey}.logType.message`),
+      when:
+        !promptOptions.app &&
+        !promptOptions.function &&
+        !promptOptions.endpoint,
+      choices: [
+        {
+          name: i18n(`${i18nKey}.logType.function`),
+          value: SERVERLESS_FUNCTION_TYPES.APP_FUNCTION,
+        },
+        {
+          name: i18n(`${i18nKey}.logType.endpoint`),
+          value: SERVERLESS_FUNCTION_TYPES.PUBLIC_ENDPOINT,
+        },
+      ],
     },
     {
       name: 'appName',
       type: 'list',
       message: i18n(`${i18nKey}.appName`),
-      when: !promptOptions.app && !promptOptions.endpoint,
+      when: ({ logType }) => {
+        return (
+          (promptOptions.function ||
+            logType === SERVERLESS_FUNCTION_TYPES.APP_FUNCTION) &&
+          !promptOptions.app &&
+          !promptOptions.endpoint
+        );
+      },
       choices: async ({ projectName }) => {
         const name = projectName || promptOptions.project;
 
@@ -47,7 +80,25 @@ const projectLogsPrompt = (accountId, promptOptions = {}) => {
     {
       name: 'functionName',
       message: i18n(`${i18nKey}.functionName`),
-      when: !promptOptions.function && !promptOptions.endpoint,
+      when: ({ logType }) => {
+        return (
+          (promptOptions.app ||
+            logType === SERVERLESS_FUNCTION_TYPES.APP_FUNCTION) &&
+          !promptOptions.function &&
+          !promptOptions.endpoint
+        );
+      },
+    },
+    {
+      name: 'endpointName',
+      message: i18n(`${i18nKey}.endpointName`),
+      when: ({ logType }) => {
+        return (
+          logType === SERVERLESS_FUNCTION_TYPES.PUBLIC_ENDPOINT &&
+          !promptOptions.function &&
+          !promptOptions.endpoint
+        );
+      },
     },
   ]);
 };

package/lib/prompts/uploadPrompt.js

@@ -0,0 +1,39 @@
+const path = require('path');
+const { getCwd } = require('@hubspot/cli-lib/path');
+const { promptUser } = require('./promptUtils');
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
+
+const i18nKey = 'cli.lib.prompts.uploadPrompt';
+
+const uploadPrompt = (promptOptions = {}) => {
+  return promptUser([
+    {
+      name: 'src',
+      message: i18n(`${i18nKey}.enterSrc`),
+      when: !promptOptions.src,
+      default: '.',
+      validate: input => {
+        if (!input) {
+          return i18n(`${i18nKey}.errors.srcRequired`);
+        }
+        return true;
+      },
+    },
+    {
+      name: 'dest',
+      message: i18n(`${i18nKey}.enterDest`),
+      when: !promptOptions.dest,
+      default: path.basename(getCwd()),
+      validate: input => {
+        if (!input) {
+          return i18n(`${i18nKey}.errors.destRequired`);
+        }
+        return true;
+      },
+    },
+  ]);
+};
+
+module.exports = {
+  uploadPrompt,
+};

package/lib/serverlessLogs.js

@@ -1,5 +1,6 @@
 const https = require('https');
 const Spinnies = require('spinnies');
+const chalk = require('chalk');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
 const {
@@ -17,6 +18,7 @@ const TAIL_DELAY = 5000;
 const handleUserInput = spinnies => {
   const onTerminate = async () => {
     spinnies.remove('tailLogs');
+    spinnies.remove('stopMessage');
     process.exit(EXIT_CODES.SUCCESS);
   };
 
@@ -83,7 +85,11 @@ const tailLogs = async ({
   const spinnies = new Spinnies();
 
   spinnies.add('tailLogs', {
-    text: `Following logs for ${name}. Press "Q" to stop following`,
+    text: `Following logs for ${name}`,
+  });
+  spinnies.add('stopMessage', {
+    text: `> Press ${chalk.bold('q')} to stop following`,
+    status: 'non-spinnable',
   });
 
   handleUserInput(spinnies);

package/lib/supportHyperlinks.js

@@ -0,0 +1,75 @@
+'use strict';
+const hasFlag = require('./hasFlag');
+
+//See https://github.com/jamestalmage/supports-hyperlinks (License: https://github.com/jamestalmage/supports-hyperlinks/blob/master/license)
+
+function parseVersion(versionString) {
+  if (/^\d{3,4}$/.test(versionString)) {
+    // Env var doesn't always use dots. example: 4601 => 46.1.0
+    const m = /(\d{1,2})(\d{2})/.exec(versionString);
+    return {
+      major: 0,
+      minor: parseInt(m[1], 10),
+      patch: parseInt(m[2], 10),
+    };
+  }
+
+  const versions = (versionString || '').split('.').map(n => parseInt(n, 10));
+  return {
+    major: versions[0],
+    minor: versions[1],
+    patch: versions[2],
+  };
+}
+
+function supportsHyperlink(stream) {
+  const { env } = process;
+
+  if (hasFlag('noHyperlinks')) {
+    return false;
+  }
+
+  if (stream && !stream.isTTY) {
+    return false;
+  }
+
+  if (process.platform === 'win32') {
+    return false;
+  }
+
+  if ('CI' in env) {
+    return false;
+  }
+
+  if ('TERM_PROGRAM' in env) {
+    const version = parseVersion(env.TERM_PROGRAM_VERSION);
+
+    switch (env.TERM_PROGRAM) {
+      case 'iTerm.app':
+        if (version.major === 3) {
+          return version.minor >= 1;
+        }
+
+        return version.major > 3;
+      // No default
+    }
+  }
+
+  if ('VTE_VERSION' in env) {
+    // 0.50.0 was supposed to support hyperlinks, but throws a segfault
+    if (env.VTE_VERSION === '0.50.0') {
+      return false;
+    }
+
+    const version = parseVersion(env.VTE_VERSION);
+    return version.major > 0 || version.minor >= 50;
+  }
+
+  return false;
+}
+
+module.exports = {
+  supportsHyperlink,
+  stdout: supportsHyperlink(process.stdout),
+  stderr: supportsHyperlink(process.stderr),
+};

package/lib/supportsColor.js

@@ -0,0 +1,129 @@
+const process = require('process');
+const os = require('os');
+const tty = require('tty');
+const hasFlag = require('./hasFlag');
+
+const { env } = process;
+
+//From: https://github.com/chalk/supports-color/blob/main/index.js (License: https://github.com/chalk/supports-color/blob/main/license)
+
+function translateLevel(level) {
+  if (level === 0) {
+    return {
+      level,
+      hasBasic: false,
+      has256: false,
+      has16m: false,
+    };
+  }
+
+  return {
+    level,
+    hasBasic: true,
+    has256: level >= 2,
+    has16m: level >= 3,
+  };
+}
+
+function _supportsColor(haveStream, { streamIsTTY } = {}) {
+  if (haveStream && !streamIsTTY) {
+    return 0;
+  }
+
+  const min = 0;
+
+  if (env.TERM === 'dumb') {
+    return min;
+  }
+
+  if (hasFlag('noColor')) {
+    return 0;
+  }
+
+  if (process.platform === 'win32') {
+    // Windows 10 build 10586 is the first Windows release that supports 256 colors.
+    // Windows 10 build 14931 is the first release that supports 16m/TrueColor.
+    const osRelease = os.release().split('.');
+    if (Number(osRelease[0]) >= 10 && Number(osRelease[2]) >= 10586) {
+      return Number(osRelease[2]) >= 14931 ? 3 : 2;
+    }
+
+    return 1;
+  }
+
+  if ('CI' in env) {
+    if (
+      [
+        'TRAVIS',
+        'CIRCLECI',
+        'APPVEYOR',
+        'GITLAB_CI',
+        'GITHUB_ACTIONS',
+        'BUILDKITE',
+        'DRONE',
+      ].some(sign => sign in env) ||
+      env.CI_NAME === 'codeship'
+    ) {
+      return 1;
+    }
+
+    return min;
+  }
+
+  // Check for Azure DevOps pipelines
+  if ('TF_BUILD' in env && 'AGENT_NAME' in env) {
+    return 1;
+  }
+
+  if (env.COLORTERM === 'truecolor') {
+    return 3;
+  }
+
+  if ('TERM_PROGRAM' in env) {
+    const version = Number.parseInt(
+      (env.TERM_PROGRAM_VERSION || '').split('.')[0],
+      10
+    );
+
+    switch (env.TERM_PROGRAM) {
+      case 'iTerm.app':
+        return version >= 3 ? 3 : 2;
+      case 'Apple_Terminal':
+        return 2;
+      // No default
+    }
+  }
+
+  if (/-256(color)?$/i.test(env.TERM)) {
+    return 2;
+  }
+
+  if (
+    /^screen|^xterm|^vt100|^vt220|^rxvt|color|ansi|cygwin|linux/i.test(env.TERM)
+  ) {
+    return 1;
+  }
+
+  if ('COLORTERM' in env) {
+    return 1;
+  }
+
+  return min;
+}
+
+function createSupportsColor(stream, options = {}) {
+  const level = _supportsColor(stream, {
+    streamIsTTY: stream && stream.isTTY,
+    ...options,
+  });
+
+  return translateLevel(level);
+}
+
+const supportsColor = {
+  createSupportsColor,
+  stdout: createSupportsColor({ isTTY: tty.isatty(1) }),
+  stderr: createSupportsColor({ isTTY: tty.isatty(2) }),
+};
+
+module.exports = supportsColor;

package/lib/ui.js

@@ -1,5 +1,6 @@
 const chalk = require('chalk');
-const supportsHyperlinks = require('supports-hyperlinks');
+const supportsHyperlinks = require('../lib/supportHyperlinks');
+const supportsColor = require('../lib/supportsColor');
 const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
 const { logger } = require('@hubspot/cli-lib/logger');
 
@@ -12,6 +13,19 @@ const uiLine = () => {
   logger.log('-'.repeat(50));
 };
 
+/**
+ * Returns an object that aggregates what the terminal supports (eg. hyperlinks and color)
+ *
+ * @returns {object}
+ */
+
+const getTerminalUISupport = () => {
+  return {
+    hyperlinks: supportsHyperlinks.stdout,
+    color: supportsColor.stdout.hasBasic,
+  };
+};
+
 /**
  * Returns a hyperlink or link and description
  *
@@ -20,8 +34,9 @@ const uiLine = () => {
  * @param {object} options
  * @returns {string}
  */
-const uiLink = (linkText, url, options = {}) => {
-  if (supportsHyperlinks.stdout) {
+const uiLink = (linkText, url) => {
+  const terminalUISupport = getTerminalUISupport();
+  if (terminalUISupport.hyperlinks) {
     const result = [
       '\u001B]8;;',
       url,
@@ -29,9 +44,11 @@ const uiLink = (linkText, url, options = {}) => {
       linkText,
       '\u001B]8;;\u0007',
     ].join('');
-    return options.useColor ? chalk.cyan(result) : result;
+    return terminalUISupport.color ? chalk.cyan(result) : result;
   } else {
-    return options.fallback ? `${linkText}: ${url}` : linkText;
+    return terminalUISupport.color
+      ? `${linkText}: ${chalk.cyan(url)}`
+      : `${linkText}: ${url}`;
   }
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.13-beta.2",
+  "version": "4.0.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.13-beta.2",
-    "@hubspot/serverless-dev-runtime": "3.0.13-beta.2",
+    "@hubspot/cli-lib": "4.0.0",
+    "@hubspot/serverless-dev-runtime": "4.0.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -20,7 +20,6 @@
     "open": "^7.0.3",
     "ora": "^4.0.3",
     "spinnies": "^0.5.1",
-    "supports-hyperlinks": "^2.2.0",
     "tmp": "^0.2.1",
     "update-notifier": "^5.1.0",
     "yargs": "15.4.1"
@@ -38,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "ff694f8c61c2326159f7ad4d3f2cfdb18f8c1875"
+  "gitHead": "c11f159c8768c0a0beac7b221d4c2489bcf0064d"
 }