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

package/commands/project/dev.js

@@ -7,7 +7,7 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { getConfigAccounts } = require('@hubspot/cli-lib/lib/config');
 const { createProject, fetchProject } = require('@hubspot/cli-lib/api/dfs');
@@ -40,10 +40,14 @@ const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
 const { buildSandbox } = require('../../lib/sandbox-create');
 const { syncSandbox } = require('../../lib/sandbox-sync');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
+const {
+  isMissingScopeError,
+} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
 
 const i18nKey = 'cli.commands.project.subcommands.dev';
 
-exports.command = 'dev [--account] [--mockServers]';
+exports.command = 'dev [--account] [--port]';
 exports.describe = null; //i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
@@ -114,7 +118,23 @@ exports.handler = async options => {
     try {
       await validateSandboxUsageLimits(accountConfig, DEVELOPER_SANDBOX, env);
     } catch (err) {
-      logErrorInstance(err);
+      if (isMissingScopeError(err)) {
+        logger.error(
+          i18n('cli.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', {
+            accountName: accountConfig.name || accountId,
+            url,
+          })
+        );
+      } else {
+        logErrorInstance(err);
+      }
       process.exit(EXIT_CODES.ERROR);
     }
     try {
@@ -228,7 +248,9 @@ exports.handler = async options => {
   });
 
   let result;
-  if (uploadPermission === UPLOAD_PERMISSIONS.always) {
+  // 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(
       targetAccountId,
       projectConfig,
@@ -249,11 +271,11 @@ exports.handler = async options => {
 
   const LocalDev = new LocalDevManager({
     debug: options.debug,
-    mockServers: options.mockServers,
     projectConfig,
     projectDir,
     targetAccountId,
     uploadPermission,
+    port: options.port,
   });
 
   await LocalDev.start();
@@ -267,11 +289,11 @@ exports.builder = yargs => {
   addUseEnvironmentOptions(yargs, true);
   addTestingOptions(yargs, true);
 
-  yargs.option('mockServers', {
-    describe: 'mock servers',
-    type: 'boolean',
-    default: false,
+  yargs.option('port', {
+    describe: i18n(`${i18nKey}.options.port.describe`),
+    type: 'number',
   });
+
   yargs.example([['$0 project dev', i18n(`${i18nKey}.examples.default`)]]);
 
   return yargs;

package/commands/project/download.js

@@ -25,7 +25,7 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const {
   downloadProjectPrompt,
 } = require('../../lib/prompts/downloadProjectPrompt');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.project.subcommands.download';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');

package/commands/project/logs.js

@@ -31,7 +31,7 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const { uiLine, uiLink } = require('../../lib/ui');
 const { projectLogsPrompt } = require('../../lib/prompts/projectsLogsPrompt');
 const { tailLogs } = require('../../lib/serverlessLogs');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 
 const i18nKey = 'cli.commands.project.subcommands.logs';

package/commands/project/open.js

@@ -8,7 +8,7 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
   getProjectConfig,

package/commands/project/upload.js

@@ -17,7 +17,7 @@ const {
   validateProjectConfig,
   pollProjectBuildAndDeploy,
 } = require('../../lib/projects');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 const { getAccountConfig } = require('@hubspot/cli-lib');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 

package/commands/project/watch.js

@@ -1,4 +1,4 @@
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 const { createWatcher } = require('@hubspot/cli-lib/projectsWatch');
 const {
   logApiErrorInstance,

package/commands/remove.js

@@ -13,7 +13,7 @@ const {
 } = require('../lib/commonOpts');
 const { loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../lib/lang');
 
 const i18nKey = 'cli.commands.remove';
 

package/commands/sandbox/create.js

@@ -6,7 +6,7 @@ const {
   addTestingOptions,
 } = require('../../lib/commonOpts');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
 const { buildSandbox } = require('../../lib/sandbox-create');
@@ -30,6 +30,10 @@ const {
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { syncSandbox } = require('../../lib/sandbox-sync');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
+const {
+  isMissingScopeError,
+} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
+const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 
 const i18nKey = 'cli.commands.sandbox.subcommands.create';
 
@@ -79,7 +83,23 @@ exports.handler = async options => {
   try {
     await validateSandboxUsageLimits(accountConfig, sandboxType, env);
   } catch (err) {
-    logErrorInstance(err);
+    if (isMissingScopeError(err)) {
+      logger.error(
+        i18n('cli.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', {
+          accountName: accountConfig.name || accountId,
+          url,
+        })
+      );
+    } else {
+      logErrorInstance(err);
+    }
     trackCommandUsage('sandbox-create', { successful: false }, accountId);
     process.exit(EXIT_CODES.ERROR);
   }

package/commands/sandbox/delete.js

@@ -13,7 +13,7 @@ const {
 } = require('@hubspot/cli-lib/errorHandlers/standardErrors');
 const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
 const { deleteSandbox } = require('@hubspot/cli-lib/sandboxes');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 const { getConfig, getEnv, getAccountConfig } = require('@hubspot/cli-lib');
 const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {

package/commands/sandbox/sync.js

@@ -8,7 +8,7 @@ const {
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
 const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');

package/commands/secrets/addSecret.js

@@ -16,7 +16,7 @@ const {
 } = require('../../lib/commonOpts');
 const { uiAccountDescription } = require('../../lib/ui');
 const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.secrets.subcommands.add';
 

package/commands/secrets/deleteSecret.js

@@ -15,7 +15,7 @@ const {
   addUseEnvironmentOptions,
   getAccountId,
 } = require('../../lib/commonOpts');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.secrets.subcommands.delete';
 

package/commands/secrets/listSecrets.js

@@ -15,7 +15,7 @@ const {
   addUseEnvironmentOptions,
   getAccountId,
 } = require('../../lib/commonOpts');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.secrets.subcommands.list';
 

package/commands/secrets/updateSecret.js

@@ -16,7 +16,7 @@ const {
   getAccountId,
 } = require('../../lib/commonOpts');
 const { secretValuePrompt } = require('../../lib/prompts/secretPrompt');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.secrets.subcommands.update';
 

package/commands/secrets.js

@@ -4,7 +4,7 @@ const addSecretCommand = require('./secrets/addSecret');
 const listSecretsCommand = require('./secrets/listSecrets');
 const deleteSecretCommand = require('./secrets/deleteSecret');
 const updateSecretCommand = require('./secrets/updateSecret');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../lib/lang');
 
 const i18nKey = 'cli.commands.secrets';
 

package/commands/theme/marketplace-validate.js

@@ -15,7 +15,7 @@ const {
   processValidationErrors,
   displayValidationResults,
 } = require('../../lib/marketplace-validate');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../../lib/lang');
 
 const i18nKey = 'cli.commands.theme.subcommands.marketplaceValidate';
 

package/commands/theme.js

@@ -1,6 +1,6 @@
 const marketplaceValidate = require('./theme/marketplace-validate');
 const { addConfigOptions, addAccountOptions } = require('../lib/commonOpts');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../lib/lang');
 
 const i18nKey = 'cli.commands.theme';
 

package/commands/upload.js

@@ -33,7 +33,7 @@ const {
   getThemePreviewUrl,
   getThemeJSONPath,
 } = require('@hubspot/cli-lib/lib/files');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../lib/lang');
 const i18nKey = 'cli.commands.upload';
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
 const {

package/commands/watch.js

@@ -16,7 +16,7 @@ const {
 const { uploadPrompt } = require('../lib/prompts/uploadPrompt');
 const { validateMode, loadAndValidateOptions } = require('../lib/validation');
 const { trackCommandUsage } = require('../lib/usageTracking');
-const { i18n } = require('@hubspot/cli-lib/lib/lang');
+const { i18n } = require('../lib/lang');
 const { getUploadableFileList } = require('../lib/upload');
 
 const i18nKey = 'cli.commands.watch';