@hubspot/cli 5.2.1-beta.1 → 5.2.1-beta.11

package/commands/secrets/listSecrets.js

@@ -17,7 +17,7 @@ const {
 } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 
-const i18nKey = 'cli.commands.secrets.subcommands.list';
+const i18nKey = 'commands.secrets.subcommands.list';
 
 exports.command = 'list';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -49,8 +49,8 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
   return yargs;
 };

package/commands/secrets/updateSecret.js

@@ -18,7 +18,7 @@ const {
 const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('../../lib/lang');
 
-const i18nKey = 'cli.commands.secrets.subcommands.update';
+const i18nKey = 'commands.secrets.subcommands.update';
 
 exports.command = 'update <name>';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -59,9 +59,9 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
   yargs.positional('name', {
     describe: i18n(`${i18nKey}.positionals.name.describe`),
     type: 'string',

package/commands/secrets.js

@@ -6,14 +6,14 @@ const deleteSecretCommand = require('./secrets/deleteSecret');
 const updateSecretCommand = require('./secrets/updateSecret');
 const { i18n } = require('../lib/lang');
 
-const i18nKey = 'cli.commands.secrets';
+const i18nKey = 'commands.secrets';
 
 exports.command = 'secrets';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
   yargs
     .command(listSecretsCommand)
     .command(addSecretCommand)

package/commands/theme/generate-selectors.js

@@ -22,7 +22,7 @@ const CSS_SELECTORS_REGEX = new RegExp(/([\s\w:.,\0-[\]]*){/, 'i');
 const CSS_EXPRESSION_REGEX = new RegExp(/(?!\s)([^}])*(?![.#\s,>])[^}]*}/, 'g');
 const THEME_PATH_REGEX = new RegExp(/=\s*.*(theme\.(\w|\.)*)/, 'i');
 
-const i18nKey = 'cli.commands.theme.subcommands.generateSelectors';
+const i18nKey = 'commands.theme.subcommands.generateSelectors';
 
 exports.command = 'generate-selectors <themePath>';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/theme/marketplace-validate.js

@@ -16,7 +16,7 @@ const {
 } = require('../../lib/marketplace-validate');
 const { i18n } = require('../../lib/lang');
 
-const i18nKey = 'cli.commands.theme.subcommands.marketplaceValidate';
+const i18nKey = 'commands.theme.subcommands.marketplaceValidate';
 
 exports.command = 'marketplace-validate <src>';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -48,16 +48,16 @@ exports.handler = async options => {
     accountId,
     validationId
   );
-  processValidationErrors(validationResults);
+  processValidationErrors(i18nKey, validationResults);
   displayValidationResults(i18nKey, validationResults);
 
   process.exit();
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addUseEnvironmentOptions(yargs);
 
   yargs.positional('src', {
     describe: i18n(`${i18nKey}.positionals.src.describe`),

package/commands/theme/preview.js

@@ -12,21 +12,31 @@ const { preview } = require('@hubspot/theme-preview-dev-server');
 const { getUploadableFileList } = require('../../lib/upload');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { previewPrompt } = require('../../lib/prompts/previewPrompt');
+const {
+  previewPrompt,
+  previewProjectPrompt,
+} = require('../../lib/prompts/previewPrompt');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const {
   FILE_UPLOAD_RESULT_TYPES,
 } = require('@hubspot/local-dev-lib/constants/files');
-const i18nKey = 'cli.commands.preview';
 const cliProgress = require('cli-progress');
 const {
   ApiErrorContext,
   logApiUploadErrorInstance,
 } = require('../../lib/errorHandlers/apiErrors');
 const { handleExit, handleKeypress } = require('../../lib/process');
+const { getThemeJSONPath } = require('@hubspot/local-dev-lib/cms/themes');
+const { getProjectConfig } = require('../../lib/projects');
+const {
+  findProjectComponents,
+  COMPONENT_TYPES,
+} = require('../../lib/projectStructure');
+
+const i18nKey = 'commands.theme.subcommands.preview';
 
 exports.command = 'preview [--src] [--dest]';
-exports.describe = false; // i18n(`${i18nKey}.describe`) - Hiding command
+exports.describe = i18n(`${i18nKey}.describe`);
 
 const validateSrcPath = src => {
   const logInvalidPath = () => {
@@ -63,6 +73,42 @@ const handleUserInput = () => {
   });
 };
 
+const determineSrcAndDest = async options => {
+  let absoluteSrc;
+  let dest;
+  const { projectDir, projectConfig } = await getProjectConfig();
+  if (!(projectDir && projectConfig)) {
+    // Not in a project, prompt for src and dest of traditional theme
+    const previewPromptAnswers = await previewPrompt(options);
+    const src = options.src || previewPromptAnswers.src;
+    dest = options.dest || previewPromptAnswers.dest;
+    absoluteSrc = path.resolve(getCwd(), src);
+    if (!dest || !validateSrcPath(absoluteSrc)) {
+      process.exit(EXIT_CODES.ERROR);
+    }
+  } else {
+    // In a project
+    let themeJsonPath = getThemeJSONPath();
+    if (!themeJsonPath) {
+      const projectComponents = await findProjectComponents(projectDir);
+      const themeComponents = projectComponents.filter(
+        c => c.type === COMPONENT_TYPES.hublTheme
+      );
+      if (themeComponents.length === 0) {
+        logger.error(i18n(`${i18nKey}.errors.noThemeComponents`));
+        process.exit(EXIT_CODES.ERROR);
+      }
+      const answer = await previewProjectPrompt(themeComponents);
+      themeJsonPath = `${answer.themeComponentPath}/theme.json`;
+    }
+    const { dir: themeDir } = path.parse(themeJsonPath);
+    absoluteSrc = themeDir;
+    const { base: themeName } = path.parse(themeDir);
+    dest = `@projects/${projectConfig.name}/${themeName}`;
+  }
+  return { absoluteSrc, dest };
+};
+
 exports.handler = async options => {
   const { notify, skipUpload, noSsl, port, debug } = options;
 
@@ -70,18 +116,7 @@ exports.handler = async options => {
 
   const accountId = getAccountId(options);
 
-  const previewPromptAnswers = await previewPrompt(options);
-  const src = options.src || previewPromptAnswers.src;
-  let dest = options.dest || previewPromptAnswers.dest;
-  if (!dest) {
-    logger.error(i18n(`${i18nKey}.errors.destinationRequired`));
-    return;
-  }
-
-  const absoluteSrc = path.resolve(getCwd(), src);
-  if (!validateSrcPath(absoluteSrc)) {
-    process.exit(EXIT_CODES.ERROR);
-  }
+  const { absoluteSrc, dest } = await determineSrcAndDest(options);
 
   const filePaths = await getUploadableFileList(absoluteSrc, false);
 
@@ -153,8 +188,8 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
 
   yargs.option('src', {
     describe: i18n(`${i18nKey}.options.src.describe`),

package/commands/theme.js

@@ -4,7 +4,7 @@ const previewCommand = require('./theme/preview');
 
 const { i18n } = require('../lib/lang');
 
-const i18nKey = 'cli.commands.theme';
+const i18nKey = 'commands.theme';
 
 exports.command = 'theme';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/upload.js

@@ -43,7 +43,7 @@ const { trackCommandUsage } = require('../lib/usageTracking');
 const { getUploadableFileList } = require('../lib/upload');
 
 const { i18n } = require('../lib/lang');
-const i18nKey = 'cli.commands.upload';
+const i18nKey = 'commands.upload';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const {
   FieldsJs,
@@ -279,10 +279,10 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addModeOptions(yargs, { write: true }, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addModeOptions(yargs, { write: true });
+  addUseEnvironmentOptions(yargs);
 
   yargs.positional('src', {
     describe: i18n(`${i18nKey}.positionals.src.describe`),

package/commands/watch.js

@@ -18,8 +18,13 @@ const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
 const { getUploadableFileList } = require('../lib/upload');
+const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
+const {
+  logApiUploadErrorInstance,
+  ApiErrorContext,
+} = require('../lib/errorHandlers/apiErrors');
+const i18nKey = 'commands.watch';
 
-const i18nKey = 'cli.commands.watch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 exports.command = 'watch [--src] [--dest]';
@@ -71,12 +76,9 @@ exports.handler = async options => {
 
   if (disableInitial) {
     logger.info(i18n(`${i18nKey}.warnings.disableInitial`));
-  } else {
+  } else if (!initialUpload) {
     logger.info(i18n(`${i18nKey}.warnings.notUploaded`, { path: src }));
-
-    if (!initialUpload) {
-      logger.info(i18n(`${i18nKey}.warnings.initialUpload`));
-    }
+    logger.info(i18n(`${i18nKey}.warnings.initialUpload`));
   }
 
   if (initialUpload) {
@@ -87,21 +89,62 @@ exports.handler = async options => {
   }
 
   trackCommandUsage('watch', { mode }, accountId);
-  watch(accountId, absoluteSrcPath, dest, {
-    mode,
-    remove,
-    disableInitial: initialUpload ? false : true,
-    notify,
-    commandOptions: options,
-    filePaths: filesToUpload,
-  });
+
+  const postInitialUploadCallback = null;
+  const onUploadFolderError = error => {
+    logger.error(
+      i18n(`${i18nKey}.errors.folderFailed`, {
+        src,
+        dest,
+        accountId,
+      })
+    );
+    logErrorInstance(error, {
+      accountId,
+    });
+  };
+  const onQueueAddError = null;
+  const onUploadFileError = (file, dest, accountId) => error => {
+    logger.error(
+      i18n(`${i18nKey}.errors.fileFailed`, {
+        file,
+        dest,
+        accountId,
+      })
+    );
+    logApiUploadErrorInstance(
+      error,
+      new ApiErrorContext({
+        accountId,
+        request: dest,
+        payload: file,
+      })
+    );
+  };
+  watch(
+    accountId,
+    absoluteSrcPath,
+    dest,
+    {
+      mode,
+      remove,
+      disableInitial: initialUpload ? false : true,
+      notify,
+      commandOptions: options,
+      filePaths: filesToUpload,
+    },
+    postInitialUploadCallback,
+    onUploadFolderError,
+    onQueueAddError,
+    onUploadFileError
+  );
 };
 
 exports.builder = yargs => {
-  addConfigOptions(yargs, true);
-  addAccountOptions(yargs, true);
-  addModeOptions(yargs, { write: true }, true);
-  addUseEnvironmentOptions(yargs, true);
+  addConfigOptions(yargs);
+  addAccountOptions(yargs);
+  addModeOptions(yargs, { write: true });
+  addUseEnvironmentOptions(yargs);
 
   yargs.positional('src', {
     describe: i18n(`${i18nKey}.positionals.src.describe`),

package/jest.config.js

@@ -1,3 +1,4 @@
 module.exports = {
   testPathIgnorePatterns: ['commands/functions/test.js'],
+  clearMocks: true,
 };