@hubspot/cli 6.0.0 → 6.1.0

package/commands/project/cloneApp.js

@@ -20,6 +20,7 @@ const {
 } = require('../../lib/prompts/createProjectPrompt');
 const { poll } = require('../../lib/polling');
 const {
+  uiBetaTag,
   uiLine,
   uiCommandReference,
   uiAccountDescription,
@@ -46,7 +47,7 @@ const { extractZipArchive } = require('@hubspot/local-dev-lib/archive');
 const i18nKey = 'commands.project.subcommands.cloneApp';
 
 exports.command = 'clone-app';
-exports.describe = null; // uiBetaTag(i18n(`${i18nKey}.describe`), false);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);

package/commands/project/dev.js

@@ -21,12 +21,7 @@ const {
   validateProjectConfig,
 } = require('../../lib/projects');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const {
-  uiAccountDescription,
-  uiBetaTag,
-  uiCommandReference,
-  uiLink,
-} = require('../../lib/ui');
+const { uiBetaTag, uiCommandReference, uiLink } = require('../../lib/ui');
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const LocalDevManager = require('../../lib/LocalDevManager');
 const {
@@ -52,6 +47,7 @@ const {
   createInitialBuildForNewProject,
   useExistingDevTestAccount,
   validateAccountOption,
+  checkIfParentAccountIsAuthed,
 } = require('../../lib/localDev');
 
 const i18nKey = 'commands.project.subcommands.dev';
@@ -130,19 +126,7 @@ exports.handler = async options => {
     await confirmDefaultAccountIsTarget(accountConfig, hasPublicApps);
 
     if (hasPublicApps) {
-      // Exit if the user has not authed the parent account in the config
-      if (!getAccountConfig(accountConfig.parentAccountId)) {
-        logger.error(
-          i18n(`${i18nKey}.errors.parentAccountNotConfigured`, {
-            accountId: accountConfig.parentAccountId,
-            accountIdentifier: uiAccountDescription(targetTestingAccountId),
-            authCommand: uiCommandReference(
-              `hs auth --account=${accountConfig.parentAccountId}`
-            ),
-          })
-        );
-        process.exit(EXIT_CODES.ERROR);
-      }
+      checkIfParentAccountIsAuthed(accountConfig);
       targetProjectAccountId = accountConfig.parentAccountId;
     } else {
       targetProjectAccountId = accountId;

package/commands/project/migrateApp.js

@@ -52,7 +52,7 @@ const {
 const i18nKey = 'commands.project.subcommands.migrateApp';
 
 exports.command = 'migrate-app';
-exports.describe = null; // uiBetaTag(i18n(`${i18nKey}.describe`), false);
+exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
 
 exports.handler = async options => {
   await loadAndValidateOptions(options);
@@ -63,6 +63,16 @@ exports.handler = async options => {
 
   trackCommandUsage('migrate-app', {}, accountId);
 
+  logger.log('');
+  logger.log(uiBetaTag(i18n(`${i18nKey}.header.text`), false));
+  logger.log(
+    uiLink(
+      i18n(`${i18nKey}.header.link`),
+      'https://developers.hubspot.com/docs/platform/migrate-a-public-app-to-projects'
+    )
+  );
+  logger.log('');
+
   if (!isAppDeveloperAccount(accountConfig)) {
     uiLine();
     logger.error(i18n(`${i18nKey}.errors.invalidAccountTypeTitle`));
@@ -85,7 +95,6 @@ exports.handler = async options => {
           isMigratingApp: true,
         });
 
-  let appName;
   try {
     const selectedApp = await fetchPublicAppMetadata(appId, accountId);
     // preventProjectMigrations returns true if we have not added app to allowlist config.
@@ -96,7 +105,6 @@ exports.handler = async options => {
       logger.error(i18n(`${i18nKey}.errors.invalidApp`, { appId }));
       process.exit(EXIT_CODES.ERROR);
     }
-    appName = selectedApp.name;
   } catch (error) {
     logApiErrorInstance(error, new ApiErrorContext({ accountId }));
     process.exit(EXIT_CODES.ERROR);
@@ -134,7 +142,8 @@ exports.handler = async options => {
 
   logger.log('');
   uiLine();
-  logger.log(uiBetaTag(i18n(`${i18nKey}.warning.title`, { appName }), false));
+  logger.warn(i18n(`${i18nKey}.warning.title`));
+  logger.log('');
   logger.log(i18n(`${i18nKey}.warning.projectConversion`));
   logger.log(i18n(`${i18nKey}.warning.appConfig`));
   logger.log('');

package/lang/en.lyaml

@@ -484,7 +484,6 @@ en:
             noProjectConfig: "No project detected. Please run this command again from a project directory."
             invalidProjectComponents: "Projects cannot contain both private and public apps. Move your apps to separate projects before attempting local development."
             noRunnableComponents: "No supported components were found in this project. Run {{ command }} to see a list of available components and add one to your project."
-            parentAccountNotConfigured: "To develop this project locally, run {{ authCommand }} to authenticate the App Developer Account {{ accountId }} associated with {{ accountIdentifier }}."
           examples:
             default: "Start local dev for the current project"
         create:
@@ -513,13 +512,16 @@ en:
               describe: "Directory where project should be created"
             name:
               describe: "Project name (cannot be changed)"
+          header:
+            text: "Migrate an app to the projects framework"
+            link: "Learn more about migrating apps to the projects framework"
           migrationStatus:
             inProgress: "Converting app configuration to {{#bold}}public-app.json{{/bold}} component definition ..."
             success: "{{#bold}}Your app was converted and build #1 is deployed{{/bold}}"
             done: "Converting app configuration to public-app.json component definition ... DONE"
             failure: "Converting app configuration to public-app.json component definition ... FAILED"
           warning:
-            title: "{{#bold}}Migrate {{appName}} to the projects framework?{{/bold}}"
+            title: "{{#bold}}You are about to migrate an app to the projects framework{{/bold}}"
             projectConversion: "{{#bold}}The selected app will be converted to a project component.{{/bold}}"
             appConfig: "All supported app configuration will be moved to the {{#bold}}public-app.json{{/bold}} component definition file. Future updates to those features must be made through the project build and deploy pipeline, not the developer account UI."
             buildAndDeploy: "This will create a new project with a single app component and immediately build and deploy it to your developer account (build #1)."
@@ -1023,6 +1025,8 @@ en:
       createInitialBuildForNewProject:
         initialUploadMessage: "HubSpot Local Dev Server Startup"
         projectLockedError: "Your project is locked. This may mean that another user is running the {{#bold}}`hs project watch`{{/bold}} command for this project. If this is you, unlock the project in Projects UI."
+      checkIfParentAccountIsAuthed:
+        notAuthedError: "To develop this project locally, run {{ authCommand }} to authenticate the App Developer Account {{ accountId }} associated with {{ accountIdentifier }}."
     projects:
       config:
         srcOutsideProjectDir: "Invalid value for 'srcDir' in {{ projectConfig }}: {{#bold}}srcDir: \"{{ srcDir }}\"{{/bold}}\n\t'srcDir' must be a relative path to a folder under the project root, such as \".\" or \"./src\""
@@ -1218,7 +1222,7 @@ en:
           languageRequired: "Please select API sample app's language"
       createProjectPrompt:
         enterName: "[--name] Give your project a name: "
-        enterLocation: "[--location] Where should the project be created?"
+        enterLocation: "[--location] Enter the folder to create the project in:"
         selectTemplate: "[--template] Choose a project template: "
         errors:
           nameRequired: "A project name is required"

package/lib/__tests__/dependencyManagement.test.js

@@ -28,6 +28,7 @@ describe('cli/lib/dependencyManagement', () => {
   const appFunctionsDir = path.join(appDir, 'app.functions');
   const extensionsDir = path.join(appDir, 'exensions');
   const projectName = 'super cool test project';
+  const installLocations = [appFunctionsDir, extensionsDir];
 
   beforeEach(() => {
     execMock = jest.fn();
@@ -64,7 +65,6 @@ describe('cli/lib/dependencyManagement', () => {
   describe('installPackages', () => {
     it('should setup a loading spinner', async () => {
       const packages = ['package1', 'package2'];
-      const installLocations = ['src/app/app.functions', 'src/app/extensions'];
       await installPackages({ packages, installLocations });
       expect(SpinniesManager.init).toHaveBeenCalledTimes(
         installLocations.length
@@ -79,7 +79,6 @@ describe('cli/lib/dependencyManagement', () => {
 
     it('should install the provided packages in all the provided install locations', async () => {
       const packages = ['package1', 'package2'];
-      const installLocations = ['src/app/app.functions', 'src/app/extensions'];
       await installPackages({ packages, installLocations });
 
       expect(execMock).toHaveBeenCalledTimes(installLocations.length);
@@ -91,9 +90,9 @@ describe('cli/lib/dependencyManagement', () => {
       );
 
       for (const location of installLocations) {
-        expect(execMock).toHaveBeenCalledWith(
-          `npm --prefix=${location} install package1 package2`
-        );
+        expect(execMock).toHaveBeenCalledWith(`npm install package1 package2`, {
+          cwd: location,
+        });
         expect(SpinniesManager.add).toHaveBeenCalledWith(
           `installingDependencies-${location}`,
           {
@@ -110,15 +109,14 @@ describe('cli/lib/dependencyManagement', () => {
     });
 
     it('should use the provided install locations', async () => {
-      const installLocations = ['src/app/app.functions', 'src/app/extensions'];
       await installPackages({ installLocations });
       expect(execMock).toHaveBeenCalledTimes(installLocations.length);
-      expect(execMock).toHaveBeenCalledWith(
-        `npm --prefix=${installLocations[0]} install`
-      );
-      expect(execMock).toHaveBeenCalledWith(
-        `npm --prefix=${installLocations[1]} install`
-      );
+      expect(execMock).toHaveBeenCalledWith(`npm install`, {
+        cwd: appFunctionsDir,
+      });
+      expect(execMock).toHaveBeenCalledWith(`npm install`, {
+        cwd: extensionsDir,
+      });
     });
 
     it('should locate the projects package.json files when install locations is not provided', async () => {
@@ -137,14 +135,14 @@ describe('cli/lib/dependencyManagement', () => {
       });
 
       await installPackages({});
-      // Its called once per each install location, plus once to check if npm installed
+      // It's called once per each install location, plus once to check if npm installed
       expect(execMock).toHaveBeenCalledTimes(installLocations.length + 1);
-      expect(execMock).toHaveBeenCalledWith(
-        `npm --prefix=${appFunctionsDir} install`
-      );
-      expect(execMock).toHaveBeenCalledWith(
-        `npm --prefix=${extensionsDir} install`
-      );
+      expect(execMock).toHaveBeenCalledWith(`npm install`, {
+        cwd: appFunctionsDir,
+      });
+      expect(execMock).toHaveBeenCalledWith(`npm install`, {
+        cwd: extensionsDir,
+      });
     });
 
     it('should throw an error when installing the dependencies fails', async () => {

package/lib/dependencyManagement.js

@@ -62,7 +62,7 @@ async function installPackagesInDirectory(packages, directory) {
             directory: relativeDir,
           }),
   });
-  let installCommand = `${DEFAULT_PACKAGE_MANAGER} --prefix=${directory} install`;
+  let installCommand = `${DEFAULT_PACKAGE_MANAGER} install`;
 
   if (packages) {
     installCommand = `${installCommand} ${packages.join(' ')}`;
@@ -71,7 +71,7 @@ async function installPackagesInDirectory(packages, directory) {
   logger.debug(`Running ${installCommand}`);
   try {
     const exec = util.promisify(execAsync);
-    await exec(installCommand);
+    await exec(installCommand, { cwd: directory });
     SpinniesManager.succeed(spinner, {
       text: i18n(`${i18nKey}.installationSuccessful`, {
         directory: relativeDir,

package/lib/localDev.js

@@ -95,16 +95,34 @@ const checkIfAppDeveloperAccount = accountConfig => {
   }
 };
 
-// Confirm the default account is a developer account if developing public apps
-const validateAccountOption = (accountConfig, hasPublicApps) => {
-  if (hasPublicApps && !isDeveloperTestAccount(accountConfig)) {
+const checkIfParentAccountIsAuthed = accountConfig => {
+  if (!getAccountConfig(accountConfig.parentAccountId)) {
     logger.error(
-      i18n(`${i18nKey}.validateAccountOption.invalidPublicAppAccount`, {
-        useCommand: uiCommandReference('hs accounts use'),
-        devCommand: uiCommandReference('hs project dev'),
+      i18n(`${i18nKey}.checkIfParentAccountIsAuthed.notAuthedError`, {
+        accountId: accountConfig.parentAccountId,
+        accountIdentifier: uiAccountDescription(accountConfig.portalId),
+        authCommand: uiCommandReference(
+          `hs auth --account=${accountConfig.parentAccountId}`
+        ),
       })
     );
     process.exit(EXIT_CODES.SUCCESS);
+  }
+};
+
+// Confirm the default account is a developer account if developing public apps
+const validateAccountOption = (accountConfig, hasPublicApps) => {
+  if (hasPublicApps) {
+    if (!isDeveloperTestAccount) {
+      logger.error(
+        i18n(`${i18nKey}.validateAccountOption.invalidPublicAppAccount`, {
+          useCommand: uiCommandReference('hs accounts use'),
+          devCommand: uiCommandReference('hs project dev'),
+        })
+      );
+      process.exit(EXIT_CODES.SUCCESS);
+    }
+    checkIfParentAccountIsAuthed(accountConfig);
   } else if (isAppDeveloperAccount(accountConfig)) {
     logger.error(
       i18n(`${i18nKey}.validateAccountOption.invalidPrivateAppAccount`, {
@@ -456,4 +474,5 @@ module.exports = {
   createNewProjectForLocalDev,
   createInitialBuildForNewProject,
   getAccountHomeUrl,
+  checkIfParentAccountIsAuthed,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "6.0.0",
+  "version": "6.1.0",
   "description": "CLI for working with HubSpot",
   "license": "Apache-2.0",
   "repository": {
@@ -46,5 +46,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d01e7f7c6222133ffac7c6dd757fb95247a04b25"
+  "gitHead": "51f7638e491a999b6f64a9f3bda3c4d05fff0dbc"
 }