Use local dev lib config

packages/cli/commands/accounts/clean.js

@@ -2,7 +2,6 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const {
   accessTokenForPersonalAccessKey,
 } = require('@hubspot/cli-lib/personalAccessKey');
-const { getConfig } = require('@hubspot/cli-lib');
 
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');
@@ -18,7 +17,7 @@ const { getAccountName } = require('../../lib/sandboxes');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { getTableContents } = require('@hubspot/cli-lib/lib/table');
 const SpinniesManager = require('../../lib/SpinniesManager');
-const { deleteAccount } = require('@hubspot/cli-lib/lib/config');
+const { getConfig, deleteAccount } = require('@hubspot/local-dev-lib/config');
 const {
   isSpecifiedHubSpotAuthError,
 } = require('../../lib/errorHandlers/apiErrors');

packages/cli/commands/accounts/info.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { getAccessToken } = require('@hubspot/cli-lib/personalAccessKey.js');
 const {
   getAccountId,

packages/cli/commands/accounts/list.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getConfig, getConfigPath } = require('@hubspot/cli-lib/lib/config');
+const { getConfig, getConfigPath } = require('@hubspot/local-dev-lib/config');
 const {
   getTableContents,
   getTableHeader,

packages/cli/commands/accounts/remove.js

@@ -6,7 +6,7 @@ const {
   getConfigDefaultAccount,
   getAccountId: getAccountIdFromConfig,
   updateDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 
 const { trackCommandUsage } = require('../../lib/usageTracking');
 const { i18n } = require('../../lib/lang');

packages/cli/commands/accounts/rename.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { renameAccount } = require('@hubspot/cli-lib/lib/config');
+const { renameAccount } = require('@hubspot/local-dev-lib/config');
 
 const {
   addConfigOptions,

packages/cli/commands/auth.js

@@ -1,4 +1,4 @@
-const { loadConfig, checkAndWarnGitInclusion } = require('@hubspot/cli-lib');
+const { checkAndWarnGitInclusion } = require('@hubspot/cli-lib');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
   OAUTH_AUTH_METHOD,
@@ -15,7 +15,8 @@ const {
   writeConfig,
   getConfig,
   getConfigPath,
-} = require('@hubspot/cli-lib/lib/config');
+  loadConfig,
+} = require('@hubspot/local-dev-lib/config');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
 const { promptUser } = require('../lib/prompts/promptUtils');
 const {

packages/cli/commands/config/set/allowUsageTracking.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { updateAllowUsageTracking } = require('@hubspot/cli-lib/lib/config');
+const { updateAllowUsageTracking } = require('@hubspot/local-dev-lib/config');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { i18n } = require('../../../lib/lang');

packages/cli/commands/config/set/defaultMode.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { updateDefaultMode } = require('@hubspot/cli-lib/lib/config');
+const { updateDefaultMode } = require('@hubspot/local-dev-lib/config');
 const { Mode } = require('@hubspot/cli-lib');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
 const { trackCommandUsage } = require('../../../lib/usageTracking');

packages/cli/commands/config/set/httpTimeout.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { updateHttpTimeout } = require('@hubspot/cli-lib/lib/config');
+const { updateHttpTimeout } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('../../../lib/prompts/promptUtils');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { i18n } = require('../../../lib/lang');

packages/cli/commands/customObject/schema/create.js

@@ -9,7 +9,10 @@ const {
 } = require('../../../lib/validation');
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
-const { getEnv, isConfigFlagEnabled } = require('@hubspot/cli-lib/');
+const {
+  getEnv,
+  isConfigFlagEnabled,
+} = require('@hubspot/local-dev-lib/config');
 const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
 const { createSchema } = require('@hubspot/cli-lib/api/schema');
 const {

packages/cli/commands/customObject/schema/fetch.js

@@ -1,5 +1,5 @@
 const path = require('path');
-const { isConfigFlagEnabled } = require('@hubspot/cli-lib');
+const { isConfigFlagEnabled } = require('@hubspot/local-dev-lib/config');
 const { logger } = require('@hubspot/cli-lib/logger');
 const {
   logErrorInstance,

packages/cli/commands/customObject/schema/update.js

@@ -10,7 +10,10 @@ const {
 const { trackCommandUsage } = require('../../../lib/usageTracking');
 const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
 const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
-const { getEnv, isConfigFlagEnabled } = require('@hubspot/cli-lib');
+const {
+  getEnv,
+  isConfigFlagEnabled,
+} = require('@hubspot/local-dev-lib/config');
 const { updateSchema } = require('@hubspot/cli-lib/api/schema');
 const {
   updateSchema: updateSchemaFromHubFile,

packages/cli/commands/init.js

@@ -5,7 +5,7 @@ const {
   createEmptyConfigFile,
   deleteEmptyConfigFile,
   updateDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 const { addConfigOptions } = require('../lib/commonOpts');
 const { handleExit } = require('../lib/process');
 const { checkAndUpdateGitignore } = require('@hubspot/cli-lib/lib/git');

packages/cli/commands/project/add.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getAccountId } = require('@hubspot/cli-lib/lib/config');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
 const { fetchReleaseData } = require('@hubspot/cli-lib/github');
 

packages/cli/commands/project/deploy.js

@@ -18,7 +18,7 @@ const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
 const { buildIdPrompt } = require('../../lib/prompts/buildIdPrompt');
 const { i18n } = require('../../lib/lang');
 const { uiBetaTag } = require('../../lib/ui');
-const { getAccountConfig } = require('@hubspot/cli-lib');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 
 const i18nKey = 'cli.commands.project.subcommands.deploy';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');

packages/cli/commands/project/dev.js

@@ -13,7 +13,11 @@ const { loadAndValidateOptions } = require('../../lib/validation');
 const { handleExit } = require('../../lib/process');
 const { i18n } = require('../../lib/lang');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getConfigAccounts } = require('@hubspot/cli-lib/lib/config');
+const {
+  getConfigAccounts,
+  getAccountConfig,
+  getEnv,
+} = require('@hubspot/local-dev-lib/config');
 const { createProject, fetchProject } = require('@hubspot/cli-lib/api/dfs');
 const {
   getProjectConfig,
@@ -37,7 +41,6 @@ const {
 const SpinniesManager = require('../../lib/SpinniesManager');
 const LocalDevManager = require('../../lib/LocalDevManager');
 const { isSandbox } = require('../../lib/sandboxes');
-const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
 const { sandboxNamePrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
   validateSandboxUsageLimits,

packages/cli/commands/project/logs.js

@@ -1,4 +1,4 @@
-const { getEnv } = require('@hubspot/cli-lib/lib/config');
+const { getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
 const {

packages/cli/commands/project/upload.js

@@ -19,7 +19,7 @@ const {
   showPlatformVersionWarning,
 } = require('../../lib/projects');
 const { i18n } = require('../../lib/lang');
-const { getAccountConfig } = require('@hubspot/cli-lib');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
 const {
   logApiErrorInstance,

packages/cli/commands/sandbox/create.js

@@ -8,7 +8,7 @@ const {
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
+const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
 const { buildSandbox } = require('../../lib/sandbox-create');
 const { uiFeatureHighlight } = require('../../lib/ui');
 const {

packages/cli/commands/sandbox/delete.js

@@ -18,12 +18,14 @@ const {
 } = require('../../lib/errorHandlers/apiErrors');
 const { deleteSandbox } = require('@hubspot/cli-lib/sandboxes');
 const { i18n } = require('../../lib/lang');
-const { getConfig, getEnv, getAccountConfig } = require('@hubspot/cli-lib');
 const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
 const {
+  getConfig,
+  getEnv,
+  getAccountConfig,
   removeSandboxAccountFromConfig,
   updateDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 const {
   selectAndSetAsDefaultAccountPrompt,
 } = require('../../lib/prompts/accountsPrompt');

packages/cli/commands/sandbox/sync.js

@@ -10,7 +10,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const { loadAndValidateOptions } = require('../../lib/validation');
 const { i18n } = require('../../lib/lang');
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');
-const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
+const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { promptUser } = require('../../lib/prompts/promptUtils');
 const { uiLine } = require('../../lib/ui');

packages/cli/lib/LocalDevManager.js

@@ -7,7 +7,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
 const {
   getAccountId,
   getConfigDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 const { PROJECT_CONFIG_FILE } = require('@hubspot/cli-lib/lib/constants');
 const SpinniesManager = require('./SpinniesManager');
 const DevServerManager = require('./DevServerManager');

packages/cli/lib/__tests__/commonOpts.js

@@ -1,14 +1,14 @@
+const { Mode, DEFAULT_MODE } = require('@hubspot/cli-lib');
 const {
-  Mode,
-  DEFAULT_MODE,
   getAndLoadConfigIfNeeded,
   getAccountId,
   getAccountConfig,
   loadConfigFromEnvironment,
-} = require('@hubspot/cli-lib');
+} = require('@hubspot/local-dev-lib/config');
 const { getMode } = require('../commonOpts');
 
 jest.mock('@hubspot/cli-lib');
+jest.mock('@hubspot/local-dev-lib/config');
 
 describe('@hubspot/cli/lib/commonOpts', () => {
   describe('getMode()', () => {

packages/cli/lib/__tests__/validation.js

@@ -1,4 +1,4 @@
-const { getAccountConfig } = require('@hubspot/cli-lib');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { getOauthManager } = require('@hubspot/cli-lib/oauth');
 const {
   accessTokenForPersonalAccessKey,
@@ -8,6 +8,7 @@ const { getAccountId } = require('../commonOpts');
 const { validateAccount } = require('../validation');
 
 jest.mock('@hubspot/cli-lib');
+jest.mock('@hubspot/local-dev-lib/config');
 jest.mock('@hubspot/cli-lib/logger');
 jest.mock('@hubspot/cli-lib/oauth');
 jest.mock('@hubspot/cli-lib/personalAccessKey');

packages/cli/lib/commonOpts.js

@@ -1,11 +1,10 @@
 const Logger = require('@hubspot/cli-lib/logger');
+const { DEFAULT_MODE, Mode } = require('@hubspot/cli-lib');
 const {
   getAccountId: getAccountIdFromConfig,
   getAccountConfig,
   getAndLoadConfigIfNeeded,
-  DEFAULT_MODE,
-  Mode,
-} = require('@hubspot/cli-lib');
+} = require('@hubspot/local-dev-lib/config');
 const { i18n } = require('./lang');
 
 const i18nKey = 'cli.lib.commonOpts';

packages/cli/lib/errorHandlers/apiErrors.js

@@ -1,5 +1,5 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const {
   SCOPE_GROUPS,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,

packages/cli/lib/links.js

@@ -1,4 +1,4 @@
-const { getEnv } = require('@hubspot/cli-lib/lib/config');
+const { getEnv } = require('@hubspot/local-dev-lib/config');
 const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');

packages/cli/lib/oauth.js

@@ -1,7 +1,7 @@
 const express = require('express');
 const open = require('open');
 const OAuth2Manager = require('@hubspot/cli-lib/lib/models/OAuth2Manager');
-const { getAccountConfig } = require('@hubspot/cli-lib/lib/config');
+const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
 const { addOauthToAccountConfig } = require('@hubspot/cli-lib/oauth');
 const { handleExit } = require('./process');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');

packages/cli/lib/projects.js

@@ -5,7 +5,7 @@ const tmp = require('tmp');
 const chalk = require('chalk');
 const findup = require('findup-sync');
 const { logger } = require('@hubspot/cli-lib/logger');
-const { getEnv } = require('@hubspot/cli-lib/lib/config');
+const { getEnv } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const {
   ENVIRONMENTS,

packages/cli/lib/prompts/accountsPrompt.js

@@ -1,4 +1,4 @@
-const { updateDefaultAccount } = require('@hubspot/cli-lib/lib/config');
+const { updateDefaultAccount } = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { getAccountName } = require('../sandboxes');

packages/cli/lib/prompts/downloadProjectPrompt.js

@@ -1,5 +1,5 @@
 const { promptUser } = require('./promptUtils');
-const { getAccountId } = require('@hubspot/cli-lib/lib/config');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { fetchProjects } = require('@hubspot/cli-lib/api/dfs');
 const {
   logApiErrorInstance,

packages/cli/lib/prompts/enterAccountNamePrompt.js

@@ -1,4 +1,4 @@
-const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config');
+const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
 const { STRING_WITH_NO_SPACES_REGEX } = require('../regex');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');

packages/cli/lib/prompts/personalAccessKeyPrompt.js

@@ -3,7 +3,7 @@ const {
   OAUTH_SCOPES,
   DEFAULT_OAUTH_SCOPES,
 } = require('@hubspot/cli-lib/lib/constants');
-const { deleteEmptyConfigFile } = require('@hubspot/cli-lib/lib/config');
+const { deleteEmptyConfigFile } = require('@hubspot/local-dev-lib/config');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { promptUser } = require('./promptUtils');

packages/cli/lib/prompts/projectDevTargetAccountPrompt.js

@@ -2,7 +2,7 @@ const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 const { uiAccountDescription, uiCommandReference } = require('../ui');
 const { isSandbox, getAccountName } = require('../sandboxes');
-const { getAccountId } = require('@hubspot/cli-lib');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { getSandboxUsageLimits } = require('@hubspot/cli-lib/sandboxes');
 const { logger } = require('@hubspot/cli-lib/logger');
 

packages/cli/lib/prompts/sandboxesPrompt.js

@@ -5,7 +5,7 @@ const {
   STANDARD_SANDBOX,
   DEVELOPER_SANDBOX,
 } = require('../sandboxes');
-const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config');
+const { accountNameExistsInConfig } = require('@hubspot/local-dev-lib/config');
 
 const i18nKey = 'cli.lib.prompts.sandboxesPrompt';
 

packages/cli/lib/prompts/setAsDefaultAccountPrompt.js

@@ -1,7 +1,7 @@
 const {
   getConfig,
   updateDefaultAccount,
-} = require('@hubspot/cli-lib/lib/config');
+} = require('@hubspot/local-dev-lib/config');
 const { promptUser } = require('./promptUtils');
 const { i18n } = require('../lang');
 

packages/cli/lib/sandbox-create.js

@@ -18,7 +18,7 @@ const {
   isSpecifiedError,
 } = require('./errorHandlers/apiErrors');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
-const { getEnv, getAccountId } = require('@hubspot/cli-lib');
+const { getEnv, getAccountId } = require('@hubspot/local-dev-lib/config');
 const { createSandbox } = require('@hubspot/cli-lib/sandboxes');
 const { getValidEnv } = require('@hubspot/cli-lib/lib/environment');
 

packages/cli/lib/sandbox-sync.js

@@ -20,7 +20,7 @@ const {
   isMissingScopeError,
 } = require('./errorHandlers/apiErrors');
 const { getSandboxTypeAsString } = require('./sandboxes');
-const { getAccountId } = require('@hubspot/cli-lib');
+const { getAccountId } = require('@hubspot/local-dev-lib/config');
 const { uiAccountDescription } = require('./ui');
 
 const i18nKey = 'cli.lib.sandbox.sync';

packages/cli/lib/sandboxes.js

@@ -1,9 +1,3 @@
-const {
-  getConfig,
-  writeConfig,
-  updateAccountConfig,
-  getAccountId,
-} = require('@hubspot/cli-lib');
 const chalk = require('chalk');
 const { i18n } = require('./lang');
 const { handleExit, handleKeypress } = require('./process');
@@ -18,7 +12,13 @@ const {
   fetchTypes,
   getSandboxUsageLimits,
 } = require('@hubspot/cli-lib/sandboxes');
-const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config');
+const {
+  accountNameExistsInConfig,
+  getConfig,
+  writeConfig,
+  updateAccountConfig,
+  getAccountId,
+} = require('@hubspot/local-dev-lib/config');
 const CliProgressMultibarManager = require('./CliProgressMultibarManager');
 const { promptUser } = require('./prompts/promptUtils');
 const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');