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

package/bin/cli.js

@@ -9,7 +9,7 @@ const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
 const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const {
   trackHelpUsage,
-  trackProcessFieldsUsage,
+  trackConvertFieldsUsage,
 } = require('../lib/usageTracking');
 const { getIsInProject } = require('../lib/projects');
 const pkg = require('../package.json');
@@ -38,7 +38,6 @@ const moduleCommand = require('../commands/module');
 const configCommand = require('../commands/config');
 const accountsCommand = require('../commands/accounts');
 const sandboxesCommand = require('../commands/sandbox');
-const processCommand = require('../commands/process');
 const cmsCommand = require('../commands/cms');
 const feedbackCommand = require('../commands/feedback');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
@@ -159,7 +158,6 @@ const argv = yargs
   .command(configCommand)
   .command(accountsCommand)
   .command(sandboxesCommand)
-  .command(processCommand, false)
   .command(feedbackCommand)
   .help()
   .recommendCommands()
@@ -172,6 +170,6 @@ if (argv.help) {
   trackHelpUsage(getCommandName(argv));
 }
 
-if (argv.processFieldsJs) {
-  trackProcessFieldsUsage(getCommandName(argv));
+if (argv.convertFields) {
+  trackConvertFieldsUsage(getCommandName(argv));
 }

package/commands/{process.js → cms/convertFields.js}

@@ -8,14 +8,14 @@ const { getThemeJSONPath } = require('@hubspot/cli-lib/lib/files');
 const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const {
   FieldsJs,
-  isProcessableFieldsJs,
+  isConvertableFieldJs,
 } = require('@hubspot/cli-lib/lib/handleFieldsJs');
 
-const { trackProcessFieldsUsage } = require('../lib/usageTracking');
-const i18nKey = 'cli.commands.process';
+const { trackConvertFieldsUsage } = require('../../lib/usageTracking');
+const i18nKey = 'cli.commands.convertFields';
 
-exports.command = 'process';
-exports.describe = false;
+exports.command = 'convert-fields';
+exports.describe = i18n(`${i18nKey}.describe`);
 
 const invalidPath = src => {
   logger.error(
@@ -39,7 +39,7 @@ exports.handler = async options => {
     invalidPath(src);
   }
 
-  trackProcessFieldsUsage('process');
+  trackConvertFieldsUsage('process');
 
   if (stats.isFile()) {
     const fieldsJs = await new FieldsJs(
@@ -61,7 +61,7 @@ exports.handler = async options => {
       })
       .filter(createIgnoreFilter());
     for (const filePath of allowedFilePaths) {
-      if (isProcessableFieldsJs(projectRoot, filePath, true)) {
+      if (isConvertableFieldJs(projectRoot, filePath, true)) {
         const fieldsJs = await new FieldsJs(
           projectRoot,
           filePath,

package/commands/cms/lighthouseScore.js

@@ -38,7 +38,7 @@ const DEFAULT_TABLE_HEADER = [
 ];
 
 exports.command = 'lighthouse-score [--theme]';
-exports.describe = i18n(`${i18nKey}.describe`);
+exports.describe = false; // i18n(`${i18nKey}.describe`);
 
 const selectTheme = async accountId => {
   const { theme: selectedTheme } = await promptUser([

package/commands/cms.js

@@ -1,16 +1,21 @@
+const { i18n } = require('@hubspot/cli-lib/lib/lang');
 const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
 const lighthouseScore = require('./cms/lighthouseScore');
+const convertFields = require('./cms/convertFields');
 
-// const i18nKey = 'cli.commands.cms';
+const i18nKey = 'cli.commands.cms';
 
 exports.command = 'cms';
-exports.describe = false; // i18n(`${i18nKey}.describe`);
+exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
   addConfigOptions(yargs, true);
   addAccountOptions(yargs, true);
 
-  yargs.command(lighthouseScore).demandCommand(1, '');
+  yargs
+    .command(lighthouseScore)
+    .command(convertFields)
+    .demandCommand(1, '');
 
   return yargs;
 };

package/commands/upload.js

@@ -40,7 +40,7 @@ const i18nKey = 'cli.commands.upload';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const {
   FieldsJs,
-  isProcessableFieldsJs,
+  isConvertableFieldJs,
   cleanupTmpDirSync,
 } = require('@hubspot/cli-lib/lib/handleFieldsJs');
 
@@ -81,15 +81,11 @@ exports.handler = async options => {
   // Check for theme.json file and determine the root path for the project based on it if it exists
   const themeJsonPath = getThemeJSONPath(absoluteSrcPath);
   const projectRoot = themeJsonPath && path.dirname(themeJsonPath);
-  const processFieldsJs =
+  const convertFields =
     projectRoot &&
-    isProcessableFieldsJs(
-      projectRoot,
-      absoluteSrcPath,
-      options.processFieldsJs
-    );
+    isConvertableFieldJs(projectRoot, absoluteSrcPath, options.convertFields);
   let fieldsJs;
-  if (processFieldsJs) {
+  if (convertFields) {
     fieldsJs = await new FieldsJs(
       projectRoot,
       absoluteSrcPath,
@@ -137,7 +133,7 @@ exports.handler = async options => {
     process.exit(EXIT_CODES.WARNING);
   }
   if (stats.isFile()) {
-    if (!isAllowedExtension(src) && !processFieldsJs) {
+    if (!isAllowedExtension(src) && !convertFields) {
       logger.error(
         i18n(`${i18nKey}.errors.invalidPath`, {
           path: src,
@@ -188,7 +184,7 @@ exports.handler = async options => {
         process.exit(EXIT_CODES.WARNING);
       })
       .finally(() => {
-        if (!processFieldsJs) return;
+        if (!convertFields) return;
         if (saveOutput) {
           fieldsJs.saveOutput();
         }
@@ -206,7 +202,7 @@ exports.handler = async options => {
     // Generate the first-pass file list in here, and pass to uploadFolder.
     const filePaths = await getUploadableFileList(
       absoluteSrcPath,
-      options.processFieldsJs
+      options.convertFields
     );
     uploadFolder(
       accountId,
@@ -252,9 +248,9 @@ exports.handler = async options => {
 
 /*
  * Walks the src folder for files, filters them based on ignore filter.
- * If processFieldsJs is true then will check for any JS fields conflicts (i.e., JS fields file and fields.json file) and prompt to resolve
+ * If convertFields is true then will check for any JS fields conflicts (i.e., JS fields file and fields.json file) and prompt to resolve
  */
-const getUploadableFileList = async (src, processFieldsJs) => {
+const getUploadableFileList = async (src, convertFields) => {
   const filePaths = await walk(src);
   const allowedFiles = filePaths
     .filter(file => {
@@ -264,7 +260,7 @@ const getUploadableFileList = async (src, processFieldsJs) => {
       return true;
     })
     .filter(createIgnoreFilter());
-  if (!processFieldsJs) {
+  if (!convertFields) {
     return allowedFiles;
   }
 
@@ -273,8 +269,8 @@ const getUploadableFileList = async (src, processFieldsJs) => {
   for (const filePath of allowedFiles) {
     const fileName = path.basename(filePath);
     if (skipFiles.includes(filePath)) continue;
-    const isProcessable = isProcessableFieldsJs(src, filePath, processFieldsJs);
-    if (isProcessable || fileName == 'fields.json') {
+    const isConvertable = isConvertableFieldJs(src, filePath, convertFields);
+    if (isConvertable || fileName == 'fields.json') {
       // This prompt checks if there are multiple field files in the folder and gets user to choose.
       const [choice, updatedSkipFiles] = await fieldsJsPrompt(
         filePath,
@@ -314,14 +310,11 @@ exports.builder = yargs => {
     describe: i18n(`${i18nKey}.options.saveOutput.describe`),
     type: 'boolean',
     default: false,
-    hidden: true,
   });
-  yargs.option('processFieldsJs', {
-    describe: i18n(`${i18nKey}.options.processFields.describe`),
-    alias: ['processFields'],
+  yargs.option('convertFields', {
+    describe: i18n(`${i18nKey}.options.convertFields.describe`),
     type: 'boolean',
     default: false,
-    hidden: true,
   });
   return yargs;
 };

package/commands/watch.js

@@ -128,18 +128,15 @@ exports.builder = yargs => {
     type: 'string',
     requiresArg: true,
   });
-  yargs.option('processFieldsJs', {
-    describe: i18n(`${i18nKey}.options.processFields.describe`),
-    alias: ['processFields'],
+  yargs.option('convertFields', {
+    describe: i18n(`${i18nKey}.options.convertFields.describe`),
     type: 'boolean',
     default: false,
-    hidden: true,
   });
   yargs.option('saveOutput', {
     describe: i18n(`${i18nKey}.options.saveOutput.describe`),
     type: 'boolean',
     default: false,
-    hidden: true,
   });
   return yargs;
 };

package/lib/usageTracking.js

@@ -78,7 +78,7 @@ async function trackHelpUsage(command) {
   }
 }
 
-async function trackProcessFieldsUsage(command) {
+async function trackConvertFieldsUsage(command) {
   if (!isTrackingAllowed()) {
     return;
   }
@@ -136,6 +136,6 @@ module.exports = {
   trackCommandUsage,
   trackHelpUsage,
   addHelpUsageTracking,
-  trackProcessFieldsUsage,
+  trackConvertFieldsUsage,
   trackAuthAction,
 };

package/package.json

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