@hubspot/cli 3.0.13-beta.4 → 4.0.0

package/bin/cli.js

@@ -58,24 +58,55 @@ const getTerminalWidth = () => {
   return width;
 };
 
+const handleFailure = (msg, err, yargs) => {
+  if (msg) {
+    logger.error(msg);
+  } else if (err) {
+    logErrorInstance(err);
+  }
+
+  if (msg === null) {
+    yargs.showHelp();
+    process.exit(EXIT_CODES.SUCCESS);
+  } else {
+    process.exit(EXIT_CODES.ERROR);
+  }
+};
+
+const performChecks = argv => {
+  // "hs config set default-account" has moved to "hs accounts use"
+  if (
+    argv._[0] === 'config' &&
+    argv._[1] === 'set' &&
+    argv._[2] === 'default-account'
+  ) {
+    logger.error(i18n(`${i18nKey}.setDefaultAccountMoved`));
+    process.exit(EXIT_CODES.ERROR);
+  }
+
+  // Require "project" command when running upload/watch inside of a project
+  if (argv._.length === 1 && ['upload', 'watch'].includes(argv._[0])) {
+    if (getIsInProject(argv.src)) {
+      logger.error(
+        i18n(`${i18nKey}.srcIsProject`, {
+          src: argv.src || './',
+          command: argv._.join(' '),
+        })
+      );
+      process.exit(EXIT_CODES.ERROR);
+    } else {
+      return true;
+    }
+  } else {
+    return true;
+  }
+};
+
 const argv = yargs
   .usage('Tools for working with HubSpot')
   .middleware([setLogLevel])
   .exitProcess(false)
-  .fail((msg, err, yargs) => {
-    if (msg) {
-      logger.error(msg);
-    } else if (err) {
-      logErrorInstance(err);
-    }
-
-    if (msg === null) {
-      yargs.showHelp();
-      process.exit(EXIT_CODES.SUCCESS);
-    } else {
-      process.exit(EXIT_CODES.ERROR);
-    }
-  })
+  .fail(handleFailure)
   .option('debug', {
     alias: 'd',
     default: false,
@@ -94,23 +125,7 @@ const argv = yargs
     hidden: true,
     type: 'boolean',
   })
-  .check(argv => {
-    if (argv._.length === 1 && ['upload', 'watch'].includes(argv._[0])) {
-      if (getIsInProject(argv.src)) {
-        logger.error(
-          i18n(`${i18nKey}.srcIsProject`, {
-            src: argv.src,
-            command: argv._.join(' '),
-          })
-        );
-        process.exit(EXIT_CODES.ERROR);
-      } else {
-        return true;
-      }
-    } else {
-      return true;
-    }
-  })
+  .check(performChecks)
   .command(authCommand)
   .command(initCommand)
   .command(logsCommand)

package/commands/accounts/use.js

@@ -33,7 +33,7 @@ const selectAccountFromConfig = async config => {
   return selectedDefault;
 };
 
-exports.command = 'use [account]';
+exports.command = 'use [--account]';
 exports.describe = i18n(`${i18nKey}.describe`);
 
 exports.handler = async options => {
@@ -68,14 +68,17 @@ exports.handler = async options => {
 };
 
 exports.builder = yargs => {
-  yargs.positional('account', {
-    describe: i18n(`${i18nKey}.positionals.account.describe`),
+  yargs.option('account', {
+    describe: i18n(`${i18nKey}.options.account.describe`),
     type: 'string',
   });
   yargs.example([
     ['$0 accounts use', i18n(`${i18nKey}.examples.default`)],
-    ['$0 accounts use MyAccount', i18n(`${i18nKey}.examples.nameBased`)],
-    ['$0 accounts use 1234567', i18n(`${i18nKey}.examples.idBased`)],
+    [
+      '$0 accounts use --account=MyAccount',
+      i18n(`${i18nKey}.examples.nameBased`),
+    ],
+    ['$0 accounts use --account=1234567', i18n(`${i18nKey}.examples.idBased`)],
   ]);
 
   return yargs;

package/commands/config/set.js

@@ -33,7 +33,7 @@ const selectOptions = async () => {
 };
 
 const handleConfigUpdate = async (accountId, options) => {
-  const { defaultMode, httpTimeout, allowUsageTracking } = options;
+  const { allowUsageTracking, defaultMode, httpTimeout } = options;
 
   if (typeof defaultMode !== 'undefined') {
     await setDefaultMode({ defaultMode, accountId });
@@ -89,5 +89,8 @@ exports.builder = yargs => {
 
   yargs.example([['$0 config set', i18n(`${i18nKey}.examples.default`)]]);
 
+  //TODO remove this when "hs accounts use" is fully rolled out
+  yargs.strict(false);
+
   return yargs;
 };

package/lib/projects.js

@@ -211,7 +211,7 @@ const getProjectDetailUrl = (projectName, accountId) => {
   if (!projectName) return;
 
   const baseUrl = getHubSpotWebsiteOrigin(
-    getEnv() === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
+    getEnv(accountId) === 'qa' ? ENVIRONMENTS.QA : ENVIRONMENTS.PROD
   );
 
   return `${baseUrl}/developer-projects/${accountId}/project/${projectName}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hubspot/cli",
-  "version": "3.0.13-beta.4",
+  "version": "4.0.0",
   "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/cli-lib": "3.0.13-beta.4",
-    "@hubspot/serverless-dev-runtime": "3.0.13-beta.4",
+    "@hubspot/cli-lib": "4.0.0",
+    "@hubspot/serverless-dev-runtime": "4.0.0",
     "archiver": "^5.3.0",
     "chalk": "^4.1.2",
     "express": "^4.17.1",
@@ -37,5 +37,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "470770a002f503df0538286c22e990639033e572"
+  "gitHead": "c11f159c8768c0a0beac7b221d4c2489bcf0064d"
 }