@hubspot/cli 4.2.0 → 4.2.1-beta.1

package/commands/cms/lighthouseScore.js

@@ -1,5 +1,4 @@
-//const chalk = require('chalk');
-const Spinnies = require('spinnies');
+const SpinniesManager = require('../../lib/SpinniesManager');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -119,9 +118,9 @@ exports.handler = async options => {
 
   // Poll till scoring is finished
   try {
-    const spinnies = new Spinnies();
+    SpinniesManager.init();
 
-    spinnies.add('lighthouseScore', {
+    SpinniesManager.add('lighthouseScore', {
       text: i18n(`${i18nKey}.info.generatingScore`, { theme: themeToCheck }),
     });
 
@@ -148,7 +147,7 @@ exports.handler = async options => {
 
     await checkScoreStatus();
 
-    spinnies.remove('lighthouseScore');
+    SpinniesManager.remove('lighthouseScore');
   } catch (err) {
     logger.debug(err);
     process.exit(EXIT_CODES.ERROR);

package/commands/module/marketplace-validate.js

@@ -1,5 +1,4 @@
-const Spinnies = require('spinnies');
-
+const SpinniesManager = require('../../lib/SpinniesManager');
 const {
   addConfigOptions,
   addAccountOptions,
@@ -31,8 +30,9 @@ exports.handler = async options => {
 
   trackCommandUsage('validate', null, accountId);
 
-  const spinnies = new Spinnies();
-  spinnies.add('marketplaceValidation', {
+  SpinniesManager.init();
+
+  SpinniesManager.add('marketplaceValidation', {
     text: i18n(`${i18nKey}.logs.validatingModule`, {
       path: src,
     }),
@@ -42,7 +42,7 @@ exports.handler = async options => {
   const validationId = await kickOffValidation(accountId, assetType, src);
   await pollForValidationFinish(accountId, validationId);
 
-  spinnies.remove('marketplaceValidation');
+  SpinniesManager.remove('marketplaceValidation');
 
   const validationResults = await fetchValidationResults(
     accountId,

package/commands/project/dev.js

@@ -19,7 +19,7 @@ const {
   pollProjectBuildAndDeploy,
 } = require('../../lib/projects');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { uiAccountDescription, uiLine } = require('../../lib/ui');
+const { uiAccountDescription, uiBetaMessage, uiLine } = require('../../lib/ui');
 const { confirmPrompt } = require('../../lib/prompts/promptUtils');
 const {
   selectTargetAccountPrompt,
@@ -29,6 +29,7 @@ const {
   LocalDevManager,
   UPLOAD_PERMISSIONS,
 } = require('../../lib/LocalDevManager');
+const LocalDevManagerV2 = require('../../lib/LocalDevManagerV2');
 const { isSandbox } = require('../../lib/sandboxes');
 const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
 const { sandboxNamePrompt } = require('../../lib/prompts/sandboxesPrompt');
@@ -38,7 +39,11 @@ const {
   getAvailableSyncTypes,
 } = require('../../lib/sandboxes');
 const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
-const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
+const {
+  PROJECT_BUILD_TEXT,
+  PROJECT_DEPLOY_TEXT,
+  ERROR_TYPES,
+} = require('@hubspot/cli-lib/lib/constants');
 const {
   logErrorInstance,
   logApiErrorInstance,
@@ -54,7 +59,7 @@ const {
 
 const i18nKey = 'cli.commands.project.subcommands.dev';
 
-exports.command = 'dev [--account] [--port]';
+exports.command = 'dev [--account]';
 exports.describe = null; //i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
@@ -67,7 +72,7 @@ exports.handler = async options => {
 
   const { projectConfig, projectDir } = await getProjectConfig();
 
-  logger.log(i18n(`${i18nKey}.logs.betaMessage`));
+  uiBetaMessage(i18n(`${i18nKey}.logs.betaMessage`));
 
   if (!projectConfig) {
     logger.error(i18n(`${i18nKey}.errors.noProjectConfig`));
@@ -84,7 +89,6 @@ exports.handler = async options => {
   }
 
   if (!targetAccountId) {
-    //logger.log(i18n(`${i18nKey}.logs.learnMoreLink`));
     logger.log();
     uiLine();
     logger.warn(i18n(`${i18nKey}.logs.nonSandboxWarning`));
@@ -177,12 +181,12 @@ exports.handler = async options => {
       targetAccountId,
       projectConfig.name
     );
-    if (sourceIntegration) {
+    if (options.extension || sourceIntegration) {
       uploadPermission = UPLOAD_PERMISSIONS.never;
     }
   }
 
-  const spinnies = SpinniesManager.init();
+  SpinniesManager.init();
 
   if (!projectExists) {
     // Create the project without prompting if this is a newly created sandbox
@@ -208,14 +212,14 @@ exports.handler = async options => {
 
     if (shouldCreateProject) {
       try {
-        spinnies.add('createProject', {
+        SpinniesManager.add('createProject', {
           text: i18n(`${i18nKey}.status.creatingProject`, {
             accountIdentifier: uiAccountDescription(targetAccountId),
             projectName: projectConfig.name,
           }),
         });
         await createProject(targetAccountId, projectConfig.name);
-        spinnies.succeed('createProject', {
+        SpinniesManager.succeed('createProject', {
           text: i18n(`${i18nKey}.status.createdProject`, {
             accountIdentifier: uiAccountDescription(targetAccountId),
             projectName: projectConfig.name,
@@ -233,60 +237,114 @@ exports.handler = async options => {
     }
   }
 
-  spinnies.add('devModeSetup', {
+  SpinniesManager.add('devModeSetup', {
     text: i18n(`${i18nKey}.status.startupMessage`, {
       projectName: projectConfig.name,
     }),
     isParent: true,
   });
 
-  let result;
+  let initialUploadResult;
+
   // Create an initial build if the project was newly created in the account or if
   // our upload permission is set to "always"
   if (!projectExists || uploadPermission === UPLOAD_PERMISSIONS.always) {
-    result = await handleProjectUpload(
+    initialUploadResult = await handleProjectUpload(
       targetAccountId,
       projectConfig,
       projectDir,
       (...args) => pollProjectBuildAndDeploy(...args, true),
       i18n(`${i18nKey}.logs.initialUploadMessage`)
     );
-  }
 
-  if (result && result.error) {
-    if (
-      isSpecifiedError(result.error, {
-        subCategory: ERROR_TYPES.PROJECT_LOCKED,
-      })
-    ) {
-      logger.log();
-      logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
-      logger.log();
-    } else {
-      logApiErrorInstance(
-        result.error,
-        new ApiErrorContext({
-          accountId,
-          projectName: projectConfig.name,
+    if (initialUploadResult.uploadError) {
+      SpinniesManager.fail('devModeSetup');
+
+      if (
+        isSpecifiedError(initialUploadResult.uploadError, {
+          subCategory: ERROR_TYPES.PROJECT_LOCKED,
         })
-      );
+      ) {
+        logger.log();
+        logger.error(i18n(`${i18nKey}.errors.projectLockedError`));
+        logger.log();
+      } else {
+        logApiErrorInstance(
+          initialUploadResult.uploadError,
+          new ApiErrorContext({
+            accountId,
+            projectName: projectConfig.name,
+          })
+        );
+      }
+      process.exit(EXIT_CODES.ERROR);
+    }
+  }
+
+  // Let the user know when the initial build or deploy fails
+  // Do this before starting the dev server for v2 behavior because we cannot
+  // run a server on a broken project
+  if (
+    options.extension &&
+    initialUploadResult &&
+    !initialUploadResult.succeeded
+  ) {
+    SpinniesManager.fail('devModeSetup');
+
+    let subTasks = [];
+
+    if (initialUploadResult.buildResult.status === 'FAILURE') {
+      subTasks =
+        initialUploadResult.buildResult[PROJECT_BUILD_TEXT.SUBTASK_KEY];
+    } else if (initialUploadResult.deployResult.status === 'FAILURE') {
+      subTasks =
+        initialUploadResult.deployResult[PROJECT_DEPLOY_TEXT.SUBTASK_KEY];
     }
+
+    const failedSubTasks = subTasks.filter(task => task.status === 'FAILURE');
+
+    logger.log();
+    failedSubTasks.forEach(failedSubTask => {
+      console.log(failedSubTask.errorMessage);
+    });
+    logger.log();
+
     process.exit(EXIT_CODES.ERROR);
-  } else {
-    spinnies.remove('devModeSetup');
   }
 
-  const LocalDev = new LocalDevManager({
-    debug: options.debug,
-    projectConfig,
-    projectDir,
-    targetAccountId,
-    uploadPermission,
-    port: options.port,
-  });
+  SpinniesManager.remove('devModeSetup');
+
+  const LocalDev = options.extension
+    ? new LocalDevManagerV2({
+        debug: options.debug,
+        extension: options.extension,
+        projectConfig,
+        projectDir,
+        targetAccountId,
+      })
+    : new LocalDevManager({
+        debug: options.debug,
+        projectConfig,
+        projectDir,
+        targetAccountId,
+        uploadPermission,
+      });
 
   await LocalDev.start();
 
+  // Let the user know when the initial build or deploy fails
+  if (
+    !options.extension &&
+    initialUploadResult &&
+    !initialUploadResult.succeeded
+  ) {
+    if (initialUploadResult.buildResult.status === 'FAILURE') {
+      LocalDev.logBuildError(initialUploadResult.buildResult);
+    } else if (initialUploadResult.deployResult.status === 'FAILURE') {
+      LocalDev.logDeployError(initialUploadResult.deployResult);
+    }
+  }
+
   handleExit(LocalDev.stop);
 };
 
@@ -296,9 +354,10 @@ exports.builder = yargs => {
   addUseEnvironmentOptions(yargs, true);
   addTestingOptions(yargs, true);
 
-  yargs.option('port', {
-    describe: i18n(`${i18nKey}.options.port.describe`),
-    type: 'number',
+  yargs.option('extension', {
+    describe: i18n(`${i18nKey}.options.extension.describe`),
+    type: 'string',
+    hidden: true,
   });
 
   yargs.example([['$0 project dev', i18n(`${i18nKey}.examples.default`)]]);

package/commands/project/logs.js

@@ -9,7 +9,7 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
+// const { outputLogs } = require('@hubspot/cli-lib/lib/logs');
 const {
   fetchProject,
   fetchDeployComponentsMetadata,
@@ -18,25 +18,25 @@ const {
   getTableContents,
   getTableHeader,
 } = require('@hubspot/cli-lib/lib/table');
-const {
-  getProjectAppFunctionLogs,
-  getLatestProjectAppFunctionLog,
-} = require('@hubspot/cli-lib/api/functions');
-const {
-  logApiErrorInstance,
-  ApiErrorContext,
-} = require('@hubspot/cli-lib/errorHandlers');
-const {
-  getFunctionLogs,
-  getLatestFunctionLog,
-} = require('@hubspot/cli-lib/api/results');
+// const {
+//   getProjectAppFunctionLogs,
+//   getLatestProjectAppFunctionLog,
+// } = require('@hubspot/cli-lib/api/functions');
+// const {
+//   logApiErrorInstance,
+//   ApiErrorContext,
+// } = require('@hubspot/cli-lib/errorHandlers');
+// const {
+//   getFunctionLogs,
+//   getLatestFunctionLog,
+// } = require('@hubspot/cli-lib/api/results');
 const { ensureProjectExists } = require('../../lib/projects');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { uiLine, uiLink } = require('../../lib/ui');
 const { projectLogsPrompt } = require('../../lib/prompts/projectsLogsPrompt');
-const { tailLogs } = require('../../lib/serverlessLogs');
+// const { tailLogs } = require('../../lib/serverlessLogs');
 const { i18n } = require('../../lib/lang');
-const { EXIT_CODES } = require('../../lib/enums/exitCodes');
+// const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.logs';
 
@@ -48,90 +48,92 @@ const getPrivateAppsUrl = accountId => {
   return `${baseUrl}/private-apps/${accountId}`;
 };
 
-const handleLogsError = (e, name, projectName) => {
-  if (e.statusCode === 404) {
-    logger.debug(`Log fetch error: ${e.message}`);
-    logger.log(i18n(`${i18nKey}.logs.noLogsFound`, { name }));
-  } else {
-    logApiErrorInstance(
-      e,
-      new ApiErrorContext({ accountId: getAccountId(), projectName })
-    );
-    process.exit(EXIT_CODES.ERROR);
-  }
-};
-
-const handleFunctionLog = async (accountId, options) => {
-  const {
-    latest,
-    follow,
-    compact,
-    appPath,
-    functionName,
-    projectName,
-  } = options;
-
-  let logsResp;
-
-  const tailCall = async after => {
-    try {
-      return appPath
-        ? getProjectAppFunctionLogs(
-            accountId,
-            functionName,
-            projectName,
-            appPath,
-            {
-              after,
-            }
-          )
-        : getFunctionLogs(accountId, functionName, { after });
-    } catch (e) {
-      handleLogsError(e, functionName, projectName);
-    }
-  };
-
-  const fetchLatest = async () => {
-    return appPath
-      ? getLatestProjectAppFunctionLog(
-          accountId,
-          functionName,
-          projectName,
-          appPath
-        )
-      : getLatestFunctionLog(accountId, functionName, projectName);
-  };
-
-  if (follow) {
-    await tailLogs({
-      accountId,
-      compact,
-      tailCall,
-      fetchLatest,
-      name: functionName,
-    });
-  } else if (latest) {
-    try {
-      logsResp = await fetchLatest();
-    } catch (e) {
-      handleLogsError(e, functionName, projectName);
-      return true;
-    }
-  } else {
-    try {
-      logsResp = await tailCall();
-    } catch (e) {
-      handleLogsError(e, functionName, projectName);
-      return true;
-    }
-  }
-
-  if (logsResp) {
-    outputLogs(logsResp, options);
-    return true;
-  }
-  return false;
-};
+// We currently cannot fetch logs directly to the CLI. See internal CLI issue #413 for more information.
+
+// const handleLogsError = (e, name, projectName) => {
+//   if (e.statusCode === 404) {
+//     logger.debug(`Log fetch error: ${e.message}`);
+//     logger.log(i18n(`${i18nKey}.logs.noLogsFound`, { name }));
+//   } else {
+//     logApiErrorInstance(
+//       e,
+//       new ApiErrorContext({ accountId: getAccountId(), projectName })
+//     );
+//     process.exit(EXIT_CODES.ERROR);
+//   }
+// };
+
+// const handleFunctionLog = async (accountId, options) => {
+//   const {
+//     latest,
+//     follow,
+//     compact,
+//     appPath,
+//     functionName,
+//     projectName,
+//   } = options;
+
+//   let logsResp;
+
+//   const tailCall = async after => {
+//     try {
+//       return appPath
+//         ? getProjectAppFunctionLogs(
+//             accountId,
+//             functionName,
+//             projectName,
+//             appPath,
+//             {
+//               after,
+//             }
+//           )
+//         : getFunctionLogs(accountId, functionName, { after });
+//     } catch (e) {
+//       handleLogsError(e, functionName, projectName);
+//     }
+//   };
+
+//   const fetchLatest = async () => {
+//     return appPath
+//       ? getLatestProjectAppFunctionLog(
+//           accountId,
+//           functionName,
+//           projectName,
+//           appPath
+//         )
+//       : getLatestFunctionLog(accountId, functionName, projectName);
+//   };
+
+//   if (follow) {
+//     await tailLogs({
+//       accountId,
+//       compact,
+//       tailCall,
+//       fetchLatest,
+//       name: functionName,
+//     });
+//   } else if (latest) {
+//     try {
+//       logsResp = await fetchLatest();
+//     } catch (e) {
+//       handleLogsError(e, functionName, projectName);
+//       return true;
+//     }
+//   } else {
+//     try {
+//       logsResp = await tailCall();
+//     } catch (e) {
+//       handleLogsError(e, functionName, projectName);
+//       return true;
+//     }
+//   }
+
+//   if (logsResp) {
+//     outputLogs(logsResp, options);
+//     return true;
+//   }
+//   return false;
+// };
 
 exports.command = 'logs [--project] [--app] [--function] [--endpoint]';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -154,7 +156,7 @@ exports.handler = async options => {
     options.function || promptFunctionName || options.endpoint;
   const endpointName = options.endpoint || promptEndpointName;
 
-  let relativeAppPath;
+  // let relativeAppPath;
   let appId;
 
   if (appName && !endpointName) {
@@ -162,10 +164,11 @@ exports.handler = async options => {
       allowCreate: false,
     });
 
-    const { deployedBuild, id: projectId } = await fetchProject(
-      accountId,
-      projectName
-    );
+    // const { deployedBuild, id: projectId } = await fetchProject(
+    //   accountId,
+    //   projectName
+    // );
+    const { id: projectId } = await fetchProject(accountId, projectName);
 
     const { results: deployComponents } = await fetchDeployComponentsMetadata(
       accountId,
@@ -180,22 +183,22 @@ exports.handler = async options => {
       appId = appComponent.componentIdentifier;
     }
 
-    if (deployedBuild && deployedBuild.subbuildStatuses) {
-      const appSubbuild = deployedBuild.subbuildStatuses.find(
-        subbuild => subbuild.buildName === appName
-      );
-      if (appSubbuild) {
-        relativeAppPath = appSubbuild.rootPath;
-      } else {
-        logger.error(
-          i18n(`${i18nKey}.errors.invalidAppName`, {
-            appName: options.app,
-            projectName,
-          })
-        );
-        process.exit(EXIT_CODES.ERROR);
-      }
-    }
+    // if (deployedBuild && deployedBuild.subbuildStatuses) {
+    //   const appSubbuild = deployedBuild.subbuildStatuses.find(
+    //     subbuild => subbuild.buildName === appName
+    //   );
+    //   if (appSubbuild) {
+    //     relativeAppPath = appSubbuild.rootPath;
+    //   } else {
+    //     logger.error(
+    //       i18n(`${i18nKey}.errors.invalidAppName`, {
+    //         appName: options.app,
+    //         projectName,
+    //       })
+    //     );
+    //     process.exit(EXIT_CODES.ERROR);
+    //   }
+    // }
   }
 
   trackCommandUsage('project-logs', null, accountId);
@@ -240,16 +243,16 @@ exports.handler = async options => {
   logger.log();
   uiLine();
 
-  const showFinalMessage = await handleFunctionLog(accountId, {
-    ...options,
-    projectName,
-    appPath: relativeAppPath,
-    functionName: functionName || endpointName,
-  });
+  //   const showFinalMessage = await handleFunctionLog(accountId, {
+  //     ...options,
+  //     projectName,
+  //     appPath: relativeAppPath,
+  //     functionName: functionName || endpointName,
+  //   });
 
-  if (showFinalMessage) {
-    uiLine();
-  }
+  //   if (showFinalMessage) {
+  //     uiLine();
+  //   }
 };
 
 exports.builder = yargs => {

package/commands/project/upload.js

@@ -59,9 +59,9 @@ exports.handler = async options => {
       message
     );
 
-    if (result.error) {
+    if (result.uploadError) {
       if (
-        isSpecifiedError(result.error, {
+        isSpecifiedError(result.uploadError, {
           subCategory: ERROR_TYPES.PROJECT_LOCKED,
         })
       ) {
@@ -70,7 +70,7 @@ exports.handler = async options => {
         logger.log();
       } else {
         logApiErrorInstance(
-          result.error,
+          result.uploadError,
           new ApiErrorContext({
             accountId,
             projectName: projectConfig.name,
@@ -79,7 +79,7 @@ exports.handler = async options => {
       }
       process.exit(EXIT_CODES.ERROR);
     }
-    if (result.buildSucceeded && !result.autodeployEnabled) {
+    if (result.succeeded && !result.buildResult.isAutoDeployEnabled) {
       uiLine();
       logger.log(
         chalk.bold(