Merge branch 'main' into js/theme-project-dev

.github/workflows/build.yml

@@ -6,7 +6,7 @@ jobs:
 
     steps:
       - name: Build Failure Slack Report
-        if: ${{ github.ref == 'refs/heads/master' }}
+        if: ${{ github.ref == 'refs/heads/main' }}
         uses: ravsamhq/notify-slack-action@master
         with:
           status: ${{ job.status }}

CONTRIBUTING.md

@@ -66,7 +66,7 @@ yarn check-deps # Should output "No dependency issues found"
 ```
 
 ## Merging
-To merge, either create, or have a maintainer create a blank branch, and set your PRs base branch to the blank branch. Merge your PR into the blank branch, and ensure that it passes the build. Then merge the new branch into master.
+To merge, either create, or have a maintainer create a blank branch, and set your PRs base branch to the blank branch. Merge your PR into the blank branch, and ensure that it passes the build. Then merge the new branch into main.
 
 
 ## Documentation

lerna.json

@@ -2,5 +2,5 @@
   "npmClient": "yarn",
   "useWorkspaces": true,
   "packages": ["packages/*", "acceptance-tests"],
-  "version": "5.2.1-beta.0"
+  "version": "5.2.1-beta.1"
 }

package.json

@@ -22,8 +22,8 @@
     "check-deps": "node bin/depcheck.js",
     "lint": "eslint . && prettier --list-different packages/**/*.{js,json}",
     "prettier:write": "prettier --write packages/**/*.{js,json}",
-    "publish-release": "branch=$(git rev-parse --abbrev-ref HEAD) && [ $branch = master ] && yarn lerna publish --conventional-graduate --exact || echo 'Error: New release can only be published on master branch' >&2",
-    "publish-prerelease": "branch=$(git rev-parse --abbrev-ref HEAD) && [ $branch = master ] && yarn lerna publish prerelease --preid beta --dist-tag next --exact || echo 'Error: New release can only be published on master branch' >&2",
+    "publish-release": "branch=$(git rev-parse --abbrev-ref HEAD) && [ $branch = main ] && yarn lerna publish --conventional-graduate --exact || echo 'Error: New release can only be published on main branch' >&2",
+    "publish-prerelease": "branch=$(git rev-parse --abbrev-ref HEAD) && [ $branch = main ] && yarn lerna publish prerelease --preid beta --dist-tag next --exact || echo 'Error: New release can only be published on main branch' >&2",
     "test": "jest",
     "test-cli": "lerna run test-headless --stream",
     "jest": "jest --watch",

packages/cli/bin/cli.js

@@ -5,6 +5,7 @@ const updateNotifier = require('update-notifier');
 const chalk = require('chalk');
 
 const { logger } = require('@hubspot/local-dev-lib/logger');
+const { addUserAgentHeader } = require('@hubspot/local-dev-lib/http');
 const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
 const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const {
@@ -110,9 +111,13 @@ const performChecks = argv => {
   }
 };
 
+const setRequestHeaders = () => {
+  addUserAgentHeader('HubSpot CLI', pkg.version);
+};
+
 const argv = yargs
   .usage('The command line interface to interact with HubSpot.')
-  .middleware([setLogLevel])
+  .middleware([setLogLevel, setRequestHeaders])
   .exitProcess(false)
   .fail(handleFailure)
   .option('debug', {

packages/cli/commands/accounts/list.js

@@ -9,11 +9,13 @@ const {
 } = require('../../lib/commonOpts');
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { loadAndValidateOptions } = require('../../lib/validation');
-const { isSandbox, getSandboxName } = require('../../lib/sandboxes');
+const { getSandboxName } = require('../../lib/sandboxes');
 const {
+  isSandbox,
   isDeveloperTestAccount,
   isAppDeveloperAccount,
-} = require('../../lib/developerTestAccounts');
+} = require('../../lib/accountTypes');
+
 const { i18n } = require('../../lib/lang');
 const {
   HUBSPOT_ACCOUNT_TYPES,