From e6e16eef5c5acc584791e054471065c6a40d105f Mon Sep 17 00:00:00 2001 From: Camden Phalen Date: Thu, 26 Oct 2023 16:11:42 -0400 Subject: [PATCH 1/6] switch out @hubspot/cli-lib/lib/config deps --- packages/cli/commands/accounts/clean.js | 2 +- packages/cli/commands/accounts/info.js | 2 +- packages/cli/commands/accounts/list.js | 2 +- packages/cli/commands/accounts/remove.js | 2 +- packages/cli/commands/accounts/rename.js | 2 +- packages/cli/commands/auth.js | 2 +- packages/cli/commands/config/set/allowUsageTracking.js | 2 +- packages/cli/commands/config/set/defaultMode.js | 2 +- packages/cli/commands/config/set/httpTimeout.js | 2 +- packages/cli/commands/init.js | 2 +- packages/cli/commands/project/add.js | 2 +- packages/cli/commands/project/dev.js | 2 +- packages/cli/commands/project/logs.js | 2 +- packages/cli/commands/sandbox/delete.js | 2 +- packages/cli/lib/LocalDevManager.js | 2 +- packages/cli/lib/errorHandlers/apiErrors.js | 2 +- packages/cli/lib/links.js | 2 +- packages/cli/lib/oauth.js | 2 +- packages/cli/lib/projects.js | 2 +- packages/cli/lib/prompts/accountsPrompt.js | 2 +- packages/cli/lib/prompts/downloadProjectPrompt.js | 2 +- packages/cli/lib/prompts/enterAccountNamePrompt.js | 2 +- packages/cli/lib/prompts/personalAccessKeyPrompt.js | 2 +- packages/cli/lib/prompts/sandboxesPrompt.js | 2 +- packages/cli/lib/prompts/setAsDefaultAccountPrompt.js | 2 +- packages/cli/lib/sandboxes.js | 2 +- packages/cli/lib/ui.js | 2 +- packages/cli/lib/usageTracking.js | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/cli/commands/accounts/clean.js b/packages/cli/commands/accounts/clean.js index 2a330370c..28f48077d 100644 --- a/packages/cli/commands/accounts/clean.js +++ b/packages/cli/commands/accounts/clean.js @@ -18,7 +18,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 { deleteAccount } = require('@hubspot/local-dev-lib/config'); const { isSpecifiedHubSpotAuthError, } = require('../../lib/errorHandlers/apiErrors'); diff --git a/packages/cli/commands/accounts/info.js b/packages/cli/commands/accounts/info.js index 97d0fd862..cf57bcc38 100644 --- a/packages/cli/commands/accounts/info.js +++ b/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, diff --git a/packages/cli/commands/accounts/list.js b/packages/cli/commands/accounts/list.js index 5e5a06ce5..53b756029 100644 --- a/packages/cli/commands/accounts/list.js +++ b/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, diff --git a/packages/cli/commands/accounts/remove.js b/packages/cli/commands/accounts/remove.js index 2ca1fec18..63e046ce8 100644 --- a/packages/cli/commands/accounts/remove.js +++ b/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'); diff --git a/packages/cli/commands/accounts/rename.js b/packages/cli/commands/accounts/rename.js index 053885b7f..796034190 100644 --- a/packages/cli/commands/accounts/rename.js +++ b/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, diff --git a/packages/cli/commands/auth.js b/packages/cli/commands/auth.js index c26b0cb0b..7462bc60f 100644 --- a/packages/cli/commands/auth.js +++ b/packages/cli/commands/auth.js @@ -15,7 +15,7 @@ const { writeConfig, getConfig, getConfigPath, -} = require('@hubspot/cli-lib/lib/config'); +} = require('@hubspot/local-dev-lib/config'); const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text'); const { promptUser } = require('../lib/prompts/promptUtils'); const { diff --git a/packages/cli/commands/config/set/allowUsageTracking.js b/packages/cli/commands/config/set/allowUsageTracking.js index 1d561e2fa..fab5a6a0d 100644 --- a/packages/cli/commands/config/set/allowUsageTracking.js +++ b/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'); diff --git a/packages/cli/commands/config/set/defaultMode.js b/packages/cli/commands/config/set/defaultMode.js index ebb1f6993..d23deca68 100644 --- a/packages/cli/commands/config/set/defaultMode.js +++ b/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'); diff --git a/packages/cli/commands/config/set/httpTimeout.js b/packages/cli/commands/config/set/httpTimeout.js index a992c8a8d..a482796f3 100644 --- a/packages/cli/commands/config/set/httpTimeout.js +++ b/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'); diff --git a/packages/cli/commands/init.js b/packages/cli/commands/init.js index 5fac1061e..247673dba 100644 --- a/packages/cli/commands/init.js +++ b/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'); diff --git a/packages/cli/commands/project/add.js b/packages/cli/commands/project/add.js index 43c6bc4fe..601873d43 100644 --- a/packages/cli/commands/project/add.js +++ b/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'); diff --git a/packages/cli/commands/project/dev.js b/packages/cli/commands/project/dev.js index 3bbe57e02..032c0b22e 100644 --- a/packages/cli/commands/project/dev.js +++ b/packages/cli/commands/project/dev.js @@ -13,7 +13,7 @@ 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 } = require('@hubspot/local-dev-lib/config'); const { createProject, fetchProject } = require('@hubspot/cli-lib/api/dfs'); const { getProjectConfig, diff --git a/packages/cli/commands/project/logs.js b/packages/cli/commands/project/logs.js index 59099b0e4..6b8688fe7 100644 --- a/packages/cli/commands/project/logs.js +++ b/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 { diff --git a/packages/cli/commands/sandbox/delete.js b/packages/cli/commands/sandbox/delete.js index a447ef234..db638ab97 100644 --- a/packages/cli/commands/sandbox/delete.js +++ b/packages/cli/commands/sandbox/delete.js @@ -23,7 +23,7 @@ const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt'); const { removeSandboxAccountFromConfig, updateDefaultAccount, -} = require('@hubspot/cli-lib/lib/config'); +} = require('@hubspot/local-dev-lib/config'); const { selectAndSetAsDefaultAccountPrompt, } = require('../../lib/prompts/accountsPrompt'); diff --git a/packages/cli/lib/LocalDevManager.js b/packages/cli/lib/LocalDevManager.js index dfba0c045..010bf0056 100644 --- a/packages/cli/lib/LocalDevManager.js +++ b/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'); diff --git a/packages/cli/lib/errorHandlers/apiErrors.js b/packages/cli/lib/errorHandlers/apiErrors.js index 509221064..3b87e95d6 100644 --- a/packages/cli/lib/errorHandlers/apiErrors.js +++ b/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, diff --git a/packages/cli/lib/links.js b/packages/cli/lib/links.js index 1d9a67cca..1ccff9317 100644 --- a/packages/cli/lib/links.js +++ b/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'); diff --git a/packages/cli/lib/oauth.js b/packages/cli/lib/oauth.js index ead2199cd..52023314b 100644 --- a/packages/cli/lib/oauth.js +++ b/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'); diff --git a/packages/cli/lib/projects.js b/packages/cli/lib/projects.js index 1f29746bb..fd9c816e0 100644 --- a/packages/cli/lib/projects.js +++ b/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, diff --git a/packages/cli/lib/prompts/accountsPrompt.js b/packages/cli/lib/prompts/accountsPrompt.js index a78809b9d..55d99d863 100644 --- a/packages/cli/lib/prompts/accountsPrompt.js +++ b/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'); diff --git a/packages/cli/lib/prompts/downloadProjectPrompt.js b/packages/cli/lib/prompts/downloadProjectPrompt.js index 9f3a19990..78fdfa677 100644 --- a/packages/cli/lib/prompts/downloadProjectPrompt.js +++ b/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, diff --git a/packages/cli/lib/prompts/enterAccountNamePrompt.js b/packages/cli/lib/prompts/enterAccountNamePrompt.js index 0c90b53d2..cc76d9786 100644 --- a/packages/cli/lib/prompts/enterAccountNamePrompt.js +++ b/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'); diff --git a/packages/cli/lib/prompts/personalAccessKeyPrompt.js b/packages/cli/lib/prompts/personalAccessKeyPrompt.js index e01807a37..8a81af1b5 100644 --- a/packages/cli/lib/prompts/personalAccessKeyPrompt.js +++ b/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'); diff --git a/packages/cli/lib/prompts/sandboxesPrompt.js b/packages/cli/lib/prompts/sandboxesPrompt.js index fd817186a..1c54d1c7c 100644 --- a/packages/cli/lib/prompts/sandboxesPrompt.js +++ b/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'; diff --git a/packages/cli/lib/prompts/setAsDefaultAccountPrompt.js b/packages/cli/lib/prompts/setAsDefaultAccountPrompt.js index d124ed592..a72484ff5 100644 --- a/packages/cli/lib/prompts/setAsDefaultAccountPrompt.js +++ b/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'); diff --git a/packages/cli/lib/sandboxes.js b/packages/cli/lib/sandboxes.js index d44df08eb..e9ffd613e 100644 --- a/packages/cli/lib/sandboxes.js +++ b/packages/cli/lib/sandboxes.js @@ -18,7 +18,7 @@ const { fetchTypes, getSandboxUsageLimits, } = require('@hubspot/cli-lib/sandboxes'); -const { accountNameExistsInConfig } = require('@hubspot/cli-lib/lib/config'); +const { accountNameExistsInConfig } = 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/ui.js b/packages/cli/lib/ui.js index 5b371ba24..420a44ce3 100644 --- a/packages/cli/lib/ui.js +++ b/packages/cli/lib/ui.js @@ -1,7 +1,7 @@ const chalk = require('chalk'); const supportsHyperlinks = require('../lib/supportHyperlinks'); const supportsColor = require('../lib/supportsColor'); -const { getAccountConfig } = require('@hubspot/cli-lib/lib/config'); +const { getAccountConfig } = require('@hubspot/local-dev-lib/config'); const { i18n } = require('./lang'); const { logger } = require('@hubspot/cli-lib/logger'); diff --git a/packages/cli/lib/usageTracking.js b/packages/cli/lib/usageTracking.js index e5ce0217f..607978e29 100644 --- a/packages/cli/lib/usageTracking.js +++ b/packages/cli/lib/usageTracking.js @@ -1,6 +1,6 @@ const { trackUsage } = require('@hubspot/cli-lib/api/fileMapper'); const { getAccountConfig } = require('@hubspot/cli-lib'); -const { isTrackingAllowed } = require('@hubspot/cli-lib/lib/config'); +const { isTrackingAllowed } = 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'); From cef5f2400d6004be654ec8797722b7fb26af006c Mon Sep 17 00:00:00 2001 From: Camden Phalen Date: Thu, 26 Oct 2023 16:35:01 -0400 Subject: [PATCH 2/6] replace config imports from cli-lib root --- packages/cli/commands/accounts/clean.js | 3 +-- packages/cli/commands/auth.js | 3 ++- .../cli/commands/customObject/schema/fetch.js | 2 +- .../cli/commands/customObject/schema/update.js | 5 ++++- packages/cli/commands/project/deploy.js | 2 +- packages/cli/commands/project/dev.js | 7 +++++-- packages/cli/commands/project/upload.js | 2 +- packages/cli/commands/sandbox/create.js | 2 +- packages/cli/commands/sandbox/delete.js | 4 +++- packages/cli/commands/sandbox/sync.js | 2 +- packages/cli/lib/__tests__/commonOpts.js | 6 +++--- packages/cli/lib/__tests__/validation.js | 3 ++- packages/cli/lib/commonOpts.js | 5 ++--- .../prompts/projectDevTargetAccountPrompt.js | 2 +- packages/cli/lib/sandbox-create.js | 2 +- packages/cli/lib/sandbox-sync.js | 2 +- packages/cli/lib/sandboxes.js | 14 +++++++------- packages/cli/lib/usageTracking.js | 6 ++++-- packages/cli/lib/validation.js | 17 ++++++++--------- .../HubSpotAutoUploadPlugin.js | 4 ++-- 20 files changed, 51 insertions(+), 42 deletions(-) diff --git a/packages/cli/commands/accounts/clean.js b/packages/cli/commands/accounts/clean.js index 28f48077d..5f90db847 100644 --- 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 index 7462bc60f..edf302c76 100644 --- 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 index 431587ae4..bb18e30a2 100644 --- 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 index 8608826f9..2024bc782 100644 --- 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 index a785d031e..02693e8b6 100644 --- 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 index 032c0b22e..ff638939d 100644 --- 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 index 7973218c4..3260ba7a6 100644 --- 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 index 7ba0bf1cc..6f820e565 100644 --- 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 index db638ab97..034700467 100644 --- 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 index 3b6a3a826..217640a85 100644 --- 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 index 126dfe4a4..e91d1c681 100644 --- 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 index 65509f5db..799b20ae7 100644 --- 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 index 1cf29c72d..d0e9edca2 100644 --- 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 index a2a3b18bd..451695fbe 100644 --- 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 index ffc82c6c4..db2ccdc54 100644 --- 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 index 384cda83f..1c75bbf1d 100644 --- 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 index e9ffd613e..41f1633d4 100644 --- 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 index 607978e29..3aeba6080 100644 --- 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 index 048ff9cab..22962abe7 100644 --- 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 index 1afdc4a60..c9629fb36 100644 --- 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 { From 194af2442bebf9a7128324128b8f3bf1214d5a41 Mon Sep 17 00:00:00 2001 From: Camden Phalen Date: Thu, 26 Oct 2023 16:53:52 -0400 Subject: [PATCH 3/6] Add local-dev-lib dep to cms plugins --- packages/webpack-cms-plugins/package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/webpack-cms-plugins/package.json b/packages/webpack-cms-plugins/package.json index e2b5609ba..be13d715d 100644 --- a/packages/webpack-cms-plugins/package.json +++ b/packages/webpack-cms-plugins/package.json @@ -17,7 +17,8 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "dependencies": { - "@hubspot/cli-lib": "^4.2.2" + "@hubspot/cli-lib": "^4.2.2", + "@hubspot/local-dev-lib": "^0.0.7" }, "gitHead": "0659fd19cabc3645af431b177c11d0c1b089e0f8" } From c22a12e643b6af683dab0657fd61b43f55dafdd1 Mon Sep 17 00:00:00 2001 From: Camden Phalen Date: Wed, 1 Nov 2023 11:48:19 -0400 Subject: [PATCH 4/6] Bump cli-lib dep --- packages/cli/package.json | 2 +- packages/serverless-dev-runtime/package.json | 2 +- packages/webpack-cms-plugins/package.json | 2 +- yarn.lock | 15 ++++++++------- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index cc6995da7..4193e90d5 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -8,7 +8,7 @@ "url": "https://github.com/HubSpot/hubspot-cms-tools" }, "dependencies": { - "@hubspot/cli-lib": "^5.0.1", + "@hubspot/cli-lib": "^6.0.0", "@hubspot/local-dev-lib": "^0.0.7", "@hubspot/serverless-dev-runtime": "4.2.1-beta.3", "@hubspot/ui-extensions-dev-server": "^0.8.0", diff --git a/packages/serverless-dev-runtime/package.json b/packages/serverless-dev-runtime/package.json index b7cf9d045..e25372a54 100644 --- a/packages/serverless-dev-runtime/package.json +++ b/packages/serverless-dev-runtime/package.json @@ -6,7 +6,7 @@ "repository": "https://github.com/HubSpot/hubspot-cli", "license": "Apache-2.0", "dependencies": { - "@hubspot/cli-lib": "^4.2.2", + "@hubspot/cli-lib": "^6.0.0", "@hubspot/local-dev-lib": "^0.0.7", "body-parser": "^1.19.0", "chalk": "^4.1.0", diff --git a/packages/webpack-cms-plugins/package.json b/packages/webpack-cms-plugins/package.json index be13d715d..a0c04c43a 100644 --- a/packages/webpack-cms-plugins/package.json +++ b/packages/webpack-cms-plugins/package.json @@ -17,7 +17,7 @@ "test": "echo \"Error: run tests from root\" && exit 1" }, "dependencies": { - "@hubspot/cli-lib": "^4.2.2", + "@hubspot/cli-lib": "^6.0.0", "@hubspot/local-dev-lib": "^0.0.7" }, "gitHead": "0659fd19cabc3645af431b177c11d0c1b089e0f8" diff --git a/yarn.lock b/yarn.lock index 8e0511ee5..f6299ea14 100644 --- a/yarn.lock +++ b/yarn.lock @@ -505,7 +505,7 @@ dotenv "^16.3.1" express "^4.18.2" -"@hubspot/cli-lib@^4.1.6", "@hubspot/cli-lib@^4.2.2": +"@hubspot/cli-lib@^4.1.6": version "4.2.2" resolved "https://registry.yarnpkg.com/@hubspot/cli-lib/-/cli-lib-4.2.2.tgz#3c5483d3f38c09c4a84371dd81320a81f52565a0" integrity sha512-LVgHk5KfjzCBTz1QubW3GJ/axJ7odQI6xsqfUAsa3s05i8dDaOBdKTp8aNFkdfC3VbCchnvP5ofPThJ0rjxnyw== @@ -529,11 +529,12 @@ table "^6.6.0" unixify "1.0.0" -"@hubspot/cli-lib@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@hubspot/cli-lib/-/cli-lib-5.0.1.tgz#2f87101fb26007f5ed659320b68a076293c43da4" - integrity sha512-Zb7cuy/gBsNDzw7ift3KPAXh1OSMYfw0t+C4HBrPyZpebhY0Zvj28YJZxZz2j8ZzQu+c/XsANQUwkEBu6qDuKw== +"@hubspot/cli-lib@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@hubspot/cli-lib/-/cli-lib-6.0.0.tgz#835c8666a25aed0703a5546a023f4b19469729db" + integrity sha512-BNafBv9z0pJAw7p+z7acXtFH3p1godVNPQE28hItxe+YmVFsboAWpAE+ONBfbBOe+PHqE1+MIUw0bIuWVxnepQ== dependencies: + "@hubspot/local-dev-lib" "0.0.7" chalk "^2.4.2" chokidar "^3.0.1" content-disposition "^0.5.3" @@ -542,7 +543,7 @@ findup-sync "^3.0.0" fs-extra "^8.1.0" ignore "^5.1.4" - jest "^26.6.3" + jest "^28.1.3" js-yaml "^4.1.0" moment "^2.24.0" p-queue "^6.0.2" @@ -553,7 +554,7 @@ table "^6.6.0" unixify "1.0.0" -"@hubspot/local-dev-lib@^0.0.7": +"@hubspot/local-dev-lib@0.0.7", "@hubspot/local-dev-lib@^0.0.7": version "0.0.7" resolved "https://registry.yarnpkg.com/@hubspot/local-dev-lib/-/local-dev-lib-0.0.7.tgz#039d27dcbac71132dea7dd379b3245a7c5ace1b1" integrity sha512-wKWK3aT1yX54Q40ow+IvXUVY7yworav+fjFURSFFkqND2EvlijuCeeGObgx4xfYZRjYa+Sv56Sn6mFKZjdgQSQ== From f9af5935714d482942423ab819ec04e892251832 Mon Sep 17 00:00:00 2001 From: Camden Phalen Date: Wed, 1 Nov 2023 12:26:53 -0400 Subject: [PATCH 5/6] Remove remaining cli-lib import --- packages/cli/commands/project/deploy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cli/commands/project/deploy.js b/packages/cli/commands/project/deploy.js index 02693e8b6..cec73bf8a 100644 --- 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/local-dev-lib'); const i18nKey = 'cli.commands.project.subcommands.deploy'; const { EXIT_CODES } = require('../../lib/enums/exitCodes'); From 623601e90694d84fc844b22249a9c8f24a7f94e4 Mon Sep 17 00:00:00 2001 From: Camden Phalen Date: Wed, 1 Nov 2023 13:35:27 -0400 Subject: [PATCH 6/6] Remove more cli-lib deps --- packages/cli/commands/customObject/schema/create.js | 5 ++++- packages/cli/commands/project/deploy.js | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/cli/commands/customObject/schema/create.js b/packages/cli/commands/customObject/schema/create.js index 83c505eb5..87dfb2fcf 100644 --- a/packages/cli/commands/customObject/schema/create.js +++ b/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 { diff --git a/packages/cli/commands/project/deploy.js b/packages/cli/commands/project/deploy.js index cec73bf8a..b8a1db658 100644 --- 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/local-dev-lib'); +const { getAccountConfig } = require('@hubspot/local-dev-lib/config'); const i18nKey = 'cli.commands.project.subcommands.deploy'; const { EXIT_CODES } = require('../../lib/enums/exitCodes');