replace config imports from cli-lib root

HubSpot · Oct 26, 2023 · cef5f24 · cef5f24
1 parent e6e16ee
commit cef5f24
Show file tree

Hide file tree

Showing 20 changed files with 51 additions and 42 deletions.
diff --git a/packages/cli/commands/accounts/clean.js b/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/local-dev-lib/config');
+const { getConfig, deleteAccount } = require('@hubspot/local-dev-lib/config');
 const {
   isSpecifiedHubSpotAuthError,
 } = require('../../lib/errorHandlers/apiErrors');

diff --git a/packages/cli/commands/auth.js b/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,6 +15,7 @@ const {
   writeConfig,
   getConfig,
   getConfigPath,
+  loadConfig,
 } = require('@hubspot/local-dev-lib/config');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
 const { promptUser } = require('../lib/prompts/promptUtils');

diff --git a/packages/cli/commands/customObject/schema/fetch.js b/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,

diff --git a/packages/cli/commands/customObject/schema/update.js b/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,

diff --git a/packages/cli/commands/project/deploy.js b/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/cli-lib/');
 
 const i18nKey = 'cli.commands.project.subcommands.deploy';
 const { EXIT_CODES } = require('../../lib/enums/exitCodes');

diff --git a/packages/cli/commands/project/dev.js b/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/local-dev-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,

diff --git a/packages/cli/commands/project/upload.js b/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,

diff --git a/packages/cli/commands/sandbox/create.js b/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 {

diff --git a/packages/cli/commands/sandbox/delete.js b/packages/cli/commands/sandbox/delete.js
@@ -18,9 +18,11 @@ 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/local-dev-lib/config');

diff --git a/packages/cli/commands/sandbox/sync.js b/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');

diff --git a/packages/cli/lib/__tests__/commonOpts.js b/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()', () => {

diff --git a/packages/cli/lib/__tests__/validation.js b/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');

diff --git a/packages/cli/lib/commonOpts.js b/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';

diff --git a/packages/cli/lib/prompts/projectDevTargetAccountPrompt.js b/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');
 

diff --git a/packages/cli/lib/sandbox-create.js b/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');
 

diff --git a/packages/cli/lib/sandbox-sync.js b/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';

diff --git a/packages/cli/lib/sandboxes.js b/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/local-dev-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');

diff --git a/packages/cli/lib/usageTracking.js b/packages/cli/lib/usageTracking.js
@@ -1,6 +1,8 @@
 const { trackUsage } = require('@hubspot/cli-lib/api/fileMapper');
-const { getAccountConfig } = require('@hubspot/cli-lib');
-const { isTrackingAllowed } = require('@hubspot/local-dev-lib/config');
+const {
+  isTrackingAllowed,
+  getAccountConfig,
+} = require('@hubspot/local-dev-lib/config');
 const { API_KEY_AUTH_METHOD } = require('@hubspot/cli-lib/lib/constants');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { version } = require('../package.json');

diff --git a/packages/cli/lib/validation.js b/packages/cli/lib/validation.js
@@ -1,19 +1,18 @@
 const { logger } = require('@hubspot/cli-lib/logger');
-const {
-  getAccountConfig,
-  loadConfigFromEnvironment,
-  Mode,
-  loadConfig,
-  getConfigPath,
-  validateConfig,
-  checkAndWarnGitInclusion,
-} = require('@hubspot/cli-lib');
+const { Mode, checkAndWarnGitInclusion } = require('@hubspot/cli-lib');
 const {
   API_KEY_AUTH_METHOD,
   OAUTH_AUTH_METHOD,
   PERSONAL_ACCESS_KEY_AUTH_METHOD,
 } = require('@hubspot/cli-lib/lib/constants');
 const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
+const {
+  loadConfig,
+  getConfigPath,
+  validateConfig,
+  getAccountConfig,
+  loadConfigFromEnvironment,
+} = require('@hubspot/local-dev-lib/config');
 const { getAbsoluteFilePath } = require('@hubspot/cli-lib/path');
 const { getOauthManager } = require('@hubspot/cli-lib/oauth');
 const {

diff --git a/packages/webpack-cms-plugins/HubSpotAutoUploadPlugin.js b/packages/webpack-cms-plugins/HubSpotAutoUploadPlugin.js
@@ -1,10 +1,10 @@
 const { upload } = require('@hubspot/cli-lib/api/fileMapper');
+const { checkAndWarnGitInclusion } = require('@hubspot/cli-lib');
 const {
   loadConfig,
   getConfigPath,
   getAccountId,
-  checkAndWarnGitInclusion,
-} = require('@hubspot/cli-lib');
+} = require('@hubspot/local-dev-lib/config');
 const { logger } = require('@hubspot/cli-lib/logger');
 const { isAllowedExtension } = require('@hubspot/cli-lib/path');
 const {