@hubspot/cli 5.2.1-beta.10 → 5.2.1-beta.12

package/lib/prompts/installPublicAppPrompt.js

@@ -12,20 +12,29 @@ const installPublicAppPrompt = async (
   targetAccountId,
   clientId,
   scopes,
-  redirectUrls
+  redirectUrls,
+  isReinstall = false
 ) => {
   logger.log('');
-  logger.log(i18n(`${i18nKey}.explanation`));
+  if (isReinstall) {
+    logger.log(i18n(`${i18nKey}.reinstallExplanation`));
+  } else {
+    logger.log(i18n(`${i18nKey}.explanation`));
+  }
 
   const { shouldOpenBrowser } = await promptUser({
     name: 'shouldOpenBrowser',
     type: 'confirm',
-    message: i18n(`${i18nKey}.prompt`),
+    message: i18n(
+      isReinstall ? `${i18nKey}.reinstallPrompt` : `${i18nKey}.prompt`
+    ),
   });
 
-  if (!shouldOpenBrowser) {
+  if (!isReinstall && !shouldOpenBrowser) {
     logger.log(i18n(`${i18nKey}.decline`));
     process.exit(EXIT_CODES.SUCCESS);
+  } else if (!shouldOpenBrowser) {
+    return;
   }
 
   const websiteOrigin = getHubSpotWebsiteOrigin(env);

package/lib/prompts/selectPublicAppPrompt.js

@@ -10,17 +10,35 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'lib.prompts.selectPublicAppPrompt';
 
-const fetchPublicAppOptions = async (accountId, accountName) => {
+const fetchPublicAppOptions = async (
+  accountId,
+  accountName,
+  isMigratingApp = false
+) => {
   try {
     const publicApps = await fetchPublicAppsForPortal(accountId);
     const filteredPublicApps = publicApps.filter(
       app => !app.projectId && !app.sourceId
     );
 
-    if (!filteredPublicApps.length) {
+    if (
+      !filteredPublicApps.length ||
+      (isMigratingApp &&
+        !filteredPublicApps.some(
+          app => !app.preventProjectMigrations || !app.listingInfo
+        ))
+    ) {
+      const headerTranslationKey = isMigratingApp
+        ? 'noAppsMigration'
+        : 'noAppsClone';
+      const messageTranslationKey = isMigratingApp
+        ? 'noAppsMigrationMessage'
+        : 'noAppsCloneMessage';
       uiLine();
-      logger.error(i18n(`${i18nKey}.errors.noApps`));
-      logger.log(i18n(`${i18nKey}.errors.noAppsMessage`, { accountName }));
+      logger.error(i18n(`${i18nKey}.errors.${headerTranslationKey}`));
+      logger.log(
+        i18n(`${i18nKey}.errors.${messageTranslationKey}`, { accountName })
+      );
       uiLine();
       process.exit(EXIT_CODES.SUCCESS);
     }
@@ -35,10 +53,16 @@ const fetchPublicAppOptions = async (accountId, accountName) => {
 const selectPublicAppPrompt = async ({
   accountId,
   accountName,
-  migrateApp = false,
+  isMigratingApp = false,
 }) => {
-  const publicApps = await fetchPublicAppOptions(accountId, accountName);
-  const translationKey = migrateApp ? 'selectAppIdMigrate' : 'selectAppIdClone';
+  const publicApps = await fetchPublicAppOptions(
+    accountId,
+    accountName,
+    isMigratingApp
+  );
+  const translationKey = isMigratingApp
+    ? 'selectAppIdMigrate'
+    : 'selectAppIdClone';
 
   return promptUser([
     {
@@ -48,10 +72,11 @@ const selectPublicAppPrompt = async ({
       }),
       type: 'list',
       choices: publicApps.map(app => {
-        if (app.listingInfo) {
+        const { preventProjectMigrations, listingInfo } = app;
+        if (isMigratingApp && preventProjectMigrations && listingInfo) {
           return {
             name: `${app.name} (${app.id})`,
-            disabled: i18n(`${i18nKey}.errors.marketplaceApp`),
+            disabled: i18n(`${i18nKey}.errors.cannotBeMigrated`),
           };
         }
         return {
@@ -64,6 +89,5 @@ const selectPublicAppPrompt = async ({
 };
 
 module.exports = {
-  fetchPublicAppOptions,
   selectPublicAppPrompt,
 };

package/lib/serverlessLogs.js

@@ -52,7 +52,7 @@ const tailLogs = async ({
     initialAfter = latestLog && base64EncodeString(latestLog.id);
   } catch (e) {
     // A 404 means no latest log exists(never executed)
-    if (e.statusCode !== 404) {
+    if (e.response && e.response.status !== 404) {
       await logServerlessFunctionApiErrorInstance(
         accountId,
         e,
@@ -68,7 +68,7 @@ const tailLogs = async ({
       latestLog = await tailCall(after);
       nextAfter = latestLog.paging.next.after;
     } catch (e) {
-      if (e.statusCode !== 404) {
+      if (e.response && e.response.status !== 404) {
         logApiErrorInstance(
           e,
           new ApiErrorContext({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.2.1-beta.10",
+  "version": "5.2.1-beta.12",
   "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/local-dev-lib": "1.6.0",
-    "@hubspot/serverless-dev-runtime": "5.2.1-beta.10",
+    "@hubspot/local-dev-lib": "1.9.0",
+    "@hubspot/serverless-dev-runtime": "5.2.1-beta.11",
     "@hubspot/theme-preview-dev-server": "0.0.7",
     "@hubspot/ui-extensions-dev-server": "0.8.20",
     "archiver": "^5.3.0",
@@ -33,6 +33,7 @@
     "yargs": "15.4.1"
   },
   "devDependencies": {
+    "axios": "^1.7.2",
     "mock-stdin": "^1.0.0"
   },
   "engines": {
@@ -45,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e20391c6bfc2c9de9b7d0b641e5241c409e510ad"
+  "gitHead": "24f25e7728f70ea9628e268a08f6d26916c94e40"
 }