@hubspot/cli 4.1.1 → 4.1.3-beta.0

package/commands/customObject.js

@@ -1,30 +1,39 @@
+const chalk = require('chalk');
 const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
 const schemaCommand = require('./customObject/schema');
 const createCommand = require('./customObject/create');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { logger } = require('@hubspot/cli-lib/logger');
+const { uiBetaWarning } = require('../lib/ui');
 
 const i18nKey = 'cli.commands.customObject';
 
 exports.command = ['custom-object', 'custom', 'co'];
 exports.describe = i18n(`${i18nKey}.describe`);
 
+const logBetaMessage = () => {
+  uiBetaWarning(() => {
+    logger.log(chalk.reset.yellow(i18n(`${i18nKey}.betaMessage`)));
+    logger.log(
+      chalk.reset.yellow(
+        i18n(`${i18nKey}.seeMoreLink`, {
+          link:
+            'https://developers.hubspot.com/docs/api/crm/crm-custom-objects',
+        })
+      )
+    );
+  });
+};
+
 exports.builder = yargs => {
   addConfigOptions(yargs, true);
   addAccountOptions(yargs, true);
 
   yargs
+    .middleware([logBetaMessage])
     .command(schemaCommand)
     .command(createCommand)
     .demandCommand(1, '');
 
-  console.warn(i18n(`${i18nKey}.warning`));
-  console.warn(i18n(`${i18nKey}.betaMessage`));
-  console.warn(
-    i18n(`${i18nKey}.seeMoreLink`, {
-      link: 'https://developers.hubspot.com/docs/api/crm/crm-custom-objects',
-    })
-  );
-  console.warn(i18n(`${i18nKey}.warning`));
-
   return yargs;
 };

package/commands/theme/marketplace-validate.js

@@ -100,6 +100,24 @@ exports.handler = async options => {
   }
 
   const displayResults = checks => {
+    const displayFileInfo = (file, line) => {
+      if (file) {
+        logger.log(
+          i18n(`${i18nKey}.results.warnings.file`, {
+            file,
+          })
+        );
+      }
+      if (line) {
+        logger.log(
+          i18n(`${i18nKey}.results.warnings.lineNumber`, {
+            line,
+          })
+        );
+      }
+      return null;
+    };
+
     if (checks) {
       const { status, results } = checks;
 
@@ -107,13 +125,30 @@ exports.handler = async options => {
         const failedValidations = results.filter(
           test => test.status === 'FAIL'
         );
+        const warningValidations = results.filter(
+          test => test.status === 'WARN'
+        );
+
         failedValidations.forEach(val => {
           logger.error(`${val.message}`);
+          displayFileInfo(val.file, val.line);
+        });
+
+        warningValidations.forEach(val => {
+          logger.warn(`${val.message}`);
+          displayFileInfo(val.file, val.line);
         });
       }
 
       if (status === 'PASS') {
         logger.success(i18n(`${i18nKey}.results.noErrors`));
+
+        results.forEach(test => {
+          if (test.status === 'WARN') {
+            logger.warn(`${test.message}`);
+            displayFileInfo(test.file, test.line);
+          }
+        });
       }
     }
     return null;

package/lib/ui.js

@@ -49,7 +49,7 @@ const uiLink = (linkText, url) => {
     return terminalUISupport.color ? chalk.cyan(result) : result;
   } else {
     return terminalUISupport.color
-      ? `${linkText}: ${chalk.cyan(encodedUrl)}`
+      ? `${linkText}: ${chalk.reset.cyan(encodedUrl)}`
       : `${linkText}: ${encodedUrl}`;
   }
 };
@@ -93,8 +93,17 @@ const uiFeatureHighlight = (commands, title) => {
   });
 };
 
+const uiBetaWarning = logMessage => {
+  const i18nKey = 'cli.lib.ui.betaWarning';
+
+  logger.log(i18n(`${i18nKey}.header`));
+  logMessage();
+  logger.log(i18n(`${i18nKey}.footer`));
+};
+
 module.exports = {
   uiAccountDescription,
+  uiBetaWarning,
   uiFeatureHighlight,
   uiInfoSection,
   uiLine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.1.1",
+  "version": "4.1.3-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": "4.1.1",
-    "@hubspot/serverless-dev-runtime": "4.1.1",
+    "@hubspot/cli-lib": "4.1.3-beta.0",
+    "@hubspot/serverless-dev-runtime": "4.1.3-beta.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "f2cedbdfcefe7d721e303196627ed78fc1979f36"
+  "gitHead": "1fa007888ab796fb8a6905e7a3112a1d1144085d"
 }