@hubspot/cli 5.2.1-beta.2 → 5.2.1-beta.4

package/commands/project/dev.js

@@ -15,14 +15,17 @@ const {
   getAccountConfig,
   getEnv,
 } = require('@hubspot/local-dev-lib/config');
-const { fetchProject } = require('@hubspot/local-dev-lib/api/projects');
 const {
   getProjectConfig,
   ensureProjectExists,
   validateProjectConfig,
 } = require('../../lib/projects');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { uiBetaTag } = require('../../lib/ui');
+const {
+  uiAccountDescription,
+  uiBetaTag,
+  uiCommandReference,
+} = require('../../lib/ui');
 const SpinniesManager = require('../../lib/ui/SpinniesManager');
 const LocalDevManager = require('../../lib/LocalDevManager');
 const {
@@ -50,7 +53,7 @@ const {
   useExistingDevTestAccount,
 } = require('../../lib/localDev');
 
-const i18nKey = 'cli.commands.project.subcommands.dev';
+const i18nKey = 'commands.project.subcommands.dev';
 
 exports.command = 'dev [--account]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
@@ -104,12 +107,30 @@ exports.handler = async options => {
   let createNewSandbox = false;
   let createNewDeveloperTestAccount = false;
 
+  // The user is targeting an account type that we recommend developing on
   if (!targetProjectAccountId && defaultAccountIsRecommendedType) {
-    await confirmDefaultAccountIsTarget(accountConfig, hasPublicApps);
-    targetProjectAccountId = hasPublicApps
-      ? accountConfig.parentAccountId
-      : accountId;
     targetTestingAccountId = accountId;
+
+    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);
+      }
+      targetProjectAccountId = accountConfig.parentAccountId;
+    } else {
+      targetProjectAccountId = accountId;
+    }
   } else if (!targetProjectAccountId && hasPublicApps) {
     checkIfAppDeveloperAccount(accountConfig);
   }
@@ -157,7 +178,7 @@ exports.handler = async options => {
     targetProjectAccountId = accountId;
   }
 
