@hubspot/cli 5.0.2-beta.1 → 5.0.3-beta.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/cli.js +1 -1
- package/commands/accounts/clean.js +2 -3
- package/commands/accounts/info.js +1 -1
- package/commands/accounts/list.js +1 -1
- package/commands/accounts/remove.js +1 -1
- package/commands/accounts/rename.js +1 -1
- package/commands/auth.js +4 -3
- package/commands/cms/convertFields.js +1 -1
- package/commands/config/set/allowUsageTracking.js +1 -1
- package/commands/config/set/defaultMode.js +2 -2
- package/commands/config/set/httpTimeout.js +1 -1
- package/commands/create.js +1 -1
- package/commands/customObject/create.js +1 -1
- package/commands/customObject/schema/create.js +7 -2
- package/commands/customObject/schema/delete.js +3 -1
- package/commands/customObject/schema/fetch-all.js +3 -1
- package/commands/customObject/schema/fetch.js +4 -2
- package/commands/customObject/schema/list.js +3 -1
- package/commands/customObject/schema/update.js +7 -2
- package/commands/filemanager/upload.js +3 -3
- package/commands/functions/deploy.js +1 -1
- package/commands/functions/list.js +1 -1
- package/commands/hubdb/clear.js +1 -1
- package/commands/hubdb/create.js +1 -1
- package/commands/hubdb/delete.js +1 -1
- package/commands/hubdb/fetch.js +1 -1
- package/commands/init.js +2 -2
- package/commands/lint.js +2 -2
- package/commands/list.js +1 -1
- package/commands/mv.js +1 -1
- package/commands/project/add.js +2 -2
- package/commands/project/create.js +1 -0
- package/commands/project/deploy.js +2 -2
- package/commands/project/dev.js +15 -10
- package/commands/project/download.js +1 -1
- package/commands/project/listBuilds.js +1 -1
- package/commands/project/logs.js +2 -2
- package/commands/project/upload.js +3 -5
- package/commands/project/watch.js +1 -1
- package/commands/remove.js +1 -1
- package/commands/sandbox/create.js +4 -6
- package/commands/sandbox/delete.js +12 -9
- package/commands/sandbox/sync.js +4 -8
- package/commands/secrets/addSecret.js +1 -1
- package/commands/secrets/deleteSecret.js +1 -1
- package/commands/secrets/listSecrets.js +1 -1
- package/commands/secrets/updateSecret.js +1 -1
- package/commands/upload.js +3 -3
- package/lang/en.lyaml +39 -0
- package/lib/DevServerManager.js +14 -0
- package/lib/LocalDevManager.js +17 -12
- package/lib/__tests__/commonOpts.js +3 -3
- package/lib/__tests__/projects.test.js +144 -0
- package/lib/__tests__/validation.js +2 -1
- package/lib/commonOpts.js +2 -3
- package/lib/errorHandlers/apiErrors.js +352 -0
- package/lib/errorHandlers/fileSystemErrors.js +55 -0
- package/lib/errorHandlers/standardErrors.js +95 -0
- package/lib/links.js +1 -1
- package/lib/oauth.js +1 -1
- package/lib/process.js +24 -6
- package/lib/projects.js +24 -11
- package/lib/projectsWatch.js +2 -2
- package/lib/prompts/accountsPrompt.js +1 -1
- package/lib/prompts/downloadProjectPrompt.js +2 -2
- package/lib/prompts/enterAccountNamePrompt.js +1 -1
- package/lib/prompts/personalAccessKeyPrompt.js +1 -1
- package/lib/prompts/projectDevTargetAccountPrompt.js +1 -1
- package/lib/prompts/projectsLogsPrompt.js +1 -1
- package/lib/prompts/sandboxesPrompt.js +1 -1
- package/lib/prompts/setAsDefaultAccountPrompt.js +1 -1
- package/lib/sandbox-create.js +4 -4
- package/lib/sandbox-sync.js +6 -6
- package/lib/sandboxes.js +7 -7
- package/lib/serverlessLogs.js +1 -1
- package/lib/ui.js +2 -1
- package/lib/upload.js +1 -1
- package/lib/usageTracking.js +4 -2
- package/lib/validation.js +9 -10
- package/package.json +5 -4
package/bin/cli.js
CHANGED
|
@@ -5,7 +5,7 @@ const updateNotifier = require('update-notifier');
|
|
|
5
5
|
const chalk = require('chalk');
|
|
6
6
|
|
|
7
7
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
8
|
-
const { logErrorInstance } = require('
|
|
8
|
+
const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
|
|
9
9
|
const { setLogLevel, getCommandName } = require('../lib/commonOpts');
|
|
10
10
|
const {
|
|
11
11
|
trackHelpUsage,
|
|
@@ -2,7 +2,6 @@ const { logger } = require('@hubspot/cli-lib/logger');
|
|
|
2
2
|
const {
|
|
3
3
|
accessTokenForPersonalAccessKey,
|
|
4
4
|
} = require('@hubspot/cli-lib/personalAccessKey');
|
|
5
|
-
const { getConfig } = require('@hubspot/cli-lib');
|
|
6
5
|
|
|
7
6
|
const { trackCommandUsage } = require('../../lib/usageTracking');
|
|
8
7
|
const { i18n } = require('../../lib/lang');
|
|
@@ -18,10 +17,10 @@ const { getAccountName } = require('../../lib/sandboxes');
|
|
|
18
17
|
const { promptUser } = require('../../lib/prompts/promptUtils');
|
|
19
18
|
const { getTableContents } = require('@hubspot/cli-lib/lib/table');
|
|
20
19
|
const SpinniesManager = require('../../lib/SpinniesManager');
|
|
21
|
-
const { deleteAccount } = require('@hubspot/
|
|
20
|
+
const { getConfig, deleteAccount } = require('@hubspot/local-dev-lib/config');
|
|
22
21
|
const {
|
|
23
22
|
isSpecifiedHubSpotAuthError,
|
|
24
|
-
} = require('
|
|
23
|
+
} = require('../../lib/errorHandlers/apiErrors');
|
|
25
24
|
|
|
26
25
|
const i18nKey = 'cli.commands.accounts.subcommands.clean';
|
|
27
26
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const { getAccountConfig } = require('@hubspot/
|
|
2
|
+
const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
|
|
3
3
|
const { getAccessToken } = require('@hubspot/cli-lib/personalAccessKey.js');
|
|
4
4
|
const {
|
|
5
5
|
getAccountId,
|
|
@@ -6,7 +6,7 @@ const {
|
|
|
6
6
|
getConfigDefaultAccount,
|
|
7
7
|
getAccountId: getAccountIdFromConfig,
|
|
8
8
|
updateDefaultAccount,
|
|
9
|
-
} = require('@hubspot/
|
|
9
|
+
} = require('@hubspot/local-dev-lib/config');
|
|
10
10
|
|
|
11
11
|
const { trackCommandUsage } = require('../../lib/usageTracking');
|
|
12
12
|
const { i18n } = require('../../lib/lang');
|
package/commands/auth.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const {
|
|
1
|
+
const { checkAndWarnGitInclusion } = require('@hubspot/cli-lib');
|
|
2
2
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
3
3
|
const {
|
|
4
4
|
OAUTH_AUTH_METHOD,
|
|
@@ -15,8 +15,9 @@ const {
|
|
|
15
15
|
writeConfig,
|
|
16
16
|
getConfig,
|
|
17
17
|
getConfigPath,
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
loadConfig,
|
|
19
|
+
} = require('@hubspot/local-dev-lib/config');
|
|
20
|
+
const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
|
|
20
21
|
const { promptUser } = require('../lib/prompts/promptUtils');
|
|
21
22
|
const {
|
|
22
23
|
personalAccessKeyPrompt,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const path = require('path');
|
|
2
2
|
const fs = require('fs');
|
|
3
|
-
const { createIgnoreFilter } = require('@hubspot/
|
|
3
|
+
const { createIgnoreFilter } = require('@hubspot/local-dev-lib/ignoreRules');
|
|
4
4
|
const { isAllowedExtension, getCwd } = require('@hubspot/cli-lib/path');
|
|
5
5
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
6
6
|
const { walk } = require('@hubspot/cli-lib/lib/walk');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const { updateAllowUsageTracking } = require('@hubspot/
|
|
2
|
+
const { updateAllowUsageTracking } = require('@hubspot/local-dev-lib/config');
|
|
3
3
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
4
4
|
const { promptUser } = require('../../../lib/prompts/promptUtils');
|
|
5
5
|
const { i18n } = require('../../../lib/lang');
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const { updateDefaultMode } = require('@hubspot/
|
|
2
|
+
const { updateDefaultMode } = require('@hubspot/local-dev-lib/config');
|
|
3
3
|
const { Mode } = require('@hubspot/cli-lib');
|
|
4
|
-
const { commaSeparatedValues } = require('@hubspot/
|
|
4
|
+
const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
|
|
5
5
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
6
6
|
const { promptUser } = require('../../../lib/prompts/promptUtils');
|
|
7
7
|
const { i18n } = require('../../../lib/lang');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const { updateHttpTimeout } = require('@hubspot/
|
|
2
|
+
const { updateHttpTimeout } = require('@hubspot/local-dev-lib/config');
|
|
3
3
|
const { promptUser } = require('../../../lib/prompts/promptUtils');
|
|
4
4
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
5
5
|
const { i18n } = require('../../../lib/lang');
|
package/commands/create.js
CHANGED
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
const fs = require('fs-extra');
|
|
25
25
|
const {
|
|
26
26
|
logFileSystemErrorInstance,
|
|
27
|
-
} = require('
|
|
27
|
+
} = require('../lib/errorHandlers/fileSystemErrors');
|
|
28
28
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
29
29
|
const { setLogLevel, getAccountId } = require('../lib/commonOpts');
|
|
30
30
|
const { logDebugInfo } = require('../lib/debugInfo');
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const { logErrorInstance } = require('
|
|
2
|
+
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
3
3
|
const { getAbsoluteFilePath } = require('@hubspot/cli-lib/path');
|
|
4
4
|
const {
|
|
5
5
|
isFileValidJSON,
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const {
|
|
2
|
+
const {
|
|
3
|
+
logErrorInstance,
|
|
4
|
+
} = require('../../../lib/errorHandlers/standardErrors');
|
|
3
5
|
const { getAbsoluteFilePath } = require('@hubspot/cli-lib/path');
|
|
4
6
|
const {
|
|
5
7
|
isFileValidJSON,
|
|
@@ -7,7 +9,10 @@ const {
|
|
|
7
9
|
} = require('../../../lib/validation');
|
|
8
10
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
9
11
|
const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
|
|
10
|
-
const {
|
|
12
|
+
const {
|
|
13
|
+
getEnv,
|
|
14
|
+
isConfigFlagEnabled,
|
|
15
|
+
} = require('@hubspot/local-dev-lib/config');
|
|
11
16
|
const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
|
|
12
17
|
const { createSchema } = require('@hubspot/cli-lib/api/schema');
|
|
13
18
|
const {
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const {
|
|
2
|
+
const {
|
|
3
|
+
logErrorInstance,
|
|
4
|
+
} = require('../../../lib/errorHandlers/standardErrors');
|
|
3
5
|
|
|
4
6
|
const { loadAndValidateOptions } = require('../../../lib/validation');
|
|
5
7
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const {
|
|
2
|
+
const {
|
|
3
|
+
logErrorInstance,
|
|
4
|
+
} = require('../../../lib/errorHandlers/standardErrors');
|
|
3
5
|
|
|
4
6
|
const { loadAndValidateOptions } = require('../../../lib/validation');
|
|
5
7
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
const path = require('path');
|
|
2
|
-
const { isConfigFlagEnabled } = require('@hubspot/
|
|
2
|
+
const { isConfigFlagEnabled } = require('@hubspot/local-dev-lib/config');
|
|
3
3
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
4
|
-
const {
|
|
4
|
+
const {
|
|
5
|
+
logErrorInstance,
|
|
6
|
+
} = require('../../../lib/errorHandlers/standardErrors');
|
|
5
7
|
const { ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
|
|
6
8
|
const { downloadSchema, getResolvedPath } = require('@hubspot/cli-lib/schema');
|
|
7
9
|
const { fetchSchema } = require('@hubspot/cli-lib/api/fileTransport');
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const {
|
|
2
|
+
const {
|
|
3
|
+
logErrorInstance,
|
|
4
|
+
} = require('../../../lib/errorHandlers/standardErrors');
|
|
3
5
|
|
|
4
6
|
const { loadAndValidateOptions } = require('../../../lib/validation');
|
|
5
7
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const {
|
|
2
|
+
const {
|
|
3
|
+
logErrorInstance,
|
|
4
|
+
} = require('../../../lib/errorHandlers/standardErrors');
|
|
3
5
|
const { getAbsoluteFilePath } = require('@hubspot/cli-lib/path');
|
|
4
6
|
const {
|
|
5
7
|
isFileValidJSON,
|
|
@@ -8,7 +10,10 @@ const {
|
|
|
8
10
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
9
11
|
const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
|
|
10
12
|
const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
|
|
11
|
-
const {
|
|
13
|
+
const {
|
|
14
|
+
getEnv,
|
|
15
|
+
isConfigFlagEnabled,
|
|
16
|
+
} = require('@hubspot/local-dev-lib/config');
|
|
12
17
|
const { updateSchema } = require('@hubspot/cli-lib/api/schema');
|
|
13
18
|
const {
|
|
14
19
|
updateSchema: updateSchemaFromHubFile,
|
|
@@ -6,12 +6,12 @@ const { uploadFile } = require('@hubspot/cli-lib/api/fileManager');
|
|
|
6
6
|
const { getCwd, convertToUnixPath } = require('@hubspot/cli-lib/path');
|
|
7
7
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
8
8
|
const {
|
|
9
|
-
logErrorInstance,
|
|
10
9
|
ApiErrorContext,
|
|
11
10
|
logApiUploadErrorInstance,
|
|
12
|
-
} = require('
|
|
11
|
+
} = require('../../lib/errorHandlers/apiErrors');
|
|
12
|
+
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
13
13
|
const { validateSrcAndDestPaths } = require('@hubspot/cli-lib/modules');
|
|
14
|
-
const { shouldIgnoreFile } = require('@hubspot/
|
|
14
|
+
const { shouldIgnoreFile } = require('@hubspot/local-dev-lib/ignoreRules');
|
|
15
15
|
|
|
16
16
|
const {
|
|
17
17
|
addConfigOptions,
|
|
@@ -9,7 +9,7 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
|
|
|
9
9
|
const {
|
|
10
10
|
logApiErrorInstance,
|
|
11
11
|
ApiErrorContext,
|
|
12
|
-
} = require('
|
|
12
|
+
} = require('../../lib/errorHandlers/apiErrors');
|
|
13
13
|
const { POLLING_DELAY } = require('@hubspot/cli-lib/lib/constants');
|
|
14
14
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
15
15
|
const {
|
|
@@ -3,7 +3,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
|
|
|
3
3
|
const {
|
|
4
4
|
logApiErrorInstance,
|
|
5
5
|
ApiErrorContext,
|
|
6
|
-
} = require('
|
|
6
|
+
} = require('../../lib/errorHandlers/apiErrors');
|
|
7
7
|
const { getFunctionArrays } = require('../../lib/getFunctionArrays');
|
|
8
8
|
const {
|
|
9
9
|
getTableContents,
|
package/commands/hubdb/clear.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const { logErrorInstance } = require('
|
|
2
|
+
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
3
3
|
const { clearHubDbTableRows } = require('@hubspot/cli-lib/hubdb');
|
|
4
4
|
const { publishTable } = require('@hubspot/cli-lib/api/hubdb');
|
|
5
5
|
|
package/commands/hubdb/create.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
const path = require('path');
|
|
2
2
|
|
|
3
3
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
4
|
-
const { logErrorInstance } = require('
|
|
4
|
+
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
5
5
|
const { getCwd } = require('@hubspot/cli-lib/path');
|
|
6
6
|
const { createHubDbTable } = require('@hubspot/cli-lib/hubdb');
|
|
7
7
|
|
package/commands/hubdb/delete.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const { logErrorInstance } = require('
|
|
2
|
+
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
3
3
|
const { deleteTable } = require('@hubspot/cli-lib/api/hubdb');
|
|
4
4
|
const { loadAndValidateOptions } = require('../../lib/validation');
|
|
5
5
|
const { trackCommandUsage } = require('../../lib/usageTracking');
|
package/commands/hubdb/fetch.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const { logErrorInstance } = require('
|
|
2
|
+
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
3
3
|
const { downloadHubDbTable } = require('@hubspot/cli-lib/hubdb');
|
|
4
4
|
|
|
5
5
|
const { loadAndValidateOptions } = require('../../lib/validation');
|
package/commands/init.js
CHANGED
|
@@ -5,11 +5,11 @@ const {
|
|
|
5
5
|
createEmptyConfigFile,
|
|
6
6
|
deleteEmptyConfigFile,
|
|
7
7
|
updateDefaultAccount,
|
|
8
|
-
} = require('@hubspot/
|
|
8
|
+
} = require('@hubspot/local-dev-lib/config');
|
|
9
9
|
const { addConfigOptions } = require('../lib/commonOpts');
|
|
10
10
|
const { handleExit } = require('../lib/process');
|
|
11
11
|
const { checkAndUpdateGitignore } = require('@hubspot/cli-lib/lib/git');
|
|
12
|
-
const { logErrorInstance } = require('
|
|
12
|
+
const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
|
|
13
13
|
const {
|
|
14
14
|
DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
|
|
15
15
|
PERSONAL_ACCESS_KEY_AUTH_METHOD,
|
package/commands/lint.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
const { lint } = require('@hubspot/
|
|
1
|
+
const { lint } = require('@hubspot/local-dev-lib/validate');
|
|
2
2
|
const { printHublValidationResult } = require('../lib/hublValidate');
|
|
3
3
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
4
|
-
const { logErrorInstance } = require('
|
|
4
|
+
const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
|
|
5
5
|
|
|
6
6
|
const {
|
|
7
7
|
addConfigOptions,
|
package/commands/list.js
CHANGED
|
@@ -12,7 +12,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
|
|
|
12
12
|
const {
|
|
13
13
|
logApiErrorInstance,
|
|
14
14
|
ApiErrorContext,
|
|
15
|
-
} = require('
|
|
15
|
+
} = require('../lib/errorHandlers/apiErrors');
|
|
16
16
|
const {
|
|
17
17
|
getDirectoryContentsByPath,
|
|
18
18
|
} = require('@hubspot/cli-lib/api/fileMapper');
|
package/commands/mv.js
CHANGED
package/commands/project/add.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const { getAccountId } = require('@hubspot/
|
|
3
|
-
const { logErrorInstance } = require('
|
|
2
|
+
const { getAccountId } = require('@hubspot/local-dev-lib/config');
|
|
3
|
+
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
4
4
|
const { fetchReleaseData } = require('@hubspot/cli-lib/github');
|
|
5
5
|
|
|
6
6
|
const { trackCommandUsage } = require('../../lib/usageTracking');
|
|
@@ -9,7 +9,7 @@ const { trackCommandUsage } = require('../../lib/usageTracking');
|
|
|
9
9
|
const {
|
|
10
10
|
logApiErrorInstance,
|
|
11
11
|
ApiErrorContext,
|
|
12
|
-
} = require('
|
|
12
|
+
} = require('../../lib/errorHandlers/apiErrors');
|
|
13
13
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
14
14
|
const { deployProject, fetchProject } = require('@hubspot/cli-lib/api/dfs');
|
|
15
15
|
const { loadAndValidateOptions } = require('../../lib/validation');
|
|
@@ -18,7 +18,7 @@ const { projectNamePrompt } = require('../../lib/prompts/projectNamePrompt');
|
|
|
18
18
|
const { buildIdPrompt } = require('../../lib/prompts/buildIdPrompt');
|
|
19
19
|
const { i18n } = require('../../lib/lang');
|
|
20
20
|
const { uiBetaTag } = require('../../lib/ui');
|
|
21
|
-
const { getAccountConfig } = require('@hubspot/
|
|
21
|
+
const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
|
|
22
22
|
|
|
23
23
|
const i18nKey = 'cli.commands.project.subcommands.deploy';
|
|
24
24
|
const { EXIT_CODES } = require('../../lib/enums/exitCodes');
|
package/commands/project/dev.js
CHANGED
|
@@ -13,7 +13,11 @@ const { loadAndValidateOptions } = require('../../lib/validation');
|
|
|
13
13
|
const { handleExit } = require('../../lib/process');
|
|
14
14
|
const { i18n } = require('../../lib/lang');
|
|
15
15
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
16
|
-
const {
|
|
16
|
+
const {
|
|
17
|
+
getConfigAccounts,
|
|
18
|
+
getAccountConfig,
|
|
19
|
+
getEnv,
|
|
20
|
+
} = require('@hubspot/local-dev-lib/config');
|
|
17
21
|
const { createProject, fetchProject } = require('@hubspot/cli-lib/api/dfs');
|
|
18
22
|
const {
|
|
19
23
|
getProjectConfig,
|
|
@@ -21,6 +25,7 @@ const {
|
|
|
21
25
|
handleProjectUpload,
|
|
22
26
|
pollProjectBuildAndDeploy,
|
|
23
27
|
showPlatformVersionWarning,
|
|
28
|
+
validateProjectConfig,
|
|
24
29
|
} = require('../../lib/projects');
|
|
25
30
|
const { EXIT_CODES } = require('../../lib/enums/exitCodes');
|
|
26
31
|
const {
|
|
@@ -37,31 +42,29 @@ const {
|
|
|
37
42
|
const SpinniesManager = require('../../lib/SpinniesManager');
|
|
38
43
|
const LocalDevManager = require('../../lib/LocalDevManager');
|
|
39
44
|
const { isSandbox } = require('../../lib/sandboxes');
|
|
40
|
-
const { getAccountConfig, getEnv } = require('@hubspot/cli-lib');
|
|
41
45
|
const { sandboxNamePrompt } = require('../../lib/prompts/sandboxesPrompt');
|
|
42
46
|
const {
|
|
43
47
|
validateSandboxUsageLimits,
|
|
44
48
|
DEVELOPER_SANDBOX,
|
|
45
49
|
getAvailableSyncTypes,
|
|
46
50
|
} = require('../../lib/sandboxes');
|
|
47
|
-
const { getValidEnv } = require('@hubspot/
|
|
51
|
+
const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
|
|
48
52
|
const {
|
|
49
53
|
PROJECT_BUILD_TEXT,
|
|
50
54
|
PROJECT_DEPLOY_TEXT,
|
|
51
55
|
ERROR_TYPES,
|
|
52
56
|
} = require('@hubspot/cli-lib/lib/constants');
|
|
53
|
-
|
|
54
|
-
logErrorInstance,
|
|
55
|
-
logApiErrorInstance,
|
|
56
|
-
ApiErrorContext,
|
|
57
|
-
} = require('@hubspot/cli-lib/errorHandlers');
|
|
57
|
+
|
|
58
58
|
const { buildSandbox } = require('../../lib/sandbox-create');
|
|
59
59
|
const { syncSandbox } = require('../../lib/sandbox-sync');
|
|
60
60
|
const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
|
|
61
61
|
const {
|
|
62
|
+
logApiErrorInstance,
|
|
63
|
+
ApiErrorContext,
|
|
62
64
|
isMissingScopeError,
|
|
63
65
|
isSpecifiedError,
|
|
64
|
-
} = require('
|
|
66
|
+
} = require('../../lib/errorHandlers/apiErrors');
|
|
67
|
+
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
65
68
|
|
|
66
69
|
const i18nKey = 'cli.commands.project.subcommands.dev';
|
|
67
70
|
|
|
@@ -85,6 +88,8 @@ exports.handler = async options => {
|
|
|
85
88
|
process.exit(EXIT_CODES.ERROR);
|
|
86
89
|
}
|
|
87
90
|
|
|
91
|
+
validateProjectConfig(projectConfig, projectDir);
|
|
92
|
+
|
|
88
93
|
const accounts = getConfigAccounts();
|
|
89
94
|
let targetAccountId = options.account ? accountId : null;
|
|
90
95
|
let createNewSandbox = false;
|
|
@@ -336,7 +341,7 @@ exports.handler = async options => {
|
|
|
336
341
|
|
|
337
342
|
await LocalDev.start();
|
|
338
343
|
|
|
339
|
-
handleExit(LocalDev.stop);
|
|
344
|
+
handleExit(({ isSIGHUP }) => LocalDev.stop(!isSIGHUP));
|
|
340
345
|
};
|
|
341
346
|
|
|
342
347
|
exports.builder = yargs => {
|
|
@@ -10,7 +10,7 @@ const { getCwd } = require('@hubspot/cli-lib/path');
|
|
|
10
10
|
const {
|
|
11
11
|
logApiErrorInstance,
|
|
12
12
|
ApiErrorContext,
|
|
13
|
-
} = require('
|
|
13
|
+
} = require('../../lib/errorHandlers/apiErrors');
|
|
14
14
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
15
15
|
const { extractZipArchive } = require('@hubspot/cli-lib/archive');
|
|
16
16
|
const {
|
|
@@ -11,7 +11,7 @@ const { i18n } = require('../../lib/lang');
|
|
|
11
11
|
const {
|
|
12
12
|
logApiErrorInstance,
|
|
13
13
|
ApiErrorContext,
|
|
14
|
-
} = require('
|
|
14
|
+
} = require('../../lib/errorHandlers/apiErrors');
|
|
15
15
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
16
16
|
const {
|
|
17
17
|
fetchProject,
|
package/commands/project/logs.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
const { getEnv } = require('@hubspot/
|
|
1
|
+
const { getEnv } = require('@hubspot/local-dev-lib/config');
|
|
2
2
|
const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
|
|
3
3
|
const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
|
|
4
4
|
const {
|
|
@@ -25,7 +25,7 @@ const {
|
|
|
25
25
|
// const {
|
|
26
26
|
// logApiErrorInstance,
|
|
27
27
|
// ApiErrorContext,
|
|
28
|
-
// } = require('
|
|
28
|
+
// } = require('../../lib/errorHandlers/apiErrors');
|
|
29
29
|
// const {
|
|
30
30
|
// getFunctionLogs,
|
|
31
31
|
// getLatestFunctionLog,
|
|
@@ -19,15 +19,13 @@ const {
|
|
|
19
19
|
showPlatformVersionWarning,
|
|
20
20
|
} = require('../../lib/projects');
|
|
21
21
|
const { i18n } = require('../../lib/lang');
|
|
22
|
-
const { getAccountConfig } = require('@hubspot/
|
|
22
|
+
const { getAccountConfig } = require('@hubspot/local-dev-lib/config');
|
|
23
23
|
const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
|
|
24
|
-
const {
|
|
25
|
-
isSpecifiedError,
|
|
26
|
-
} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
|
|
27
24
|
const {
|
|
28
25
|
logApiErrorInstance,
|
|
29
26
|
ApiErrorContext,
|
|
30
|
-
|
|
27
|
+
isSpecifiedError,
|
|
28
|
+
} = require('../../lib/errorHandlers/apiErrors');
|
|
31
29
|
const { EXIT_CODES } = require('../../lib/enums/exitCodes');
|
|
32
30
|
|
|
33
31
|
const i18nKey = 'cli.commands.project.subcommands.upload';
|
|
@@ -3,7 +3,7 @@ const { createWatcher } = require('../../lib/projectsWatch');
|
|
|
3
3
|
const {
|
|
4
4
|
logApiErrorInstance,
|
|
5
5
|
ApiErrorContext,
|
|
6
|
-
} = require('
|
|
6
|
+
} = require('../../lib/errorHandlers/apiErrors');
|
|
7
7
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
8
8
|
const { ERROR_TYPES } = require('@hubspot/cli-lib/lib/constants');
|
|
9
9
|
const {
|
package/commands/remove.js
CHANGED
|
@@ -8,7 +8,7 @@ const {
|
|
|
8
8
|
const { loadAndValidateOptions } = require('../../lib/validation');
|
|
9
9
|
const { i18n } = require('../../lib/lang');
|
|
10
10
|
const { EXIT_CODES } = require('../../lib/enums/exitCodes');
|
|
11
|
-
const { getAccountConfig, getEnv } = require('@hubspot/
|
|
11
|
+
const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
|
|
12
12
|
const { buildSandbox } = require('../../lib/sandbox-create');
|
|
13
13
|
const { uiFeatureHighlight } = require('../../lib/ui');
|
|
14
14
|
const {
|
|
@@ -20,7 +20,7 @@ const {
|
|
|
20
20
|
syncTypes,
|
|
21
21
|
validateSandboxUsageLimits,
|
|
22
22
|
} = require('../../lib/sandboxes');
|
|
23
|
-
const { getValidEnv } = require('@hubspot/
|
|
23
|
+
const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
|
|
24
24
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
25
25
|
const {
|
|
26
26
|
trackCommandUsage,
|
|
@@ -32,10 +32,8 @@ const {
|
|
|
32
32
|
} = require('../../lib/prompts/sandboxesPrompt');
|
|
33
33
|
const { promptUser } = require('../../lib/prompts/promptUtils');
|
|
34
34
|
const { syncSandbox } = require('../../lib/sandbox-sync');
|
|
35
|
-
const { logErrorInstance } = require('
|
|
36
|
-
const {
|
|
37
|
-
isMissingScopeError,
|
|
38
|
-
} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
|
|
35
|
+
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
36
|
+
const { isMissingScopeError } = require('../../lib/errorHandlers/apiErrors');
|
|
39
37
|
const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
|
|
40
38
|
|
|
41
39
|
const i18nKey = 'cli.commands.sandbox.subcommands.create';
|
|
@@ -9,29 +9,32 @@ const { logger } = require('@hubspot/cli-lib/logger');
|
|
|
9
9
|
const { trackCommandUsage } = require('../../lib/usageTracking');
|
|
10
10
|
const { loadAndValidateOptions } = require('../../lib/validation');
|
|
11
11
|
const {
|
|
12
|
+
logErrorInstance,
|
|
12
13
|
debugErrorAndContext,
|
|
13
|
-
} = require('
|
|
14
|
-
const {
|
|
14
|
+
} = require('../../lib/errorHandlers/standardErrors');
|
|
15
|
+
const {
|
|
16
|
+
isSpecifiedError,
|
|
17
|
+
isSpecifiedHubSpotAuthError,
|
|
18
|
+
} = require('../../lib/errorHandlers/apiErrors');
|
|
15
19
|
const { deleteSandbox } = require('@hubspot/cli-lib/sandboxes');
|
|
16
20
|
const { i18n } = require('../../lib/lang');
|
|
17
|
-
const { getConfig, getEnv, getAccountConfig } = require('@hubspot/cli-lib');
|
|
18
21
|
const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
|
|
19
22
|
const {
|
|
23
|
+
getConfig,
|
|
24
|
+
getEnv,
|
|
25
|
+
getAccountConfig,
|
|
20
26
|
removeSandboxAccountFromConfig,
|
|
21
27
|
updateDefaultAccount,
|
|
22
|
-
} = require('@hubspot/
|
|
28
|
+
} = require('@hubspot/local-dev-lib/config');
|
|
23
29
|
const {
|
|
24
30
|
selectAndSetAsDefaultAccountPrompt,
|
|
25
31
|
} = require('../../lib/prompts/accountsPrompt');
|
|
26
32
|
const { EXIT_CODES } = require('../../lib/enums/exitCodes');
|
|
27
33
|
const { promptUser } = require('../../lib/prompts/promptUtils');
|
|
28
34
|
const { getHubSpotWebsiteOrigin } = require('@hubspot/cli-lib/lib/urls');
|
|
29
|
-
|
|
30
|
-
isSpecifiedError,
|
|
31
|
-
isSpecifiedHubSpotAuthError,
|
|
32
|
-
} = require('@hubspot/cli-lib/errorHandlers/apiErrors');
|
|
35
|
+
|
|
33
36
|
const { getAccountName } = require('../../lib/sandboxes');
|
|
34
|
-
const { getValidEnv } = require('@hubspot/
|
|
37
|
+
const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
|
|
35
38
|
|
|
36
39
|
const i18nKey = 'cli.commands.sandbox.subcommands.delete';
|
|
37
40
|
|