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

package/lib/projects.js

@@ -17,6 +17,9 @@ const {
   PROJECT_TASK_TYPES,
   SPINNER_STATUS,
 } = require('@hubspot/cli-lib/lib/constants');
+const {
+  fetchDefaultVersion,
+} = require('@hubspot/cli-lib/lib/projectPlatformVersion');
 const {
   createProject,
   getBuildStatus,
@@ -312,7 +315,8 @@ const uploadProjectFiles = async (
   accountId,
   projectName,
   filePath,
-  uploadMessage
+  uploadMessage,
+  platformVersion
 ) => {
   SpinniesManager.init({});
   const accountIdentifier = uiAccountDescription(accountId);
@@ -333,7 +337,8 @@ const uploadProjectFiles = async (
       accountId,
       projectName,
       filePath,
-      uploadMessage
+      uploadMessage,
+      platformVersion
     );
 
     buildId = upload.buildId;
@@ -490,7 +495,8 @@ const handleProjectUpload = async (
         accountId,
         projectConfig.name,
         tempFile.name,
-        uploadMessage
+        uploadMessage,
+        projectConfig.platformVersion
       );
 
       if (error) {
@@ -807,6 +813,28 @@ const createProjectComponent = async (component, name) => {
   );
 };
 
+const showPlatformVersionWarning = async (accountId, projectConfig) => {
+  const platformVersion = projectConfig.platformVersion;
+
+  if (!platformVersion) {
+    try {
+      const defaultVersion = await fetchDefaultVersion(accountId);
+      logger.log('');
+      logger.warn(
+        i18n(`${i18nKey}.showPlatformVersionWarning.noPlatformVersion`, {
+          defaultVersion,
+        })
+      );
+    } catch (e) {
+      logger.log('');
+      logger.warn(
+        i18n(`${i18nKey}.showPlatformVersionWarning.noPlatformVersionAlt`)
+      );
+      logger.debug(e.error);
+    }
+  }
+};
+
 module.exports = {
   writeProjectConfig,
   getProjectConfig,
@@ -823,4 +851,5 @@ module.exports = {
   ensureProjectExists,
   logFeedbackMessage,
   createProjectComponent,
+  showPlatformVersionWarning,
 };

package/lib/ui.js

@@ -6,6 +6,10 @@ const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
 const { i18n } = require('./lang');
 const { logger } = require('@hubspot/cli-lib/logger');
 
+const UI_COLORS = {
+  orange: '#FF8F59',
+};
+
 /**
  * Outputs horizontal line
  *
@@ -105,6 +109,12 @@ const uiFeatureHighlight = (commands, title) => {
   });
 };
 
+const uiBetaMessage = message => {
+  const i18nKey = 'cli.lib.ui';
+
+  logger.log(chalk.hex(UI_COLORS.orange)(i18n(`${i18nKey}.betaTag`)), message);
+};
+
 const uiBetaWarning = logMessage => {
   const i18nKey = 'cli.lib.ui.betaWarning';
 
@@ -114,7 +124,9 @@ const uiBetaWarning = logMessage => {
 };
 
 module.exports = {
+  UI_COLORS,
   uiAccountDescription,
+  uiBetaMessage,
   uiBetaWarning,
   uiFeatureHighlight,
   uiInfoSection,

package/lib/usageTracking.js

@@ -7,6 +7,25 @@ const { version } = require('../package.json');
 const { getPlatform } = require('./environment');
 const { setLogLevel } = require('./commonOpts');
 
+/* **
+Available tracking meta properties
+
+  - action: "The specific action taken in the CLI"
+  - os: "The user's OS"
+  - nodeVersion: "The user's version of node.js"
+  - nodeMajorVersion: "The user's major version of node.js"
+  - version: "The user's version of the CLI"
+  - command: "The specific command that the user ran in this interaction"
+  - authType: "The configured auth type the user has for the CLI"
+  - step: "The specific step in the auth process"
+  - assetType: "The CMS asset type"
+  - mode: "The CLI mode (draft or publish"
+  - type: "The upload type (file or folder)"
+  - file: "Whether or not the 'file' flag was used"
+  - successful: "Whether or not the CLI interaction was successful"
+
+*/
+
 const EventClass = {
   USAGE: 'USAGE',
   INTERACTION: 'INTERACTION',
@@ -132,10 +151,48 @@ const trackAuthAction = async (command, authType, step, accountId) => {
   }
 };
 
+function trackCommandMetadataUsage(command, meta = {}, accountId) {
+  if (!isTrackingAllowed()) {
+    return;
+  }
+  logger.debug('Attempting to track metadata usage of "%s" command', command);
+  let authType = 'unknown';
+  if (accountId) {
+    const accountConfig = getAccountConfig(accountId);
+    authType =
+      accountConfig && accountConfig.authType
+        ? accountConfig.authType
+        : API_KEY_AUTH_METHOD.value;
+  }
+  setImmediate(async () => {
+    const usageTrackingEvent = {
+      action: 'cli-command-metadata',
+      os: getPlatform(),
+      ...getNodeVersionData(),
+      version,
+      command,
+      authType,
+      ...meta,
+    };
+    try {
+      await trackUsage(
+        'cli-interaction',
+        EventClass.INTERACTION,
+        usageTrackingEvent,
+        accountId
+      );
+      logger.debug('Sent usage tracking command event: %o', usageTrackingEvent);
+    } catch (e) {
+      logger.debug('Metadata usage tracking failed: %s', e.message);
+    }
+  });
+}
+
 module.exports = {
   trackCommandUsage,
   trackHelpUsage,
   addHelpUsageTracking,
   trackConvertFieldsUsage,
   trackAuthAction,
+  trackCommandMetadataUsage,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "4.2.1-beta.0",
+  "version": "4.2.1-beta.2",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -8,8 +8,9 @@
     "url": "https://github.com/HubSpot/hubspot-cms-tools"
   },
   "dependencies": {
-    "@hubspot/cli-lib": "^4.1.14",
-    "@hubspot/serverless-dev-runtime": "4.1.8-beta.6",
+    "@hubspot/cli-lib": "^4.2.1",
+    "@hubspot/serverless-dev-runtime": "4.2.1-beta.2",
+    "@hubspot/ui-extensions-dev-server": "^0.5.0",
     "archiver": "^5.3.0",
     "body-parser": "^1.19.0",
     "chalk": "^4.1.2",
@@ -35,7 +36,7 @@
     "mock-stdin": "^1.0.0"
   },
   "engines": {
-    "node": ">=10"
+    "node": ">=16"
   },
   "bin": {
     "hs": "./bin/hs",
@@ -44,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "2e2976ffd17135fbc4dcdb8a8b9d078613ed5d53"
+  "gitHead": "9a111f2df1b19153efe867f3501599bfa4aedabe"
 }