-  const projectExists = await ensureProjectExists(
+  const { projectExists, project } = await ensureProjectExists(
     targetProjectAccountId,
     projectConfig.name,
     {
@@ -170,20 +191,14 @@ exports.handler = async options => {
   let deployedBuild;
   let isGithubLinked;
 
+  SpinniesManager.init();
+
   if (projectExists) {
-    const project = await fetchProject(
-      targetProjectAccountId,
-      projectConfig.name
-    );
     deployedBuild = project.deployedBuild;
     isGithubLinked =
       project.sourceIntegration &&
       project.sourceIntegration.source === 'GITHUB';
-  }
-
-  SpinniesManager.init();
-
-  if (!projectExists) {
+  } else {
     await createNewProjectForLocalDev(
       projectConfig,
       targetProjectAccountId,
@@ -199,13 +214,16 @@ exports.handler = async options => {
   }
 
   const LocalDev = new LocalDevManager({
+    components,
     debug: options.debug,
     deployedBuild,
+    isGithubLinked,
+    parentAccountId: targetProjectAccountId,
     projectConfig,
     projectDir,
+    projectId: project.id,
     targetAccountId: targetTestingAccountId,
-    isGithubLinked,
-    components,
+    env,
   });
 
   await LocalDev.start();

package/commands/project/download.js

@@ -25,7 +25,7 @@ const {
 const { i18n } = require('../../lib/lang');
 const { uiBetaTag } = require('../../lib/ui');
 
-const i18nKey = 'cli.commands.project.subcommands.download';
+const i18nKey = 'commands.project.subcommands.download';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 exports.command = 'download [--project]';
@@ -50,10 +50,14 @@ exports.handler = async options => {
   trackCommandUsage('project-download', null, accountId);
 
   try {
-    const projectExists = await ensureProjectExists(accountId, projectName, {
-      allowCreate: false,
-      noLogs: true,
-    });
+    const { projectExists } = await ensureProjectExists(
+      accountId,
+      projectName,
+      {
+        allowCreate: false,
+        noLogs: true,
+      }
+    );
 
     if (!projectExists) {
       logger.error(

package/commands/project/listBuilds.js

@@ -29,7 +29,7 @@ const {
 const moment = require('moment');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 
-const i18nKey = 'cli.commands.project.subcommands.listBuilds';
+const i18nKey = 'commands.project.subcommands.listBuilds';
 
 exports.command = 'list-builds [path]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);

package/commands/project/logs.js

@@ -36,7 +36,7 @@ const { projectLogsPrompt } = require('../../lib/prompts/projectsLogsPrompt');
 const { i18n } = require('../../lib/lang');
 // const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
-const i18nKey = 'cli.commands.project.subcommands.logs';
+const i18nKey = 'commands.project.subcommands.logs';
 
 const getPrivateAppsUrl = accountId => {
   const baseUrl = getHubSpotWebsiteOrigin(

package/commands/project/open.js

@@ -19,7 +19,7 @@ const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
 const { uiBetaTag } = require('../../lib/ui');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
-const i18nKey = 'cli.commands.project.subcommands.open';
+const i18nKey = 'commands.project.subcommands.open';
 
 exports.command = 'open [--project]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
@@ -37,9 +37,13 @@ exports.handler = async options => {
   let projectName = project;
 
   if (projectName) {
-    const projectExists = await ensureProjectExists(accountId, projectName, {
-      allowCreate: false,
-    });
+    const { projectExists } = await ensureProjectExists(
+      accountId,
+      projectName,
+      {
+        allowCreate: false,
+      }
+    );
 
     if (!projectExists) {
       process.exit(EXIT_CODES.ERROR);

package/commands/project/upload.js

@@ -28,7 +28,7 @@ const {
 } = require('../../lib/errorHandlers/apiErrors');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
-const i18nKey = 'cli.commands.project.subcommands.upload';
+const i18nKey = 'commands.project.subcommands.upload';
 
 exports.command = 'upload [path] [--forceCreate] [--message]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);

package/commands/project/watch.js

@@ -32,7 +32,7 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { handleKeypress, handleExit } = require('../../lib/process');
 
-const i18nKey = 'cli.commands.project.subcommands.watch';
+const i18nKey = 'commands.project.subcommands.watch';
 
 exports.command = 'watch [path]';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);

package/commands/project.js

@@ -12,7 +12,7 @@ const open = require('./project/open');
 const dev = require('./project/dev');
 const add = require('./project/add');
 
-const i18nKey = 'cli.commands.project';
+const i18nKey = 'commands.project';
 
 exports.command = 'project';
 exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);

package/commands/remove.js

@@ -15,7 +15,7 @@ const { loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
 
-const i18nKey = 'cli.commands.remove';
+const i18nKey = 'commands.remove';
 
 exports.command = 'remove <path>';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/sandbox/create.js

@@ -39,7 +39,7 @@ const {
   HUBSPOT_ACCOUNT_TYPE_STRINGS,
 } = require('@hubspot/local-dev-lib/constants/config');
 
-const i18nKey = 'cli.commands.sandbox.subcommands.create';
+const i18nKey = 'commands.sandbox.subcommands.create';
 
 exports.command = 'create [--name] [--type]';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -92,14 +92,14 @@ exports.handler = async options => {
   } catch (err) {
     if (isMissingScopeError(err)) {
       logger.error(
-        i18n('cli.lib.sandbox.create.failure.scopes.message', {
+        i18n('lib.sandbox.create.failure.scopes.message', {
           accountName: accountConfig.name || accountId,
         })
       );
       const websiteOrigin = getHubSpotWebsiteOrigin(env);
       const url = `${websiteOrigin}/personal-access-key/${accountId}`;
       logger.info(
-        i18n('cli.lib.sandbox.create.failure.scopes.instructions', {
+        i18n('lib.sandbox.create.failure.scopes.instructions', {
           accountName: accountConfig.name || accountId,
           url,
         })
@@ -123,7 +123,7 @@ exports.handler = async options => {
   let sandboxSyncPromptResult = true;
   let contactRecordsSyncPromptResult = true;
   if (!force) {
-    const syncI18nKey = 'cli.lib.sandbox.sync';
+    const syncI18nKey = 'lib.sandbox.sync';
     const sandboxLangKey =
       sandboxType === HUBSPOT_ACCOUNT_TYPES.DEVELOPMENT_SANDBOX
         ? 'developer'

package/commands/sandbox/delete.js

@@ -35,7 +35,7 @@ const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
 const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
 const { uiAccountDescription } = require('../../lib/ui');
 
-const i18nKey = 'cli.commands.sandbox.subcommands.delete';
+const i18nKey = 'commands.sandbox.subcommands.delete';
 
 exports.command = 'delete [--account]';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/sandbox/sync.js

@@ -32,7 +32,7 @@ const {
   HUBSPOT_ACCOUNT_TYPES,
 } = require('@hubspot/local-dev-lib/constants/config');
 
-const i18nKey = 'cli.commands.sandbox.subcommands.sync';
+const i18nKey = 'commands.sandbox.subcommands.sync';
 
 exports.command = 'sync';
 exports.describe = i18n(`${i18nKey}.describe`);
@@ -95,7 +95,7 @@ exports.handler = async options => {
       })
     ) {
       logger.error(
-        i18n('cli.lib.sandbox.sync.failure.objectNotFound', {
+        i18n('lib.sandbox.sync.failure.objectNotFound', {
           account: uiAccountDescription(accountId),
         })
       );

package/commands/sandbox.js

@@ -4,7 +4,7 @@ const create = require('./sandbox/create');
 const del = require('./sandbox/delete');
 const sync = require('./sandbox/sync');
 
-const i18nKey = 'cli.commands.sandbox';
+const i18nKey = 'commands.sandbox';
 
 exports.command = 'sandbox';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/secrets/addSecret.js

@@ -18,7 +18,7 @@ const { uiAccountDescription } = require('../../lib/ui');
 const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
 const { i18n } = require('../../lib/lang');
 
-const i18nKey = 'cli.commands.secrets.subcommands.add';
+const i18nKey = 'commands.secrets.subcommands.add';
 
 exports.command = 'add <name>';
 exports.describe = i18n(`${i18nKey}.describe`);

package/commands/secrets/deleteSecret.js

@@ -17,7 +17,7 @@ const {
 } = require('../../lib/commonOpts');
 const { i18n } = require('../../lib/lang');
 
-const i18nKey = 'cli.commands.secrets.subcommands.delete';
+const i18nKey = 'commands.secrets.subcommands.delete';
 
 exports.command = 'delete <name>';
 exports.describe = i18n(`${i18nKey}.describe`);

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`);

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`);

package/commands/secrets.js

@@ -6,7 +6,7 @@ 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`);

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`);

package/commands/theme/preview.js

@@ -33,9 +33,9 @@ const {
   COMPONENT_TYPES,
 } = require('../../lib/projectStructure');
 
-const i18nKey = 'cli.commands.preview';
+const i18nKey = 'commands.preview';
 exports.command = 'preview [--src] [--dest]';
-exports.describe = false; // i18n(`${i18nKey}.describe`) - Hiding command
+exports.describe = i18n(`${i18nKey}.describe`);
 
 const validateSrcPath = src => {
   const logInvalidPath = () => {

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,

package/commands/watch.js

@@ -19,7 +19,7 @@ const { trackCommandUsage } = require('../lib/usageTracking');
 const { i18n } = require('../lib/lang');
 const { getUploadableFileList } = require('../lib/upload');
 
-const i18nKey = 'cli.commands.watch';
+const i18nKey = 'commands.watch';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 
 exports.command = 'watch [--src] [--dest]';