@hubspot/cli 7.0.0 → 7.0.1-beta.0

package/bin/cli.js

@@ -5,16 +5,16 @@ 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 { loadConfig, configFileExists, getConfigPath, validateConfig, } = require('@hubspot/local-dev-lib/config');
+const { loadConfig, getAccountId, configFileExists, getConfigPath, validateConfig, } = require('@hubspot/local-dev-lib/config');
 const { logError } = require('../lib/errorHandlers/index');
-const { setLogLevel, getCommandName, injectAccountIdMiddleware, } = require('../lib/commonOpts');
+const { setLogLevel, getCommandName } = require('../lib/commonOpts');
 const { validateAccount } = require('../lib/validation');
 const { trackHelpUsage, trackConvertFieldsUsage, } = require('../lib/usageTracking');
 const { getIsInProject } = require('../lib/projects');
 const pkg = require('../package.json');
 const { i18n } = require('../lib/lang');
 const { EXIT_CODES } = require('../lib/enums/exitCodes');
-const { UI_COLORS, uiCommandReference } = require('../lib/ui');
+const { UI_COLORS, uiCommandReference, uiDeprecatedTag } = require('../lib/ui');
 const { checkAndWarnGitInclusion } = require('../lib/ui/git');
 const removeCommand = require('../commands/remove');
 const initCommand = require('../commands/init');
@@ -141,6 +141,32 @@ const SKIP_CONFIG_VALIDATION = {
     init: { target: true },
     auth: { target: true },
 };
+const handleDeprecatedEnvVariables = options => {
+    // HUBSPOT_PORTAL_ID is deprecated, but we'll still support it for now
+    // The HubSpot GH Deploy Action still uses HUBSPOT_PORTAL_ID
+    if (options.useEnv &&
+        process.env.HUBSPOT_PORTAL_ID &&
+        !process.env.HUBSPOT_ACCOUNT_ID) {
+        uiDeprecatedTag(i18n(`${i18nKey}.handleDeprecatedEnvVariables.portalEnvVarDeprecated`, {
+            configPath: getConfigPath(),
+        }));
+        process.env.HUBSPOT_ACCOUNT_ID = process.env.HUBSPOT_PORTAL_ID;
+    }
+};
+/**
+ * Auto-injects the derivedAccountId flag into all commands
+ */
+const injectAccountIdMiddleware = async (options) => {
+    const { account } = options;
+    // Preserves the original --account flag for certain commands.
+    options.providedAccountId = account;
+    if (options.useEnv && process.env.HUBSPOT_ACCOUNT_ID) {
+        options.derivedAccountId = parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
+    }
+    else {
+        options.derivedAccountId = getAccountId(account);
+    }
+};
 const loadConfigMiddleware = async (options) => {
     // Skip this when no command is provided
     if (!options._.length) {
@@ -213,6 +239,7 @@ const argv = yargs
     .middleware([
     setLogLevel,
     setRequestHeaders,
+    handleDeprecatedEnvVariables,
     loadConfigMiddleware,
     injectAccountIdMiddleware,
     checkAndWarnGitInclusionMiddleware,

package/lang/en.lyaml

@@ -7,6 +7,8 @@ en:
         cliUpdateNotification: "HubSpot CLI version {{#cyan}}{{#bold}}{currentVersion}{{/bold}}{{/cyan}} is outdated.\nRun {{ updateCommand }} to upgrade to version {{#cyan}}{{#bold}}{latestVersion}{{/bold}}{{/cyan}}"
       srcIsProject: "\"{{ src }}\" is in a project folder. Did you mean \"hs project {{command}}\"?"
       setDefaultAccountMoved: "This command has moved. Try `hs accounts use` instead"
+      handleDeprecatedEnvVariables:
+        portalEnvVarDeprecated: "The HUBSPOT_PORTAL_ID environment variable is deprecated. Please use HUBSPOT_ACCOUNT_ID instead."
       loadConfigMiddleware:
         configFileExists: "A configuration file already exists at {{ configPath }}. To specify a new configuration file, delete the existing one and try again."
     completion:

package/lib/commonOpts.d.ts

@@ -24,13 +24,6 @@ export declare function getCommandName(argv: Arguments<{
 export declare function getAccountId(options: Arguments<{
     account?: number | string;
 }>): number | null;
-/**
- * Auto-injects the derivedAccountId flag into all commands
- */
-export declare function injectAccountIdMiddleware(options: Arguments<{
-    derivedAccountId?: number | null;
-    account?: number | string;
-}>): Promise<void>;
 export declare function getCmsPublishMode(options: Arguments<{
     cmsPublishMode?: CmsPublishMode;
 }>): CmsPublishMode;

package/lib/commonOpts.js

@@ -10,7 +10,6 @@ exports.addUseEnvironmentOptions = addUseEnvironmentOptions;
 exports.setLogLevel = setLogLevel;
 exports.getCommandName = getCommandName;
 exports.getAccountId = getAccountId;
-exports.injectAccountIdMiddleware = injectAccountIdMiddleware;
 exports.getCmsPublishMode = getCmsPublishMode;
 const logger_1 = require("@hubspot/local-dev-lib/logger");
 const files_1 = require("@hubspot/local-dev-lib/constants/files");
@@ -94,19 +93,6 @@ function getAccountId(options) {
     }
     return (0, config_1.getAccountId)(account);
 }
-/**
- * Auto-injects the derivedAccountId flag into all commands
- */
-async function injectAccountIdMiddleware(options) {
-    const { account } = options;
-    // Preserves the original --account flag for certain commands.
-    options.providedAccountId = account;
-    if (options.useEnv && process.env.HUBSPOT_ACCOUNT_ID) {
-        options.derivedAccountId = parseInt(process.env.HUBSPOT_ACCOUNT_ID, 10);
-        return;
-    }
-    options.derivedAccountId = (0, config_1.getAccountId)(account);
-}
 function getCmsPublishMode(options) {
     // 1. --cmsPublishMode
     const { cmsPublishMode } = options;

package/package.json

@@ -1,11 +1,11 @@
 {
     "name": "@hubspot/cli",
-    "version": "7.0.0",
+    "version": "7.0.1-beta.0",
     "description": "The official CLI for developing on HubSpot",
     "license": "Apache-2.0",
     "repository": "https://github.com/HubSpot/hubspot-cli",
     "dependencies": {
-        "@hubspot/local-dev-lib": "3.1.0",
+        "@hubspot/local-dev-lib": "3.1.1",
         "@hubspot/serverless-dev-runtime": "7.0.1",
         "@hubspot/theme-preview-dev-server": "0.0.10",
         "@hubspot/ui-extensions-dev-server": "0.8.40",