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

package/commands/project/cloneApp.js

@@ -1,4 +1,5 @@
 const path = require('path');
+const fs = require('fs');
 const {
   addAccountOptions,
   addConfigOptions,
@@ -12,8 +13,8 @@ const {
   selectPublicAppPrompt,
 } = require('../../lib/prompts/selectPublicAppPrompt');
 const {
-  cloneAppLocationPrompt,
-} = require('../../lib/prompts/cloneAppLocationPrompt');
+  createProjectPrompt,
+} = require('../../lib/prompts/createProjectPrompt');
 const { poll } = require('../../lib/polling');
 const {
   uiLine,
@@ -27,6 +28,8 @@ const {
 } = require('../../lib/errorHandlers/apiErrors');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { isAppDeveloperAccount } = require('../../lib/accountTypes');
+const { writeProjectConfig } = require('../../lib/projects');
+const { PROJECT_CONFIG_FILE } = require('../../lib/constants');
 const {
   cloneApp,
   checkCloneStatus,
@@ -35,9 +38,6 @@ const {
 const { getCwd } = require('@hubspot/local-dev-lib/path');
 const { logger } = require('@hubspot/local-dev-lib/logger');
 const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
-const {
-  fetchPublicAppMetadata,
-} = require('@hubspot/local-dev-lib/api/appsDev');
 const { extractZipArchive } = require('@hubspot/local-dev-lib/archive');
 
 const i18nKey = 'commands.project.subcommands.cloneApp';
@@ -68,7 +68,7 @@ exports.handler = async options => {
   }
 
   let appId;
-  let appName;
+  let name;
   let location;
   try {
     appId = options.appId;
@@ -77,16 +77,14 @@ exports.handler = async options => {
         accountId,
         accountName,
         options,
-        migrateApp: false,
+        isMigratingApp: false,
       });
       appId = appIdResponse.appId;
     }
 
-    const selectedApp = await fetchPublicAppMetadata(appId, accountId);
-    appName = selectedApp.name;
-
-    const locationResponse = await cloneAppLocationPrompt(options, appName);
-    location = locationResponse.location;
+    const projectResponse = await createProjectPrompt('', options, true);
+    name = projectResponse.name;
+    location = projectResponse.location;
   } catch (error) {
     logApiErrorInstance(error, new ApiErrorContext({ accountId }));
     process.exit(EXIT_CODES.ERROR);
@@ -101,20 +99,37 @@ exports.handler = async options => {
     const { exportId } = await cloneApp(accountId, appId);
     const { status } = await poll(checkCloneStatus, accountId, exportId);
     if (status === 'SUCCESS') {
-      const absoluteDestPath = path.resolve(getCwd(), location);
-      const zippedProject = await downloadClonedProject(accountId, exportId);
-
-      await extractZipArchive(
-        zippedProject,
-        appName,
-        path.resolve(absoluteDestPath),
-        { includesRootDir: true, hideLogs: true }
-      );
+      // Ensure correct project folder structure exists
+      const baseDestPath = path.resolve(getCwd(), location);
+      const absoluteDestPath = path.resolve(baseDestPath, 'src', 'app');
+      fs.mkdirSync(absoluteDestPath, { recursive: true });
+
+      // Extract zipped app files and place them in correct directory
+      const zippedApp = await downloadClonedProject(accountId, exportId);
+      await extractZipArchive(zippedApp, name, absoluteDestPath, {
+        includesRootDir: true,
+        hideLogs: true,
+      });
+
+      // Create hsproject.json file
+      const configPath = path.join(baseDestPath, PROJECT_CONFIG_FILE);
+      const configContent = {
+        name,
+        srcDir: 'src',
+        platformVersion: '2023.2',
+      };
+      const success = writeProjectConfig(configPath, configContent);
 
       SpinniesManager.succeed('cloneApp', {
         text: i18n(`${i18nKey}.cloneStatus.done`),
         succeedColor: 'white',
       });
+      if (!success) {
+        logger.error(
+          i18n(`${i18nKey}.errors.couldNotWriteConfigPath`),
+          configPath
+        );
+      }
       logger.log('');
       uiLine();
       logger.success(i18n(`${i18nKey}.cloneStatus.success`, { location }));

package/commands/project/migrateApp.js

@@ -79,13 +79,16 @@ exports.handler = async options => {
       : await selectPublicAppPrompt({
           accountId,
           accountName,
-          migrateApp: true,
+          isMigratingApp: true,
         });
 
   let appName;
   try {
     const selectedApp = await fetchPublicAppMetadata(appId, accountId);
-    if (selectedApp.preventProjectMigrations) {
+    // preventProjectMigrations returns true if we have not added app to allowlist config.
+    // listingInfo will only exist for marketplace apps
+    const { preventProjectMigrations, listingInfo } = selectedApp;
+    if (preventProjectMigrations && listingInfo) {
       logger.error(i18n(`${i18nKey}.errors.invalidApp`, { appId }));
       process.exit(EXIT_CODES.ERROR);
     }

package/lang/en.lyaml

@@ -545,6 +545,7 @@ en:
           errors:
             invalidAccountTypeTitle: "{{#bold}}Developer account not targeted{{/bold}}"
             invalidAccountTypeDescription: "Only public apps created in a developer account can be converted to a project component. Select a connected developer account with {{useCommand}} or {{authCommand}} and try again."
+            couldNotWriteConfigPath: "Failed to write project config at {{ configPath }}"
         add:
           describe: "Create a new component within a project"
           options:
@@ -1244,12 +1245,6 @@ en:
           noAppsCloneMessage: "The selected developer account {{#bold}}{{ accountName }}{{/bold}} doesn't have any apps that can be cloned to the projects framework."
           errorFetchingApps: "There was an error fetching public apps."
           cannotBeMigrated: "Cannot be migrated"
-      cloneAppLocationPrompt:
-        enterLocation: "[--location] Where should the cloned project be created?"
-        errors:
-          locationRequired: "A project location is required"
-          invalidLocation: "The selected destination already exists. Please provide a new path for this project."
-          invalidCharacters: "The selected destination contains invalid characters. Please provide a new path and try again."
       downloadProjectPrompt:
         selectProject: "Select a project to download:"
         errors:

package/lib/projects.js

@@ -60,8 +60,10 @@ const writeProjectConfig = (configPath, config) => {
     fs.writeFileSync(configPath, JSON.stringify(config, null, 2));
     logger.debug(`Wrote project config at ${configPath}`);
   } catch (e) {
-    logger.error(`Could not write project config at ${configPath}`);
+    logger.debug(e);
+    return false;
   }
+  return true;
 };
 
 const getIsInProject = _dir => {

package/lib/prompts/selectPublicAppPrompt.js

@@ -10,7 +10,11 @@ const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'lib.prompts.selectPublicAppPrompt';
 
-const fetchPublicAppOptions = async (accountId, accountName, migrateApp) => {
+const fetchPublicAppOptions = async (
+  accountId,
+  accountName,
+  isMigratingApp = false
+) => {
   try {
     const publicApps = await fetchPublicAppsForPortal(accountId);
     const filteredPublicApps = publicApps.filter(
@@ -19,13 +23,15 @@ const fetchPublicAppOptions = async (accountId, accountName, migrateApp) => {
 
     if (
       !filteredPublicApps.length ||
-      (migrateApp &&
-        !filteredPublicApps.find(app => !app.preventProjectMigrations))
+      (isMigratingApp &&
+        !filteredPublicApps.some(
+          app => !app.preventProjectMigrations || !app.listingInfo
+        ))
     ) {
-      const headerTranslationKey = migrateApp
+      const headerTranslationKey = isMigratingApp
         ? 'noAppsMigration'
         : 'noAppsClone';
-      const messageTranslationKey = migrateApp
+      const messageTranslationKey = isMigratingApp
         ? 'noAppsMigrationMessage'
         : 'noAppsCloneMessage';
       uiLine();
@@ -47,14 +53,16 @@ const fetchPublicAppOptions = async (accountId, accountName, migrateApp) => {
 const selectPublicAppPrompt = async ({
   accountId,
   accountName,
-  migrateApp = false,
+  isMigratingApp = false,
 }) => {
   const publicApps = await fetchPublicAppOptions(
     accountId,
     accountName,
-    (migrateApp = false)
+    isMigratingApp
   );
-  const translationKey = migrateApp ? 'selectAppIdMigrate' : 'selectAppIdClone';
+  const translationKey = isMigratingApp
+    ? 'selectAppIdMigrate'
+    : 'selectAppIdClone';
 
   return promptUser([
     {
@@ -64,7 +72,8 @@ const selectPublicAppPrompt = async ({
       }),
       type: 'list',
       choices: publicApps.map(app => {
-        if (migrateApp && app.preventProjectMigrations) {
+        const { preventProjectMigrations, listingInfo } = app;
+        if (isMigratingApp && preventProjectMigrations && listingInfo) {
           return {
             name: `${app.name} (${app.id})`,
             disabled: i18n(`${i18nKey}.errors.cannotBeMigrated`),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "5.2.1-beta.11",
+  "version": "5.2.1-beta.13",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "615fa1fe30d5343064ee0646fe5109546236c854"
+  "gitHead": "093562cbfdee6d18a528a6e330e485ad018b292f"
 }

package/lib/prompts/cloneAppLocationPrompt.js

@@ -1,32 +0,0 @@
-const fs = require('fs');
-const path = require('path');
-const { promptUser } = require('./promptUtils');
-const { i18n } = require('../lang');
-const { getCwd, isValidPath } = require('@hubspot/local-dev-lib/path');
-
-const i18nKey = 'lib.prompts.cloneAppLocationPrompt';
-
-const cloneAppLocationPrompt = (promptOptions, appName) => {
-  return promptUser({
-    name: 'location',
-    message: i18n(`${i18nKey}.enterLocation`),
-    when: !promptOptions.location,
-    default: path.resolve(getCwd(), appName),
-    validate: input => {
-      if (!input) {
-        return i18n(`${i18nKey}.errors.locationRequired`);
-      }
-      if (fs.existsSync(input)) {
-        return i18n(`${i18nKey}.errors.invalidLocation`);
-      }
-      if (!isValidPath(input)) {
-        return i18n(`${i18nKey}.errors.invalidCharacters`);
-      }
-      return true;
-    },
-  });
-};
-
-module.exports = {
-  cloneAppLocationPrompt,
-};