@hubspot/cli 8.3.1-experimental.0 → 8.3.1-experimental.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/api/feedback.d.ts +10 -0
- package/api/feedback.js +9 -0
- package/bin/cli.js +19 -1
- package/commands/account/auth.js +2 -2
- package/commands/account/createOverride.js +2 -0
- package/commands/account/removeOverride.js +2 -0
- package/commands/app/secret/add.js +1 -1
- package/commands/app/secret/delete.js +1 -1
- package/commands/app/secret/list.js +1 -1
- package/commands/app/secret/update.js +1 -1
- package/commands/app/secret.js +1 -1
- package/commands/auth.js +3 -2
- package/commands/cms/function/create.js +5 -37
- package/commands/cms/function/deploy.js +8 -1
- package/commands/cms/function/list.js +4 -0
- package/commands/cms/function/logs.js +2 -0
- package/commands/cms/function/server.js +6 -0
- package/commands/cms/lighthouseScore.js +1 -1
- package/commands/cms/upload.js +6 -0
- package/commands/cms/watch.js +2 -0
- package/commands/cms/webpack/create.js +5 -32
- package/commands/customObject.js +2 -2
- package/commands/feedback.d.ts +6 -2
- package/commands/feedback.js +82 -8
- package/commands/getStarted.js +4 -4
- package/commands/hubdb/list.js +2 -2
- package/commands/init.js +3 -2
- package/commands/mcp/setup.d.ts +1 -0
- package/commands/mcp/setup.js +11 -3
- package/commands/project/dev/index.js +2 -2
- package/commands/project/download.d.ts +2 -0
- package/commands/project/download.js +56 -16
- package/commands/project/logs.js +2 -2
- package/commands/project/upload.js +6 -2
- package/commands/project/watch.js +2 -2
- package/commands/sandbox/create.js +3 -3
- package/commands/sandbox/delete.js +1 -1
- package/commands/sandbox.js +1 -1
- package/lang/en.d.ts +105 -6
- package/lang/en.js +269 -51
- package/lib/accountAuth.js +12 -0
- package/lib/accountCredentials.d.ts +1 -0
- package/lib/accountCredentials.js +25 -0
- package/lib/agentHelp.d.ts +17 -0
- package/lib/agentHelp.js +90 -0
- package/lib/app/migrate.js +5 -8
- package/lib/commonOpts.js +4 -0
- package/lib/constants.d.ts +4 -0
- package/lib/constants.js +6 -0
- package/lib/errorHandlers/suppressError.js +3 -3
- package/lib/feedback.d.ts +3 -0
- package/lib/feedback.js +13 -0
- package/lib/jsonOutput/projectDownload.d.ts +1 -0
- package/lib/jsonOutput/projectDownload.js +1 -0
- package/lib/jsonOutput/projectUpload.d.ts +1 -0
- package/lib/jsonOutput/projectUpload.js +1 -0
- package/lib/mcp/clients.d.ts +2 -1
- package/lib/mcp/clients.js +7 -7
- package/lib/mcp/setup.d.ts +7 -2
- package/lib/mcp/setup.js +22 -37
- package/lib/mcp/skills.d.ts +8 -0
- package/lib/mcp/skills.js +64 -0
- package/lib/projects/archive.d.ts +8 -0
- package/lib/projects/archive.js +104 -0
- package/lib/projects/archiveDiff.d.ts +12 -0
- package/lib/projects/archiveDiff.js +68 -0
- package/lib/projects/config.js +1 -1
- package/lib/projects/download.d.ts +37 -0
- package/lib/projects/download.js +123 -0
- package/lib/projects/localDev/AppDevModeInterface.js +3 -3
- package/lib/projects/localDev/LocalDevLogger.js +5 -5
- package/lib/projects/localDev/LocalDevWatcher.js +2 -1
- package/lib/projects/localDev/helpers/project.js +3 -3
- package/lib/projects/pollProjectBuildAndDeploy.js +4 -4
- package/lib/projects/projectInfo.js +4 -4
- package/lib/projects/projectProfiles.js +3 -3
- package/lib/projects/ui.js +3 -3
- package/lib/projects/upload.d.ts +3 -1
- package/lib/projects/upload.js +23 -6
- package/lib/projects/watch.js +4 -2
- package/lib/projects/workspaces.js +4 -4
- package/lib/prompts/importDataTestAccountSelectPrompt.js +1 -1
- package/lib/prompts/personalAccessKeyPrompt.js +2 -2
- package/lib/prompts/selectPublicAppForMigrationPrompt.js +3 -3
- package/lib/serverlessSunset.d.ts +6 -0
- package/lib/serverlessSunset.js +32 -0
- package/lib/testUtils.d.ts +5 -1
- package/lib/testUtils.js +2 -2
- package/lib/ui/appLogs.js +3 -3
- package/lib/ui/git.js +3 -3
- package/lib/ui/index.d.ts +8 -10
- package/lib/ui/index.js +34 -31
- package/lib/validation.js +16 -1
- package/lib/yargs/makeWrappedYargsHandler.d.ts +1 -0
- package/lib/yargs/makeWrappedYargsHandler.js +7 -0
- package/mcp-server/Tool.d.ts +1 -0
- package/mcp-server/Tool.js +4 -1
- package/mcp-server/server.js +16 -5
- package/mcp-server/skills/hubspot-fix-build/SKILL.md +61 -0
- package/mcp-server/skills/hubspot-new-app/SKILL.md +84 -0
- package/mcp-server/tools/cms/HsFunctionLogsTool.js +1 -1
- package/mcp-server/tools/cms/HsListFunctionsTool.js +1 -1
- package/mcp-server/tools/index.js +2 -2
- package/mcp-server/tools/project/DocFetchTool.d.ts +4 -1
- package/mcp-server/tools/project/DocFetchTool.js +53 -12
- package/mcp-server/tools/project/DocsSearchTool.js +2 -7
- package/mcp-server/tools/project/FindProjectsTool.js +4 -1
- package/mcp-server/tools/project/GetApiUsagePatternsByAppIdTool.js +2 -7
- package/mcp-server/tools/project/GetApplicationInfoTool.js +2 -7
- package/mcp-server/tools/project/GetBuildLogsTool.d.ts +1 -1
- package/mcp-server/tools/project/GetBuildLogsTool.js +2 -12
- package/mcp-server/tools/project/GetBuildStatusTool.js +2 -12
- package/mcp-server/tools/project/KnowledgeSearchTool.js +2 -5
- package/mcp-server/tools/project/SubmitFeedbackTool.d.ts +25 -0
- package/mcp-server/tools/project/SubmitFeedbackTool.js +73 -0
- package/mcp-server/utils/command.js +23 -4
- package/mcp-server/utils/errors.d.ts +1 -0
- package/mcp-server/utils/errors.js +9 -0
- package/mcp-server/utils/feedbackTracking.js +3 -1
- package/package.json +14 -14
- package/mcp-server/tools/cms/HsCreateFunctionTool.d.ts +0 -26
- package/mcp-server/tools/cms/HsCreateFunctionTool.js +0 -100
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { HubSpotPromise } from '@hubspot/local-dev-lib/types/Http';
|
|
2
|
+
export declare const FEEDBACK_SOURCES: readonly ["user", "agent"];
|
|
3
|
+
export type FeedbackSource = (typeof FEEDBACK_SOURCES)[number];
|
|
4
|
+
type FeedbackRequest = {
|
|
5
|
+
feedback: string;
|
|
6
|
+
source: FeedbackSource;
|
|
7
|
+
cliVersion: string;
|
|
8
|
+
};
|
|
9
|
+
export declare function sendFeedback(accountId: number, request: FeedbackRequest): HubSpotPromise<void>;
|
|
10
|
+
export {};
|
package/api/feedback.js
ADDED
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { http } from '@hubspot/local-dev-lib/http';
|
|
2
|
+
const FEEDBACK_API_PATH = 'local/dev/tools/proxy/v1/feedback';
|
|
3
|
+
export const FEEDBACK_SOURCES = ['user', 'agent'];
|
|
4
|
+
export function sendFeedback(accountId, request) {
|
|
5
|
+
return http.post(accountId, {
|
|
6
|
+
url: FEEDBACK_API_PATH,
|
|
7
|
+
data: request,
|
|
8
|
+
});
|
|
9
|
+
}
|
package/bin/cli.js
CHANGED
|
@@ -39,6 +39,8 @@ import { initializeSpinniesManager } from '../lib/middleware/spinniesMiddleware.
|
|
|
39
39
|
import { addCommandSuggestions } from '../lib/commandSuggestion.js';
|
|
40
40
|
import { pkg } from '../lib/jsonLoader.js';
|
|
41
41
|
import { parseYargsOrExit } from '../lib/yargs/parseYargsOrExit.js';
|
|
42
|
+
import { getRootAgentHelp, recordCommands } from '../lib/agentHelp.js';
|
|
43
|
+
import { hasFlag } from '../lib/utils/hasFlag.js';
|
|
42
44
|
function getTerminalWidth() {
|
|
43
45
|
const width = yargs().terminalWidth();
|
|
44
46
|
if (width >= 100)
|
|
@@ -61,7 +63,16 @@ function handleFailure(msg, err, yargs) {
|
|
|
61
63
|
process.exit(EXIT_CODES.ERROR);
|
|
62
64
|
}
|
|
63
65
|
}
|
|
64
|
-
const
|
|
66
|
+
const isAgentHelp = hasFlag('agent-help');
|
|
67
|
+
const isRootAgentHelp = isAgentHelp && process.argv.slice(2).every(arg => arg.startsWith('-'));
|
|
68
|
+
// --agent-help shows the normal help, so the command never runs. Some
|
|
69
|
+
// builders read process.argv directly, so --help goes there too.
|
|
70
|
+
if (isAgentHelp) {
|
|
71
|
+
process.argv.splice(process.argv.indexOf('--agent-help') + 1, 0, '--help');
|
|
72
|
+
}
|
|
73
|
+
const rootYargs = yargs(process.argv.slice(2));
|
|
74
|
+
const rootCommands = isRootAgentHelp ? recordCommands(rootYargs) : [];
|
|
75
|
+
const argv = rootYargs
|
|
65
76
|
.usage('The command line interface to interact with HubSpot.')
|
|
66
77
|
.middleware([
|
|
67
78
|
setCLILogLevel,
|
|
@@ -98,6 +109,10 @@ const argv = yargs(process.argv.slice(2))
|
|
|
98
109
|
default: false,
|
|
99
110
|
hidden: true,
|
|
100
111
|
type: 'boolean',
|
|
112
|
+
})
|
|
113
|
+
.option('agent-help', {
|
|
114
|
+
describe: lib.commonOpts.options.agentHelp,
|
|
115
|
+
type: 'boolean',
|
|
101
116
|
})
|
|
102
117
|
.check(performChecks)
|
|
103
118
|
// Getting started / important
|
|
@@ -126,6 +141,9 @@ const argv = yargs(process.argv.slice(2))
|
|
|
126
141
|
.command(doctorCommand)
|
|
127
142
|
.command(mcpCommand)
|
|
128
143
|
.command(upgradeCommand);
|
|
144
|
+
if (isRootAgentHelp) {
|
|
145
|
+
argv.epilogue(await getRootAgentHelp(rootCommands));
|
|
146
|
+
}
|
|
129
147
|
const parser = addCommandSuggestions(argv)
|
|
130
148
|
.help()
|
|
131
149
|
.alias('h', 'help')
|
package/commands/account/auth.js
CHANGED
|
@@ -4,7 +4,7 @@ import { deleteConfigFileIfEmpty } from '@hubspot/local-dev-lib/config';
|
|
|
4
4
|
import { handleExit } from '../../lib/process.js';
|
|
5
5
|
import { trackAuthAction } from '../../lib/usageTracking.js';
|
|
6
6
|
import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
|
|
7
|
-
import {
|
|
7
|
+
import { logUiFeatureHighlight } from '../../lib/ui/index.js';
|
|
8
8
|
import { parseStringToNumber } from '../../lib/parsing.js';
|
|
9
9
|
import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
|
|
10
10
|
import { makeYargsBuilder } from '../../lib/yargsUtils.js';
|
|
@@ -58,7 +58,7 @@ async function handler(args) {
|
|
|
58
58
|
authType: accountAuthType,
|
|
59
59
|
});
|
|
60
60
|
if (!formatOutputAsJson) {
|
|
61
|
-
|
|
61
|
+
logUiFeatureHighlight([
|
|
62
62
|
'getStartedCommand',
|
|
63
63
|
'helpCommand',
|
|
64
64
|
'accountAuthCommand',
|
|
@@ -12,12 +12,14 @@ import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler
|
|
|
12
12
|
import { makeYargsBuilder } from '../../lib/yargsUtils.js';
|
|
13
13
|
import { commands } from '../../lang/en.js';
|
|
14
14
|
import { uiLogger } from '../../lib/ui/logger.js';
|
|
15
|
+
import { uiDeprecatedTag } from '../../lib/ui/index.js';
|
|
15
16
|
import { warnIfLinkedDirectory } from '../../lib/link/warnIfLinkedDirectory.js';
|
|
16
17
|
const command = 'create-override [account]';
|
|
17
18
|
const describe = commands.account.subcommands.createOverride.describe(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
|
|
18
19
|
async function handler(args) {
|
|
19
20
|
const { exit } = args;
|
|
20
21
|
let overrideDefaultAccount = args.account;
|
|
22
|
+
uiLogger.log(uiDeprecatedTag(commands.account.subcommands.createOverride.logs.deprecated));
|
|
21
23
|
// TODO: Block this command when linked directory exists (next breaking change)
|
|
22
24
|
warnIfLinkedDirectory(args._);
|
|
23
25
|
const globalConfigExists = globalConfigFileExists();
|
|
@@ -8,12 +8,14 @@ import { logError } from '../../lib/errorHandlers/index.js';
|
|
|
8
8
|
import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
|
|
9
9
|
import { makeYargsBuilder } from '../../lib/yargsUtils.js';
|
|
10
10
|
import { uiLogger } from '../../lib/ui/logger.js';
|
|
11
|
+
import { uiDeprecatedTag } from '../../lib/ui/index.js';
|
|
11
12
|
import { commands } from '../../lang/en.js';
|
|
12
13
|
import { warnIfLinkedDirectory } from '../../lib/link/warnIfLinkedDirectory.js';
|
|
13
14
|
const command = 'remove-override';
|
|
14
15
|
const describe = commands.account.subcommands.removeOverride.describe(DEFAULT_ACCOUNT_OVERRIDE_FILE_NAME);
|
|
15
16
|
async function handler(args) {
|
|
16
17
|
const { force, exit } = args;
|
|
18
|
+
uiLogger.log(uiDeprecatedTag(commands.account.subcommands.removeOverride.logs.deprecated));
|
|
17
19
|
// TODO: Block this command when linked directory exists (next breaking change)
|
|
18
20
|
warnIfLinkedDirectory(args._);
|
|
19
21
|
const globalConfigExists = globalConfigFileExists();
|
|
@@ -9,7 +9,7 @@ import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
|
|
|
9
9
|
import { uiLogger } from '../../../lib/ui/logger.js';
|
|
10
10
|
import { uiBetaTag } from '../../../lib/ui/index.js';
|
|
11
11
|
const command = 'add [name]';
|
|
12
|
-
const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.add.describe
|
|
12
|
+
const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.add.describe);
|
|
13
13
|
async function handler(args) {
|
|
14
14
|
const { derivedAccountId, exit } = args;
|
|
15
15
|
try {
|
|
@@ -9,7 +9,7 @@ import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
|
|
|
9
9
|
import { uiLogger } from '../../../lib/ui/logger.js';
|
|
10
10
|
import { uiBetaTag } from '../../../lib/ui/index.js';
|
|
11
11
|
const command = 'delete [name]';
|
|
12
|
-
const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.delete.describe
|
|
12
|
+
const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.delete.describe);
|
|
13
13
|
async function handler(args) {
|
|
14
14
|
const { derivedAccountId, force, exit } = args;
|
|
15
15
|
const appSecretApp = await selectAppPrompt(derivedAccountId, args.app);
|
|
@@ -8,7 +8,7 @@ import { selectAppPrompt } from '../../../lib/prompts/selectAppPrompt.js';
|
|
|
8
8
|
import { uiLogger } from '../../../lib/ui/logger.js';
|
|
9
9
|
import { uiBetaTag } from '../../../lib/ui/index.js';
|
|
10
10
|
const command = 'list';
|
|
11
|
-
const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.list.describe
|
|
11
|
+
const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.list.describe);
|
|
12
12
|
async function handler(args) {
|
|
13
13
|
const { derivedAccountId, exit } = args;
|
|
14
14
|
const appSecretApp = await selectAppPrompt(derivedAccountId, args.app);
|
|
@@ -10,7 +10,7 @@ import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
|
|
|
10
10
|
import { uiLogger } from '../../../lib/ui/logger.js';
|
|
11
11
|
import { uiBetaTag } from '../../../lib/ui/index.js';
|
|
12
12
|
const command = 'update [name]';
|
|
13
|
-
const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.update.describe
|
|
13
|
+
const describe = uiBetaTag(commands.app.subcommands.secret.subcommands.update.describe);
|
|
14
14
|
async function handler(args) {
|
|
15
15
|
const { derivedAccountId, exit } = args;
|
|
16
16
|
const appSecretApp = await selectAppPrompt(derivedAccountId, args.app);
|
package/commands/app/secret.js
CHANGED
|
@@ -6,7 +6,7 @@ import listAppSecretsCommand from './secret/list.js';
|
|
|
6
6
|
import updateAppSecretCommand from './secret/update.js';
|
|
7
7
|
import { uiBetaTag } from '../../lib/ui/index.js';
|
|
8
8
|
const command = ['secret', 'secrets'];
|
|
9
|
-
const describe = uiBetaTag(commands.app.subcommands.secret.describe
|
|
9
|
+
const describe = uiBetaTag(commands.app.subcommands.secret.describe);
|
|
10
10
|
function appSecretBuilder(yargs) {
|
|
11
11
|
yargs
|
|
12
12
|
.command(addAppSecretCommand)
|
package/commands/auth.js
CHANGED
|
@@ -14,7 +14,7 @@ import { makeYargsBuilder } from '../lib/yargsUtils.js';
|
|
|
14
14
|
import { trackAuthAction } from '../lib/usageTracking.js';
|
|
15
15
|
import { authenticateWithOauth } from '../lib/oauth.js';
|
|
16
16
|
import { EXIT_CODES } from '../lib/enums/exitCodes.js';
|
|
17
|
-
import {
|
|
17
|
+
import { uiDeprecatedTag, logUiFeatureHighlight } from '../lib/ui/index.js';
|
|
18
18
|
import { logError } from '../lib/errorHandlers/index.js';
|
|
19
19
|
import { isPromptExitError } from '../lib/errors/PromptExitError.js';
|
|
20
20
|
import { makeWrappedYargsHandler } from '../lib/yargs/makeWrappedYargsHandler.js';
|
|
@@ -57,6 +57,7 @@ async function handler(args) {
|
|
|
57
57
|
uiLogger.error(commands.auth.errors.globalConfigFileExists('hs account auth'));
|
|
58
58
|
return exit(EXIT_CODES.ERROR);
|
|
59
59
|
}
|
|
60
|
+
uiLogger.log(uiDeprecatedTag(commands.auth.logs.deprecated));
|
|
60
61
|
if (!disableTracking) {
|
|
61
62
|
trackAuthAction('auth', authType, TRACKING_STATUS.STARTED, parsedUserProvidedAccountId);
|
|
62
63
|
}
|
|
@@ -134,7 +135,7 @@ async function handler(args) {
|
|
|
134
135
|
const accountName = (updatedConfig && updatedConfig.name) || validName || nameFromConfigData;
|
|
135
136
|
await setAsDefaultAccountPrompt(accountName);
|
|
136
137
|
uiLogger.success(commands.auth.success.configFileUpdated(accountName, DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME, successAuthMethod));
|
|
137
|
-
|
|
138
|
+
logUiFeatureHighlight([
|
|
138
139
|
'getStartedCommand',
|
|
139
140
|
'accountsUseCommand',
|
|
140
141
|
'accountOption',
|
|
@@ -1,48 +1,16 @@
|
|
|
1
|
-
import fs from 'fs-extra';
|
|
2
|
-
import { logError } from '../../../lib/errorHandlers/index.js';
|
|
3
|
-
import { resolveLocalPath } from '../../../lib/filesystem.js';
|
|
4
1
|
import { commands } from '../../../lang/en.js';
|
|
5
|
-
import { uiLogger } from '../../../lib/ui/logger.js';
|
|
6
2
|
import { HTTP_METHODS } from '../../../types/Cms.js';
|
|
7
3
|
import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
|
|
8
4
|
import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
|
|
9
5
|
import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
|
|
10
|
-
import {
|
|
11
|
-
import assets from '../../../lib/cmsAssets/index.js';
|
|
6
|
+
import { logServerlessCreationBlocked } from '../../../lib/serverlessSunset.js';
|
|
12
7
|
const command = 'create [name] [dest]';
|
|
13
8
|
const describe = commands.cms.subcommands.function.subcommands.create.describe;
|
|
14
9
|
async function handler(args) {
|
|
15
|
-
const {
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
const argsToPass = {
|
|
20
|
-
commandArgs: args,
|
|
21
|
-
assetType,
|
|
22
|
-
name,
|
|
23
|
-
dest,
|
|
24
|
-
};
|
|
25
|
-
if (!argsToPass.dest) {
|
|
26
|
-
argsToPass.dest = resolveLocalPath(asset.dest(argsToPass));
|
|
27
|
-
}
|
|
28
|
-
try {
|
|
29
|
-
await fs.ensureDir(argsToPass.dest);
|
|
30
|
-
}
|
|
31
|
-
catch (e) {
|
|
32
|
-
uiLogger.error(commands.cms.subcommands.function.subcommands.create.errors.unusablePath(argsToPass.dest));
|
|
33
|
-
logError(e);
|
|
34
|
-
return;
|
|
35
|
-
}
|
|
36
|
-
try {
|
|
37
|
-
await asset.execute(argsToPass);
|
|
38
|
-
}
|
|
39
|
-
catch (e) {
|
|
40
|
-
if (isPromptExitError(e)) {
|
|
41
|
-
throw e;
|
|
42
|
-
}
|
|
43
|
-
logError(e);
|
|
44
|
-
return exit(EXIT_CODES.ERROR);
|
|
45
|
-
}
|
|
10
|
+
const { exit, addUsageMetadata } = args;
|
|
11
|
+
addUsageMetadata({ assetType: 'function' });
|
|
12
|
+
logServerlessCreationBlocked('hs cms function create');
|
|
13
|
+
return exit(EXIT_CODES.ERROR);
|
|
46
14
|
}
|
|
47
15
|
function functionCreateBuilder(yargs) {
|
|
48
16
|
yargs.positional('name', {
|
|
@@ -9,13 +9,20 @@ import { outputBuildLog } from '../../../lib/serverlessLogs.js';
|
|
|
9
9
|
import { commands } from '../../../lang/en.js';
|
|
10
10
|
import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
|
|
11
11
|
import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
|
|
12
|
+
import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
|
|
13
|
+
import { isServerlessEditingDisabled, logServerlessDeprecation, logServerlessEditingDisabled, } from '../../../lib/serverlessSunset.js';
|
|
12
14
|
function isFunctionBuildError(e) {
|
|
13
15
|
return (typeof e === 'object' && e !== null && 'status' in e && e.status === 'ERROR');
|
|
14
16
|
}
|
|
15
17
|
const command = 'deploy <path>';
|
|
16
18
|
const describe = undefined; // Hidden command
|
|
17
19
|
async function handler(args) {
|
|
18
|
-
const { path: functionPath, derivedAccountId } = args;
|
|
20
|
+
const { path: functionPath, derivedAccountId, exit } = args;
|
|
21
|
+
if (isServerlessEditingDisabled()) {
|
|
22
|
+
logServerlessEditingDisabled('hs cms function deploy');
|
|
23
|
+
return exit(EXIT_CODES.ERROR);
|
|
24
|
+
}
|
|
25
|
+
logServerlessDeprecation('hs cms function deploy');
|
|
19
26
|
const splitFunctionPath = functionPath.split('.');
|
|
20
27
|
if (!splitFunctionPath.length ||
|
|
21
28
|
splitFunctionPath[splitFunctionPath.length - 1] !== 'functions') {
|
|
@@ -7,10 +7,14 @@ import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
|
|
|
7
7
|
import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
|
|
8
8
|
import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
|
|
9
9
|
import { renderTable } from '../../../ui/render.js';
|
|
10
|
+
import { logServerlessDeprecation } from '../../../lib/serverlessSunset.js';
|
|
10
11
|
const command = ['list', 'ls'];
|
|
11
12
|
const describe = commands.cms.subcommands.function.subcommands.list.describe;
|
|
12
13
|
async function handler(args) {
|
|
13
14
|
const { derivedAccountId, exit } = args;
|
|
15
|
+
if (!args.json) {
|
|
16
|
+
logServerlessDeprecation('hs cms function list');
|
|
17
|
+
}
|
|
14
18
|
uiLogger.debug(commands.cms.subcommands.function.subcommands.list.debug.gettingFunctions);
|
|
15
19
|
let routesResp;
|
|
16
20
|
try {
|
|
@@ -8,6 +8,7 @@ import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHand
|
|
|
8
8
|
import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
|
|
9
9
|
import { uiLogger } from '../../../lib/ui/logger.js';
|
|
10
10
|
import { commands } from '../../../lang/en.js';
|
|
11
|
+
import { logServerlessDeprecation } from '../../../lib/serverlessSunset.js';
|
|
11
12
|
const handleLogsError = (e, accountId, functionPath) => {
|
|
12
13
|
if (isHubSpotHttpError(e) && (e.status === 404 || e.status == 400)) {
|
|
13
14
|
uiLogger.error(commands.cms.subcommands.function.subcommands.logs.errors.noLogsFound(functionPath, accountId));
|
|
@@ -54,6 +55,7 @@ const describe = commands.cms.subcommands.function.subcommands.logs.describe;
|
|
|
54
55
|
const handler = async (options) => {
|
|
55
56
|
const { endpoint: endpointArgValue, latest, derivedAccountId, exit, addUsageMetadata, } = options;
|
|
56
57
|
addUsageMetadata(latest ? { action: 'latest' } : {});
|
|
58
|
+
logServerlessDeprecation('hs cms function logs');
|
|
57
59
|
const { endpointPromptValue } = await promptUser({
|
|
58
60
|
name: 'endpointPromptValue',
|
|
59
61
|
message: commands.cms.subcommands.function.subcommands.logs.endpointPrompt,
|
|
@@ -5,10 +5,16 @@ import { startServerlessDevRuntime } from '../../../lib/cms/serverlessDevRuntime
|
|
|
5
5
|
import { logError } from '../../../lib/errorHandlers/index.js';
|
|
6
6
|
import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
|
|
7
7
|
import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
|
|
8
|
+
import { isServerlessEditingDisabled, logServerlessDeprecation, logServerlessEditingDisabled, } from '../../../lib/serverlessSunset.js';
|
|
8
9
|
const command = 'server <path>';
|
|
9
10
|
const describe = undefined;
|
|
10
11
|
async function handler(args) {
|
|
11
12
|
const { path: functionPath, derivedAccountId, exit } = args;
|
|
13
|
+
if (isServerlessEditingDisabled()) {
|
|
14
|
+
logServerlessEditingDisabled('hs cms function server');
|
|
15
|
+
return exit(EXIT_CODES.ERROR);
|
|
16
|
+
}
|
|
17
|
+
logServerlessDeprecation('hs cms function server');
|
|
12
18
|
uiLogger.debug(commands.cms.subcommands.function.subcommands.server.debug.startingServer(functionPath));
|
|
13
19
|
try {
|
|
14
20
|
await startServerlessDevRuntime({
|
|
@@ -113,7 +113,7 @@ async function handler(args) {
|
|
|
113
113
|
desktopScoreStatus = data;
|
|
114
114
|
}
|
|
115
115
|
let mobileScoreStatus = 'COMPLETED';
|
|
116
|
-
if (
|
|
116
|
+
if (includeMobileScore) {
|
|
117
117
|
const { data } = await getLighthouseScoreStatus(derivedAccountId, {
|
|
118
118
|
themeId: requestResult.mobileId,
|
|
119
119
|
});
|
package/commands/cms/upload.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import fs from 'fs';
|
|
2
2
|
import path from 'path';
|
|
3
3
|
import { uploadFolder, hasUploadErrors, } from '@hubspot/local-dev-lib/cms/uploadFolder';
|
|
4
|
+
import { FILE_UPLOAD_RESULT_TYPES } from '@hubspot/local-dev-lib/constants/files';
|
|
4
5
|
import { getFileMapperQueryValues } from '@hubspot/local-dev-lib/fileMapper';
|
|
5
6
|
import { upload, deleteFile } from '@hubspot/local-dev-lib/api/fileMapper';
|
|
6
7
|
import { getCwd, convertToUnixPath, isAllowedExtension, } from '@hubspot/local-dev-lib/path';
|
|
@@ -19,6 +20,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
|
|
|
19
20
|
import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
|
|
20
21
|
import { makeYargsBuilder } from '../../lib/yargsUtils.js';
|
|
21
22
|
import { uiLogger } from '../../lib/ui/logger.js';
|
|
23
|
+
import { logServerlessUploadBlockedHint } from '../../lib/serverlessSunset.js';
|
|
22
24
|
const command = 'upload [src] [dest]';
|
|
23
25
|
const describe = commands.cms.subcommands.upload.describe;
|
|
24
26
|
function logThemePreview(filePath, accountId) {
|
|
@@ -104,6 +106,7 @@ async function handler(args) {
|
|
|
104
106
|
request: normalizedDest,
|
|
105
107
|
payload: src,
|
|
106
108
|
}));
|
|
109
|
+
logServerlessUploadBlockedHint([src]);
|
|
107
110
|
return exit(EXIT_CODES.WARNING);
|
|
108
111
|
})
|
|
109
112
|
.finally(() => {
|
|
@@ -150,6 +153,9 @@ async function handler(args) {
|
|
|
150
153
|
}
|
|
151
154
|
else {
|
|
152
155
|
uiLogger.error(commands.cms.subcommands.upload.errors.someFilesFailed(dest));
|
|
156
|
+
logServerlessUploadBlockedHint(results
|
|
157
|
+
.filter(result => result.resultType === FILE_UPLOAD_RESULT_TYPES.FAILURE)
|
|
158
|
+
.map(result => result.file));
|
|
153
159
|
return exit(EXIT_CODES.WARNING);
|
|
154
160
|
}
|
|
155
161
|
})
|
package/commands/cms/watch.js
CHANGED
|
@@ -12,6 +12,7 @@ import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
|
|
|
12
12
|
import { makeYargsBuilder } from '../../lib/yargsUtils.js';
|
|
13
13
|
import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
|
|
14
14
|
import { uiLogger } from '../../lib/ui/logger.js';
|
|
15
|
+
import { logServerlessUploadBlockedHint } from '../../lib/serverlessSunset.js';
|
|
15
16
|
const command = 'watch [src] [dest]';
|
|
16
17
|
const describe = commands.cms.subcommands.watch.describe;
|
|
17
18
|
const handler = async (args) => {
|
|
@@ -57,6 +58,7 @@ const handler = async (args) => {
|
|
|
57
58
|
request: destPath,
|
|
58
59
|
payload: file,
|
|
59
60
|
}));
|
|
61
|
+
logServerlessUploadBlockedHint([file]);
|
|
60
62
|
};
|
|
61
63
|
watch(derivedAccountId, absoluteSrcPath, dest, {
|
|
62
64
|
cmsPublishMode,
|
|
@@ -1,42 +1,15 @@
|
|
|
1
|
-
import fs from 'fs-extra';
|
|
2
|
-
import { logError } from '../../../lib/errorHandlers/index.js';
|
|
3
|
-
import { resolveLocalPath } from '../../../lib/filesystem.js';
|
|
4
1
|
import { commands } from '../../../lang/en.js';
|
|
5
|
-
import { uiLogger } from '../../../lib/ui/logger.js';
|
|
6
2
|
import { makeYargsBuilder } from '../../../lib/yargsUtils.js';
|
|
7
3
|
import { makeWrappedYargsHandler } from '../../../lib/yargs/makeWrappedYargsHandler.js';
|
|
8
4
|
import { EXIT_CODES } from '../../../lib/enums/exitCodes.js';
|
|
9
|
-
import
|
|
5
|
+
import { logServerlessCreationBlocked } from '../../../lib/serverlessSunset.js';
|
|
10
6
|
const command = 'create [dest]';
|
|
11
7
|
const describe = commands.cms.subcommands.webpack.subcommands.create.describe;
|
|
12
8
|
async function handler(args) {
|
|
13
|
-
const {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
const argsToPass = {
|
|
18
|
-
commandArgs: args,
|
|
19
|
-
assetType,
|
|
20
|
-
dest,
|
|
21
|
-
};
|
|
22
|
-
if (!argsToPass.dest) {
|
|
23
|
-
argsToPass.dest = resolveLocalPath(asset.dest(argsToPass));
|
|
24
|
-
}
|
|
25
|
-
try {
|
|
26
|
-
await fs.ensureDir(argsToPass.dest);
|
|
27
|
-
}
|
|
28
|
-
catch (e) {
|
|
29
|
-
uiLogger.error(commands.cms.subcommands.webpack.subcommands.create.errors.unusablePath(argsToPass.dest));
|
|
30
|
-
logError(e);
|
|
31
|
-
return;
|
|
32
|
-
}
|
|
33
|
-
try {
|
|
34
|
-
await asset.execute(argsToPass);
|
|
35
|
-
}
|
|
36
|
-
catch (e) {
|
|
37
|
-
logError(e);
|
|
38
|
-
return exit(EXIT_CODES.ERROR);
|
|
39
|
-
}
|
|
9
|
+
const { exit, addUsageMetadata } = args;
|
|
10
|
+
addUsageMetadata({ assetType: 'webpack-serverless' });
|
|
11
|
+
logServerlessCreationBlocked('hs cms webpack create');
|
|
12
|
+
return exit(EXIT_CODES.ERROR);
|
|
40
13
|
}
|
|
41
14
|
function webpackCreateBuilder(yargs) {
|
|
42
15
|
yargs.positional('dest', {
|
package/commands/customObject.js
CHANGED
|
@@ -10,9 +10,9 @@ import { uiBetaTag } from '../lib/ui/index.js';
|
|
|
10
10
|
import { makeYargsBuilder } from '../lib/yargsUtils.js';
|
|
11
11
|
import { uiLogger } from '../lib/ui/logger.js';
|
|
12
12
|
const command = ['custom-object', 'custom-objects', 'co'];
|
|
13
|
-
const describe = uiBetaTag(commands.customObject.describe
|
|
13
|
+
const describe = uiBetaTag(commands.customObject.describe);
|
|
14
14
|
function logBetaMessage() {
|
|
15
|
-
uiBetaTag(commands.customObject.betaMessage);
|
|
15
|
+
uiLogger.log(uiBetaTag(commands.customObject.betaMessage));
|
|
16
16
|
uiLogger.log(commands.customObject.seeMoreLink);
|
|
17
17
|
}
|
|
18
18
|
function customObjectBuilder(yargs) {
|
package/commands/feedback.d.ts
CHANGED
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
import { CommonArgs, YargsCommandModule } from '../types/Yargs.js';
|
|
2
|
-
|
|
1
|
+
import { AccountArgs, CommonArgs, ConfigArgs, EnvironmentArgs, YargsCommandModule } from '../types/Yargs.js';
|
|
2
|
+
import { FeedbackSource } from '../api/feedback.js';
|
|
3
|
+
type FeedbackArgs = CommonArgs & ConfigArgs & AccountArgs & EnvironmentArgs & {
|
|
4
|
+
message?: string;
|
|
5
|
+
source: FeedbackSource;
|
|
6
|
+
};
|
|
3
7
|
declare const feedbackCommand: YargsCommandModule<unknown, FeedbackArgs>;
|
|
4
8
|
export default feedbackCommand;
|
package/commands/feedback.js
CHANGED
|
@@ -5,25 +5,99 @@ import { makeYargsBuilder } from '../lib/yargsUtils.js';
|
|
|
5
5
|
import { EXIT_CODES } from '../lib/enums/exitCodes.js';
|
|
6
6
|
import { commands } from '../lang/en.js';
|
|
7
7
|
import { uiLogger } from '../lib/ui/logger.js';
|
|
8
|
-
import {
|
|
8
|
+
import { ApiErrorContext, logError } from '../lib/errorHandlers/index.js';
|
|
9
|
+
import { FEEDBACK_SOURCE_ENV_VAR, FEEDBACK_URL, MAX_FEEDBACK_LENGTH, } from '../lib/constants.js';
|
|
10
|
+
import { FEEDBACK_SOURCES } from '../api/feedback.js';
|
|
11
|
+
import { containsAccountCredentials, submitFeedback } from '../lib/feedback.js';
|
|
9
12
|
const command = 'feedback';
|
|
10
13
|
const describe = commands.project.feedback.describe;
|
|
11
14
|
async function handler(args) {
|
|
12
|
-
const { exit } = args;
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
15
|
+
const { message, source, derivedAccountId, addUsageMetadata, exit } = args;
|
|
16
|
+
if (message === undefined) {
|
|
17
|
+
if (!process.stdin.isTTY) {
|
|
18
|
+
uiLogger.log(commands.project.feedback.nonInteractive(FEEDBACK_URL));
|
|
19
|
+
return exit(EXIT_CODES.SUCCESS);
|
|
20
|
+
}
|
|
21
|
+
const shouldOpen = await confirmPrompt(commands.project.feedback.openPrompt);
|
|
22
|
+
if (!shouldOpen) {
|
|
23
|
+
uiLogger.log(commands.project.feedback.error(FEEDBACK_URL));
|
|
24
|
+
return exit(EXIT_CODES.SUCCESS);
|
|
25
|
+
}
|
|
26
|
+
addUsageMetadata({ action: 'open-form' });
|
|
27
|
+
open(FEEDBACK_URL, { url: true });
|
|
28
|
+
uiLogger.success(commands.project.feedback.success(FEEDBACK_URL));
|
|
16
29
|
return exit(EXIT_CODES.SUCCESS);
|
|
17
30
|
}
|
|
18
|
-
|
|
19
|
-
|
|
31
|
+
addUsageMetadata({ action: 'submit', type: source });
|
|
32
|
+
const feedback = message.trim();
|
|
33
|
+
if (!feedback) {
|
|
34
|
+
uiLogger.error(commands.project.feedback.errors.blankMessage);
|
|
35
|
+
return exit(EXIT_CODES.ERROR);
|
|
36
|
+
}
|
|
37
|
+
if (feedback.length > MAX_FEEDBACK_LENGTH) {
|
|
38
|
+
uiLogger.error(commands.project.feedback.errors.messageTooLong(feedback.length));
|
|
39
|
+
return exit(EXIT_CODES.ERROR);
|
|
40
|
+
}
|
|
41
|
+
if (!derivedAccountId) {
|
|
42
|
+
uiLogger.error(commands.project.feedback.errors.noAccount);
|
|
43
|
+
return exit(EXIT_CODES.ERROR);
|
|
44
|
+
}
|
|
45
|
+
if (containsAccountCredentials(feedback)) {
|
|
46
|
+
uiLogger.error(commands.project.feedback.errors.containsCredentials);
|
|
47
|
+
return exit(EXIT_CODES.ERROR);
|
|
48
|
+
}
|
|
49
|
+
try {
|
|
50
|
+
await submitFeedback(derivedAccountId, feedback, source);
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
uiLogger.error(commands.project.feedback.errors.submitFailed);
|
|
54
|
+
logError(error, new ApiErrorContext({
|
|
55
|
+
accountId: derivedAccountId,
|
|
56
|
+
request: 'submit feedback',
|
|
57
|
+
}));
|
|
58
|
+
return exit(EXIT_CODES.ERROR);
|
|
59
|
+
}
|
|
60
|
+
uiLogger.success(commands.project.feedback.submitSuccess);
|
|
20
61
|
return exit(EXIT_CODES.SUCCESS);
|
|
21
62
|
}
|
|
22
63
|
function feedbackBuilder(yargs) {
|
|
64
|
+
yargs.options({
|
|
65
|
+
message: {
|
|
66
|
+
alias: 'm',
|
|
67
|
+
describe: commands.project.feedback.options.message.describe,
|
|
68
|
+
type: 'string',
|
|
69
|
+
},
|
|
70
|
+
source: {
|
|
71
|
+
describe: commands.project.feedback.options.source.describe,
|
|
72
|
+
type: 'string',
|
|
73
|
+
choices: FEEDBACK_SOURCES,
|
|
74
|
+
default: process.env[FEEDBACK_SOURCE_ENV_VAR]?.trim().toLowerCase() || undefined,
|
|
75
|
+
},
|
|
76
|
+
});
|
|
77
|
+
yargs.check(argv => {
|
|
78
|
+
if (argv.message !== undefined && !argv.source) {
|
|
79
|
+
throw new Error(commands.project.feedback.errors.sourceRequired);
|
|
80
|
+
}
|
|
81
|
+
return true;
|
|
82
|
+
});
|
|
83
|
+
yargs.example([
|
|
84
|
+
['$0 feedback', commands.project.feedback.examples.openForm],
|
|
85
|
+
[
|
|
86
|
+
'$0 feedback --message "<message>" --source=user',
|
|
87
|
+
commands.project.feedback.examples.submit,
|
|
88
|
+
],
|
|
89
|
+
[
|
|
90
|
+
'$0 feedback --message "<message>" --source=agent',
|
|
91
|
+
commands.project.feedback.examples.submitAsAgent,
|
|
92
|
+
],
|
|
93
|
+
]);
|
|
23
94
|
return yargs;
|
|
24
95
|
}
|
|
25
|
-
const builder = makeYargsBuilder(feedbackBuilder, command,
|
|
96
|
+
const builder = makeYargsBuilder(feedbackBuilder, command, commands.project.feedback.verboseDescribe, {
|
|
26
97
|
useGlobalOptions: true,
|
|
98
|
+
useConfigOptions: true,
|
|
99
|
+
useAccountOptions: true,
|
|
100
|
+
useEnvironmentOptions: true,
|
|
27
101
|
});
|
|
28
102
|
const feedbackCommand = {
|
|
29
103
|
command,
|
package/commands/getStarted.js
CHANGED
|
@@ -11,7 +11,7 @@ import { getProjectConfig, writeProjectConfig, ProjectConfigValidationError, } f
|
|
|
11
11
|
import { handleProjectUpload } from '../lib/projects/upload.js';
|
|
12
12
|
import { projectNameAndDestPrompt } from '../lib/prompts/projectNameAndDestPrompt.js';
|
|
13
13
|
import { promptUser } from '../lib/prompts/promptUtils.js';
|
|
14
|
-
import { uiAccountDescription,
|
|
14
|
+
import { uiAccountDescription, logUiFeatureHighlight, logUiInfoSection, } from '../lib/ui/index.js';
|
|
15
15
|
import { uiLogger } from '../lib/ui/logger.js';
|
|
16
16
|
import { trackCommandMetadataUsage } from '../lib/usageTracking.js';
|
|
17
17
|
import { makeYargsBuilder } from '../lib/yargsUtils.js';
|
|
@@ -44,7 +44,7 @@ async function handler(args) {
|
|
|
44
44
|
return exit(EXIT_CODES.ERROR);
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
|
|
47
|
+
logUiInfoSection(commands.getStarted.startTitle, () => {
|
|
48
48
|
uiLogger.log(commands.getStarted.startDescription);
|
|
49
49
|
uiLogger.log(commands.getStarted.guideOverview(accountName));
|
|
50
50
|
});
|
|
@@ -251,7 +251,7 @@ async function handler(args) {
|
|
|
251
251
|
}
|
|
252
252
|
}
|
|
253
253
|
uiLogger.log(' ');
|
|
254
|
-
|
|
254
|
+
logUiFeatureHighlight(['projectDevCommand']);
|
|
255
255
|
}
|
|
256
256
|
}
|
|
257
257
|
catch (err) {
|
|
@@ -268,7 +268,7 @@ async function handler(args) {
|
|
|
268
268
|
}
|
|
269
269
|
else {
|
|
270
270
|
uiLogger.log(' ');
|
|
271
|
-
|
|
271
|
+
logUiFeatureHighlight(['projectUploadCommand', 'projectDevCommand']);
|
|
272
272
|
return exit(EXIT_CODES.SUCCESS);
|
|
273
273
|
}
|
|
274
274
|
}
|
package/commands/hubdb/list.js
CHANGED
|
@@ -2,7 +2,7 @@ import { fetchTables } from '@hubspot/local-dev-lib/api/hubdb';
|
|
|
2
2
|
import { makeWrappedYargsHandler } from '../../lib/yargs/makeWrappedYargsHandler.js';
|
|
3
3
|
import { EXIT_CODES } from '../../lib/enums/exitCodes.js';
|
|
4
4
|
import { uiLogger } from '../../lib/ui/logger.js';
|
|
5
|
-
import {
|
|
5
|
+
import { logUiLine } from '../../lib/ui/index.js';
|
|
6
6
|
import { logError } from '../../lib/errorHandlers/index.js';
|
|
7
7
|
import { commands } from '../../lang/en.js';
|
|
8
8
|
import { makeYargsBuilder } from '../../lib/yargsUtils.js';
|
|
@@ -51,7 +51,7 @@ async function handler(args) {
|
|
|
51
51
|
renderTable(tableHeader, tableUIData);
|
|
52
52
|
// if truncated is 0, it will be interpreted as falsy
|
|
53
53
|
const truncated = total - tables.length;
|
|
54
|
-
|
|
54
|
+
logUiLine();
|
|
55
55
|
uiLogger.log(commands.hubdb.subcommands.list.tablesDisplayed(tables.length, total, truncated));
|
|
56
56
|
}
|
|
57
57
|
else {
|