@hubspot/cli 5.0.2 → 5.0.3-beta.2
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/commands/accounts/clean.js +2 -3
- package/commands/accounts/info.js +2 -2
- package/commands/accounts/list.js +2 -2
- package/commands/accounts/remove.js +1 -1
- package/commands/accounts/rename.js +1 -1
- package/commands/auth.js +3 -2
- package/commands/cms/convertFields.js +11 -5
- package/commands/cms/lighthouseScore.js +1 -1
- package/commands/config/set/allowUsageTracking.js +1 -1
- package/commands/config/set/defaultMode.js +1 -1
- package/commands/config/set/httpTimeout.js +1 -1
- package/commands/customObject/create.js +1 -1
- package/commands/customObject/schema/create.js +6 -3
- package/commands/customObject/schema/fetch-all.js +7 -2
- package/commands/customObject/schema/fetch.js +6 -3
- package/commands/customObject/schema/update.js +6 -3
- package/commands/filemanager/upload.js +2 -2
- package/commands/functions/list.js +1 -1
- package/commands/hubdb/create.js +1 -1
- package/commands/init.js +14 -5
- package/commands/lint.js +1 -1
- package/commands/project/add.js +1 -1
- package/commands/project/create.js +1 -1
- package/commands/project/deploy.js +1 -1
- package/commands/project/dev.js +11 -5
- package/commands/project/download.js +10 -3
- package/commands/project/listBuilds.js +2 -2
- package/commands/project/logs.js +3 -3
- package/commands/project/upload.js +1 -1
- package/commands/sandbox/create.js +3 -3
- package/commands/sandbox/delete.js +7 -5
- package/commands/sandbox/sync.js +3 -3
- package/commands/upload.js +3 -3
- package/commands/watch.js +1 -1
- package/lang/en.lyaml +12 -2
- 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 +1 -1
- package/lib/errorHandlers/standardErrors.js +14 -2
- package/lib/filesystem.js +1 -1
- package/lib/links.js +3 -3
- package/lib/logCallbacks.js +14 -0
- package/lib/oauth.js +2 -2
- package/lib/process.js +24 -6
- package/lib/projectStructure.js +8 -2
- package/lib/projects.js +39 -9
- package/lib/projectsWatch.js +2 -2
- package/lib/prompts/accountsPrompt.js +1 -1
- package/lib/prompts/createProjectPrompt.js +1 -1
- package/lib/prompts/downloadProjectPrompt.js +1 -1
- package/lib/prompts/enterAccountNamePrompt.js +1 -1
- package/lib/prompts/personalAccessKeyPrompt.js +2 -2
- package/lib/prompts/projectDevTargetAccountPrompt.js +2 -2
- package/lib/prompts/sandboxesPrompt.js +1 -1
- package/lib/prompts/setAsDefaultAccountPrompt.js +1 -1
- package/lib/prompts/uploadPrompt.js +1 -1
- package/lib/sandbox-create.js +4 -4
- package/lib/sandbox-sync.js +3 -3
- package/lib/sandboxes.js +9 -9
- package/lib/schema.js +1 -0
- package/lib/ui.js +1 -1
- package/lib/upload.js +10 -4
- package/lib/usageTracking.js +6 -6
- package/lib/validation.js +10 -11
- package/package.json +6 -6
|
@@ -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');
|
|
@@ -16,9 +15,9 @@ const {
|
|
|
16
15
|
} = require('../../lib/commonOpts');
|
|
17
16
|
const { getAccountName } = require('../../lib/sandboxes');
|
|
18
17
|
const { promptUser } = require('../../lib/prompts/promptUtils');
|
|
19
|
-
const { getTableContents } = require('@hubspot/
|
|
18
|
+
const { getTableContents } = require('@hubspot/local-dev-lib/logging/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
23
|
} = require('../../lib/errorHandlers/apiErrors');
|
|
@@ -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,
|
|
@@ -8,7 +8,7 @@ const {
|
|
|
8
8
|
} = require('../../lib/commonOpts');
|
|
9
9
|
const { loadAndValidateOptions } = require('../../lib/validation');
|
|
10
10
|
const { i18n } = require('../../lib/lang');
|
|
11
|
-
const { getTableContents } = require('@hubspot/
|
|
11
|
+
const { getTableContents } = require('@hubspot/local-dev-lib/logging/table');
|
|
12
12
|
|
|
13
13
|
const i18nKey = 'cli.commands.accounts.subcommands.info';
|
|
14
14
|
exports.describe = i18n(`${i18nKey}.describe`);
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const { getConfig, getConfigPath } = require('@hubspot/
|
|
2
|
+
const { getConfig, getConfigPath } = require('@hubspot/local-dev-lib/config');
|
|
3
3
|
const {
|
|
4
4
|
getTableContents,
|
|
5
5
|
getTableHeader,
|
|
6
|
-
} = require('@hubspot/
|
|
6
|
+
} = require('@hubspot/local-dev-lib/logging/table');
|
|
7
7
|
|
|
8
8
|
const {
|
|
9
9
|
addConfigOptions,
|
|
@@ -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,7 +15,8 @@ const {
|
|
|
15
15
|
writeConfig,
|
|
16
16
|
getConfig,
|
|
17
17
|
getConfigPath,
|
|
18
|
-
|
|
18
|
+
loadConfig,
|
|
19
|
+
} = require('@hubspot/local-dev-lib/config');
|
|
19
20
|
const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
|
|
20
21
|
const { promptUser } = require('../lib/prompts/promptUtils');
|
|
21
22
|
const {
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
const path = require('path');
|
|
2
2
|
const fs = require('fs');
|
|
3
|
-
const { createIgnoreFilter } = require('@hubspot/
|
|
4
|
-
const { isAllowedExtension, getCwd } = require('@hubspot/
|
|
3
|
+
const { createIgnoreFilter } = require('@hubspot/local-dev-lib/ignoreRules');
|
|
4
|
+
const { isAllowedExtension, getCwd } = require('@hubspot/local-dev-lib/path');
|
|
5
5
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
6
|
-
const { walk } = require('@hubspot/
|
|
7
|
-
const { getThemeJSONPath } = require('@hubspot/
|
|
6
|
+
const { walk } = require('@hubspot/local-dev-lib/fs');
|
|
7
|
+
const { getThemeJSONPath } = require('@hubspot/local-dev-lib/cms/themes');
|
|
8
8
|
const { i18n } = require('../../lib/lang');
|
|
9
9
|
const {
|
|
10
10
|
FieldsJs,
|
|
@@ -12,6 +12,7 @@ const {
|
|
|
12
12
|
} = require('@hubspot/cli-lib/lib/handleFieldsJs');
|
|
13
13
|
|
|
14
14
|
const { trackConvertFieldsUsage } = require('../../lib/usageTracking');
|
|
15
|
+
const { logErrorInstance } = require('@hubspot/cli-lib/errorHandlers');
|
|
15
16
|
const i18nKey = 'cli.commands.convertFields';
|
|
16
17
|
|
|
17
18
|
exports.command = 'convert-fields';
|
|
@@ -54,7 +55,12 @@ exports.handler = async options => {
|
|
|
54
55
|
if (fieldsJs.rejected) return;
|
|
55
56
|
fieldsJs.saveOutput();
|
|
56
57
|
} else if (stats.isDirectory()) {
|
|
57
|
-
|
|
58
|
+
let filePaths = [];
|
|
59
|
+
try {
|
|
60
|
+
filePaths = await walk(src);
|
|
61
|
+
} catch (e) {
|
|
62
|
+
logErrorInstance(e);
|
|
63
|
+
}
|
|
58
64
|
const allowedFilePaths = filePaths
|
|
59
65
|
.filter(file => {
|
|
60
66
|
if (!isAllowedExtension(file)) {
|
|
@@ -9,7 +9,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
|
|
|
9
9
|
const {
|
|
10
10
|
getTableContents,
|
|
11
11
|
getTableHeader,
|
|
12
|
-
} = require('@hubspot/
|
|
12
|
+
} = require('@hubspot/local-dev-lib/logging/table');
|
|
13
13
|
const { loadAndValidateOptions } = require('../../lib/validation');
|
|
14
14
|
const { promptUser } = require('../../lib/prompts/promptUtils');
|
|
15
15
|
const { i18n } = require('../../lib/lang');
|
|
@@ -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,5 +1,5 @@
|
|
|
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
4
|
const { commaSeparatedValues } = require('@hubspot/local-dev-lib/text');
|
|
5
5
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
@@ -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');
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
2
|
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
3
|
-
const { getAbsoluteFilePath } = require('@hubspot/
|
|
3
|
+
const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
|
|
4
4
|
const {
|
|
5
5
|
isFileValidJSON,
|
|
6
6
|
loadAndValidateOptions,
|
|
@@ -2,20 +2,23 @@ const { logger } = require('@hubspot/cli-lib/logger');
|
|
|
2
2
|
const {
|
|
3
3
|
logErrorInstance,
|
|
4
4
|
} = require('../../../lib/errorHandlers/standardErrors');
|
|
5
|
-
const { getAbsoluteFilePath } = require('@hubspot/
|
|
5
|
+
const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
|
|
6
6
|
const {
|
|
7
7
|
isFileValidJSON,
|
|
8
8
|
loadAndValidateOptions,
|
|
9
9
|
} = require('../../../lib/validation');
|
|
10
10
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
11
11
|
const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
|
|
12
|
-
const {
|
|
12
|
+
const {
|
|
13
|
+
getEnv,
|
|
14
|
+
isConfigFlagEnabled,
|
|
15
|
+
} = require('@hubspot/local-dev-lib/config');
|
|
13
16
|
const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
|
|
14
17
|
const { createSchema } = require('@hubspot/cli-lib/api/schema');
|
|
15
18
|
const {
|
|
16
19
|
createSchema: createSchemaFromHubFile,
|
|
17
20
|
} = require('@hubspot/cli-lib/api/fileTransport');
|
|
18
|
-
const { getHubSpotWebsiteOrigin } = require('@hubspot/
|
|
21
|
+
const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
|
|
19
22
|
const { i18n } = require('../../../lib/lang');
|
|
20
23
|
|
|
21
24
|
const i18nKey =
|
|
@@ -6,8 +6,12 @@ const {
|
|
|
6
6
|
const { loadAndValidateOptions } = require('../../../lib/validation');
|
|
7
7
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
8
8
|
const { getAccountId } = require('../../../lib/commonOpts');
|
|
9
|
-
const {
|
|
9
|
+
const {
|
|
10
|
+
downloadSchemas,
|
|
11
|
+
getResolvedPath,
|
|
12
|
+
} = require('@hubspot/local-dev-lib/customObjects');
|
|
10
13
|
const { i18n } = require('../../../lib/lang');
|
|
14
|
+
const { logSchemas } = require('../../../lib/schema');
|
|
11
15
|
|
|
12
16
|
const i18nKey =
|
|
13
17
|
'cli.commands.customObject.subcommands.schema.subcommands.fetchAll';
|
|
@@ -23,7 +27,8 @@ exports.handler = async options => {
|
|
|
23
27
|
trackCommandUsage('custom-object-schema-fetch-all', null, accountId);
|
|
24
28
|
|
|
25
29
|
try {
|
|
26
|
-
await downloadSchemas(accountId, options.dest);
|
|
30
|
+
const schemas = await downloadSchemas(accountId, options.dest);
|
|
31
|
+
logSchemas(schemas);
|
|
27
32
|
logger.success(
|
|
28
33
|
i18n(`${i18nKey}.success.fetch`, {
|
|
29
34
|
path: getResolvedPath(options.dest),
|
|
@@ -1,13 +1,16 @@
|
|
|
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
4
|
const {
|
|
5
5
|
logErrorInstance,
|
|
6
6
|
} = require('../../../lib/errorHandlers/standardErrors');
|
|
7
7
|
const { ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
|
|
8
|
-
const {
|
|
8
|
+
const {
|
|
9
|
+
downloadSchema,
|
|
10
|
+
getResolvedPath,
|
|
11
|
+
} = require('@hubspot/local-dev-lib/customObjects');
|
|
9
12
|
const { fetchSchema } = require('@hubspot/cli-lib/api/fileTransport');
|
|
10
|
-
const { getCwd } = require('@hubspot/
|
|
13
|
+
const { getCwd } = require('@hubspot/local-dev-lib/path');
|
|
11
14
|
|
|
12
15
|
const { loadAndValidateOptions } = require('../../../lib/validation');
|
|
13
16
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
@@ -2,7 +2,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
|
|
|
2
2
|
const {
|
|
3
3
|
logErrorInstance,
|
|
4
4
|
} = require('../../../lib/errorHandlers/standardErrors');
|
|
5
|
-
const { getAbsoluteFilePath } = require('@hubspot/
|
|
5
|
+
const { getAbsoluteFilePath } = require('@hubspot/local-dev-lib/path');
|
|
6
6
|
const {
|
|
7
7
|
isFileValidJSON,
|
|
8
8
|
loadAndValidateOptions,
|
|
@@ -10,12 +10,15 @@ const {
|
|
|
10
10
|
const { trackCommandUsage } = require('../../../lib/usageTracking');
|
|
11
11
|
const { addTestingOptions, getAccountId } = require('../../../lib/commonOpts');
|
|
12
12
|
const { ENVIRONMENTS, ConfigFlags } = require('@hubspot/cli-lib/lib/constants');
|
|
13
|
-
const {
|
|
13
|
+
const {
|
|
14
|
+
getEnv,
|
|
15
|
+
isConfigFlagEnabled,
|
|
16
|
+
} = require('@hubspot/local-dev-lib/config');
|
|
14
17
|
const { updateSchema } = require('@hubspot/cli-lib/api/schema');
|
|
15
18
|
const {
|
|
16
19
|
updateSchema: updateSchemaFromHubFile,
|
|
17
20
|
} = require('@hubspot/cli-lib/api/fileTransport');
|
|
18
|
-
const { getHubSpotWebsiteOrigin } = require('@hubspot/
|
|
21
|
+
const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
|
|
19
22
|
const { i18n } = require('../../../lib/lang');
|
|
20
23
|
|
|
21
24
|
const i18nKey =
|
|
@@ -3,7 +3,7 @@ const path = require('path');
|
|
|
3
3
|
|
|
4
4
|
const { uploadFolder } = require('@hubspot/cli-lib/fileManager');
|
|
5
5
|
const { uploadFile } = require('@hubspot/cli-lib/api/fileManager');
|
|
6
|
-
const { getCwd, convertToUnixPath } = require('@hubspot/
|
|
6
|
+
const { getCwd, convertToUnixPath } = require('@hubspot/local-dev-lib/path');
|
|
7
7
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
8
8
|
const {
|
|
9
9
|
ApiErrorContext,
|
|
@@ -11,7 +11,7 @@ const {
|
|
|
11
11
|
} = require('../../lib/errorHandlers/apiErrors');
|
|
12
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,
|
package/commands/hubdb/create.js
CHANGED
|
@@ -2,7 +2,7 @@ const path = require('path');
|
|
|
2
2
|
|
|
3
3
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
4
4
|
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
5
|
-
const { getCwd } = require('@hubspot/
|
|
5
|
+
const { getCwd } = require('@hubspot/local-dev-lib/path');
|
|
6
6
|
const { createHubDbTable } = require('@hubspot/cli-lib/hubdb');
|
|
7
7
|
|
|
8
8
|
const {
|
package/commands/init.js
CHANGED
|
@@ -5,11 +5,16 @@ 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
|
-
const {
|
|
12
|
-
|
|
11
|
+
const {
|
|
12
|
+
checkAndAddConfigToGitignore,
|
|
13
|
+
} = require('@hubspot/local-dev-lib/gitignore');
|
|
14
|
+
const {
|
|
15
|
+
logErrorInstance,
|
|
16
|
+
debugErrorAndContext,
|
|
17
|
+
} = require('../lib/errorHandlers/standardErrors');
|
|
13
18
|
const {
|
|
14
19
|
DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME,
|
|
15
20
|
PERSONAL_ACCESS_KEY_AUTH_METHOD,
|
|
@@ -21,7 +26,7 @@ const { logger } = require('@hubspot/cli-lib/logger');
|
|
|
21
26
|
const {
|
|
22
27
|
updateConfigWithPersonalAccessKey,
|
|
23
28
|
} = require('@hubspot/cli-lib/personalAccessKey');
|
|
24
|
-
const { getCwd } = require('@hubspot/
|
|
29
|
+
const { getCwd } = require('@hubspot/local-dev-lib/path');
|
|
25
30
|
const { trackCommandUsage, trackAuthAction } = require('../lib/usageTracking');
|
|
26
31
|
const { setLogLevel, addTestingOptions } = require('../lib/commonOpts');
|
|
27
32
|
const { promptUser } = require('../lib/prompts/promptUtils');
|
|
@@ -117,7 +122,11 @@ exports.handler = async options => {
|
|
|
117
122
|
);
|
|
118
123
|
const configPath = getConfigPath();
|
|
119
124
|
|
|
120
|
-
|
|
125
|
+
try {
|
|
126
|
+
checkAndAddConfigToGitignore(configPath);
|
|
127
|
+
} catch (e) {
|
|
128
|
+
debugErrorAndContext(e);
|
|
129
|
+
}
|
|
121
130
|
|
|
122
131
|
logger.log('');
|
|
123
132
|
logger.success(
|
package/commands/lint.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
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
4
|
const { logErrorInstance } = require('../lib/errorHandlers/standardErrors');
|
package/commands/project/add.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
2
|
-
const { getAccountId } = require('@hubspot/
|
|
2
|
+
const { getAccountId } = require('@hubspot/local-dev-lib/config');
|
|
3
3
|
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
4
4
|
const { fetchReleaseData } = require('@hubspot/cli-lib/github');
|
|
5
5
|
|
|
@@ -6,7 +6,7 @@ const {
|
|
|
6
6
|
} = require('../../lib/commonOpts');
|
|
7
7
|
const { trackCommandUsage } = require('../../lib/usageTracking');
|
|
8
8
|
const { loadAndValidateOptions } = require('../../lib/validation');
|
|
9
|
-
const { getCwd } = require('@hubspot/
|
|
9
|
+
const { getCwd } = require('@hubspot/local-dev-lib/path');
|
|
10
10
|
const path = require('path');
|
|
11
11
|
const chalk = require('chalk');
|
|
12
12
|
const {
|
|
@@ -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,14 +42,13 @@ 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,
|
|
@@ -53,7 +57,7 @@ const {
|
|
|
53
57
|
|
|
54
58
|
const { buildSandbox } = require('../../lib/sandbox-create');
|
|
55
59
|
const { syncSandbox } = require('../../lib/sandbox-sync');
|
|
56
|
-
const { getHubSpotWebsiteOrigin } = require('@hubspot/
|
|
60
|
+
const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
|
|
57
61
|
const {
|
|
58
62
|
logApiErrorInstance,
|
|
59
63
|
ApiErrorContext,
|
|
@@ -84,6 +88,8 @@ exports.handler = async options => {
|
|
|
84
88
|
process.exit(EXIT_CODES.ERROR);
|
|
85
89
|
}
|
|
86
90
|
|
|
91
|
+
validateProjectConfig(projectConfig, projectDir);
|
|
92
|
+
|
|
87
93
|
const accounts = getConfigAccounts();
|
|
88
94
|
let targetAccountId = options.account ? accountId : null;
|
|
89
95
|
let createNewSandbox = false;
|
|
@@ -335,7 +341,7 @@ exports.handler = async options => {
|
|
|
335
341
|
|
|
336
342
|
await LocalDev.start();
|
|
337
343
|
|
|
338
|
-
handleExit(LocalDev.stop);
|
|
344
|
+
handleExit(({ isSIGHUP }) => LocalDev.stop(!isSIGHUP));
|
|
339
345
|
};
|
|
340
346
|
|
|
341
347
|
exports.builder = yargs => {
|
|
@@ -6,13 +6,13 @@ const {
|
|
|
6
6
|
addUseEnvironmentOptions,
|
|
7
7
|
} = require('../../lib/commonOpts');
|
|
8
8
|
const { trackCommandUsage } = require('../../lib/usageTracking');
|
|
9
|
-
const { getCwd } = require('@hubspot/
|
|
9
|
+
const { getCwd } = require('@hubspot/local-dev-lib/path');
|
|
10
10
|
const {
|
|
11
11
|
logApiErrorInstance,
|
|
12
12
|
ApiErrorContext,
|
|
13
13
|
} = require('../../lib/errorHandlers/apiErrors');
|
|
14
14
|
const { logger } = require('@hubspot/cli-lib/logger');
|
|
15
|
-
const { extractZipArchive } = require('@hubspot/
|
|
15
|
+
const { extractZipArchive } = require('@hubspot/local-dev-lib/archive');
|
|
16
16
|
const {
|
|
17
17
|
downloadProject,
|
|
18
18
|
fetchProjectBuilds,
|
|
@@ -24,10 +24,16 @@ const {
|
|
|
24
24
|
} = require('../../lib/prompts/downloadProjectPrompt');
|
|
25
25
|
const { i18n } = require('../../lib/lang');
|
|
26
26
|
const { uiBetaTag } = require('../../lib/ui');
|
|
27
|
+
const { buildLogCallbacks } = require('../../lib/logCallbacks');
|
|
27
28
|
|
|
28
29
|
const i18nKey = 'cli.commands.project.subcommands.download';
|
|
29
30
|
const { EXIT_CODES } = require('../../lib/enums/exitCodes');
|
|
30
31
|
|
|
32
|
+
const archiveLogCallbacks = buildLogCallbacks({
|
|
33
|
+
init: `${i18nKey}.archiveLogCallbacks.init`,
|
|
34
|
+
copy: `${i18nKey}.archiveLogCallbacks.copy`,
|
|
35
|
+
});
|
|
36
|
+
|
|
31
37
|
exports.command = 'download [--project]';
|
|
32
38
|
exports.describe = uiBetaTag(i18n(`${i18nKey}.describe`), false);
|
|
33
39
|
|
|
@@ -93,7 +99,8 @@ exports.handler = async options => {
|
|
|
93
99
|
zippedProject,
|
|
94
100
|
projectName,
|
|
95
101
|
path.resolve(absoluteDestPath),
|
|
96
|
-
{ includesRootDir: false }
|
|
102
|
+
{ includesRootDir: false },
|
|
103
|
+
archiveLogCallbacks
|
|
97
104
|
);
|
|
98
105
|
|
|
99
106
|
logger.log(
|
|
@@ -20,8 +20,8 @@ const {
|
|
|
20
20
|
const {
|
|
21
21
|
getTableContents,
|
|
22
22
|
getTableHeader,
|
|
23
|
-
} = require('@hubspot/
|
|
24
|
-
const { getCwd } = require('@hubspot/
|
|
23
|
+
} = require('@hubspot/local-dev-lib/logging/table');
|
|
24
|
+
const { getCwd } = require('@hubspot/local-dev-lib/path');
|
|
25
25
|
const { uiBetaTag, uiLink } = require('../../lib/ui');
|
|
26
26
|
const { loadAndValidateOptions } = require('../../lib/validation');
|
|
27
27
|
const {
|
package/commands/project/logs.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
const { getEnv } = require('@hubspot/
|
|
2
|
-
const { getHubSpotWebsiteOrigin } = require('@hubspot/
|
|
1
|
+
const { getEnv } = require('@hubspot/local-dev-lib/config');
|
|
2
|
+
const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
|
|
3
3
|
const { ENVIRONMENTS } = require('@hubspot/cli-lib/lib/constants');
|
|
4
4
|
const {
|
|
5
5
|
addAccountOptions,
|
|
@@ -17,7 +17,7 @@ const {
|
|
|
17
17
|
const {
|
|
18
18
|
getTableContents,
|
|
19
19
|
getTableHeader,
|
|
20
|
-
} = require('@hubspot/
|
|
20
|
+
} = require('@hubspot/local-dev-lib/logging/table');
|
|
21
21
|
// const {
|
|
22
22
|
// getProjectAppFunctionLogs,
|
|
23
23
|
// getLatestProjectAppFunctionLog,
|
|
@@ -19,7 +19,7 @@ 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
24
|
const {
|
|
25
25
|
logApiErrorInstance,
|
|
@@ -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,
|
|
@@ -34,7 +34,7 @@ const { promptUser } = require('../../lib/prompts/promptUtils');
|
|
|
34
34
|
const { syncSandbox } = require('../../lib/sandbox-sync');
|
|
35
35
|
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
36
36
|
const { isMissingScopeError } = require('../../lib/errorHandlers/apiErrors');
|
|
37
|
-
const { getHubSpotWebsiteOrigin } = require('@hubspot/
|
|
37
|
+
const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
|
|
38
38
|
|
|
39
39
|
const i18nKey = 'cli.commands.sandbox.subcommands.create';
|
|
40
40
|
|
|
@@ -16,23 +16,25 @@ const {
|
|
|
16
16
|
isSpecifiedError,
|
|
17
17
|
isSpecifiedHubSpotAuthError,
|
|
18
18
|
} = require('../../lib/errorHandlers/apiErrors');
|
|
19
|
-
const { deleteSandbox } = require('@hubspot/
|
|
19
|
+
const { deleteSandbox } = require('@hubspot/local-dev-lib/sandboxes');
|
|
20
20
|
const { i18n } = require('../../lib/lang');
|
|
21
|
-
const { getConfig, getEnv, getAccountConfig } = require('@hubspot/cli-lib');
|
|
22
21
|
const { deleteSandboxPrompt } = require('../../lib/prompts/sandboxesPrompt');
|
|
23
22
|
const {
|
|
23
|
+
getConfig,
|
|
24
|
+
getEnv,
|
|
25
|
+
getAccountConfig,
|
|
24
26
|
removeSandboxAccountFromConfig,
|
|
25
27
|
updateDefaultAccount,
|
|
26
|
-
} = require('@hubspot/
|
|
28
|
+
} = require('@hubspot/local-dev-lib/config');
|
|
27
29
|
const {
|
|
28
30
|
selectAndSetAsDefaultAccountPrompt,
|
|
29
31
|
} = require('../../lib/prompts/accountsPrompt');
|
|
30
32
|
const { EXIT_CODES } = require('../../lib/enums/exitCodes');
|
|
31
33
|
const { promptUser } = require('../../lib/prompts/promptUtils');
|
|
32
|
-
const { getHubSpotWebsiteOrigin } = require('@hubspot/
|
|
34
|
+
const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
|
|
33
35
|
|
|
34
36
|
const { getAccountName } = require('../../lib/sandboxes');
|
|
35
|
-
const { getValidEnv } = require('@hubspot/
|
|
37
|
+
const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
|
|
36
38
|
|
|
37
39
|
const i18nKey = 'cli.commands.sandbox.subcommands.delete';
|
|
38
40
|
|
package/commands/sandbox/sync.js
CHANGED
|
@@ -10,8 +10,8 @@ const { logger } = require('@hubspot/cli-lib/logger');
|
|
|
10
10
|
const { loadAndValidateOptions } = require('../../lib/validation');
|
|
11
11
|
const { i18n } = require('../../lib/lang');
|
|
12
12
|
const { EXIT_CODES } = require('../../lib/enums/exitCodes');
|
|
13
|
-
const { getAccountConfig, getEnv } = require('@hubspot/
|
|
14
|
-
const { getHubSpotWebsiteOrigin } = require('@hubspot/
|
|
13
|
+
const { getAccountConfig, getEnv } = require('@hubspot/local-dev-lib/config');
|
|
14
|
+
const { getHubSpotWebsiteOrigin } = require('@hubspot/local-dev-lib/urls');
|
|
15
15
|
const { promptUser } = require('../../lib/prompts/promptUtils');
|
|
16
16
|
const { uiLine } = require('../../lib/ui');
|
|
17
17
|
const {
|
|
@@ -23,7 +23,7 @@ const {
|
|
|
23
23
|
getSyncTypesWithContactRecordsPrompt,
|
|
24
24
|
} = require('../../lib/sandboxes');
|
|
25
25
|
const { syncSandbox } = require('../../lib/sandbox-sync');
|
|
26
|
-
const { getValidEnv } = require('@hubspot/
|
|
26
|
+
const { getValidEnv } = require('@hubspot/local-dev-lib/environment');
|
|
27
27
|
const { isSpecifiedError } = require('../../lib/errorHandlers/apiErrors');
|
|
28
28
|
const { logErrorInstance } = require('../../lib/errorHandlers/standardErrors');
|
|
29
29
|
|