@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,104 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { lib } from '../../lang/en.js';
|
|
4
|
+
export const ARCHIVE_DIR_NAME = 'archive';
|
|
5
|
+
export const ROOT_SRC_DIR = '.';
|
|
6
|
+
const ROOT_ENTRIES_KEPT_IN_PLACE = new Set([
|
|
7
|
+
'.git',
|
|
8
|
+
'node_modules',
|
|
9
|
+
'dist',
|
|
10
|
+
'hsproject.json',
|
|
11
|
+
]);
|
|
12
|
+
export function getArchiveDest(projectDir, srcDir) {
|
|
13
|
+
if (srcDir === ROOT_SRC_DIR) {
|
|
14
|
+
return path.join(path.dirname(projectDir), `${path.basename(projectDir)}-${ARCHIVE_DIR_NAME}`);
|
|
15
|
+
}
|
|
16
|
+
return path.join(projectDir, ARCHIVE_DIR_NAME);
|
|
17
|
+
}
|
|
18
|
+
export function archiveDestExists(archiveDest) {
|
|
19
|
+
return fs.existsSync(archiveDest);
|
|
20
|
+
}
|
|
21
|
+
export function archiveProjectSource(projectDir, srcDir) {
|
|
22
|
+
const archiveDest = getArchiveDest(projectDir, srcDir);
|
|
23
|
+
fs.renameSync(path.join(projectDir, srcDir), archiveDest);
|
|
24
|
+
return archiveDest;
|
|
25
|
+
}
|
|
26
|
+
export function getProjectArchiveDest(projectDir) {
|
|
27
|
+
return path.join(projectDir, ARCHIVE_DIR_NAME);
|
|
28
|
+
}
|
|
29
|
+
function assertSrcDirOutsideArchive(projectDir, srcDir) {
|
|
30
|
+
const archiveDest = path.resolve(getProjectArchiveDest(projectDir));
|
|
31
|
+
const srcPath = path.resolve(projectDir, srcDir);
|
|
32
|
+
const isInsideArchive = srcPath === archiveDest || srcPath.startsWith(archiveDest + path.sep);
|
|
33
|
+
if (isInsideArchive) {
|
|
34
|
+
throw new Error(lib.projects.archive.errors.srcDirInsideArchive(srcDir));
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
function assertArchiveExists(archiveDest) {
|
|
38
|
+
if (!fs.existsSync(archiveDest)) {
|
|
39
|
+
throw new Error(lib.projects.archive.errors.archiveNotFound(archiveDest));
|
|
40
|
+
}
|
|
41
|
+
}
|
|
42
|
+
function getMovableRootEntries(projectDir) {
|
|
43
|
+
return fs
|
|
44
|
+
.readdirSync(projectDir)
|
|
45
|
+
.filter(name => name !== ARCHIVE_DIR_NAME && !ROOT_ENTRIES_KEPT_IN_PLACE.has(name));
|
|
46
|
+
}
|
|
47
|
+
function moveEntries(names, fromDir, toDir) {
|
|
48
|
+
const moved = [];
|
|
49
|
+
try {
|
|
50
|
+
names.forEach(name => {
|
|
51
|
+
fs.renameSync(path.join(fromDir, name), path.join(toDir, name));
|
|
52
|
+
moved.push(name);
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
catch (error) {
|
|
56
|
+
moved.forEach(name => {
|
|
57
|
+
fs.renameSync(path.join(toDir, name), path.join(fromDir, name));
|
|
58
|
+
});
|
|
59
|
+
throw error;
|
|
60
|
+
}
|
|
61
|
+
return moved;
|
|
62
|
+
}
|
|
63
|
+
function archiveRootEntries(projectDir, archiveDest) {
|
|
64
|
+
fs.mkdirSync(archiveDest);
|
|
65
|
+
try {
|
|
66
|
+
moveEntries(getMovableRootEntries(projectDir), projectDir, archiveDest);
|
|
67
|
+
}
|
|
68
|
+
catch (error) {
|
|
69
|
+
fs.rmdirSync(archiveDest);
|
|
70
|
+
throw error;
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
export function moveSourceToProjectArchive(projectDir, srcDir) {
|
|
74
|
+
assertSrcDirOutsideArchive(projectDir, srcDir);
|
|
75
|
+
const archiveDest = getProjectArchiveDest(projectDir);
|
|
76
|
+
if (srcDir === ROOT_SRC_DIR) {
|
|
77
|
+
archiveRootEntries(projectDir, archiveDest);
|
|
78
|
+
return archiveDest;
|
|
79
|
+
}
|
|
80
|
+
fs.renameSync(path.join(projectDir, srcDir), archiveDest);
|
|
81
|
+
return archiveDest;
|
|
82
|
+
}
|
|
83
|
+
function restoreRootEntries(projectDir, archiveDest) {
|
|
84
|
+
getMovableRootEntries(projectDir).forEach(name => {
|
|
85
|
+
fs.rmSync(path.join(projectDir, name), { recursive: true, force: true });
|
|
86
|
+
});
|
|
87
|
+
fs.readdirSync(archiveDest).forEach(name => {
|
|
88
|
+
fs.cpSync(path.join(archiveDest, name), path.join(projectDir, name), {
|
|
89
|
+
recursive: true,
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
}
|
|
93
|
+
export function restoreSourceFromProjectArchive(projectDir, srcDir) {
|
|
94
|
+
const archiveDest = getProjectArchiveDest(projectDir);
|
|
95
|
+
assertArchiveExists(archiveDest);
|
|
96
|
+
assertSrcDirOutsideArchive(projectDir, srcDir);
|
|
97
|
+
if (srcDir === ROOT_SRC_DIR) {
|
|
98
|
+
restoreRootEntries(projectDir, archiveDest);
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
101
|
+
const srcPath = path.join(projectDir, srcDir);
|
|
102
|
+
fs.rmSync(srcPath, { recursive: true, force: true });
|
|
103
|
+
fs.cpSync(archiveDest, srcPath, { recursive: true });
|
|
104
|
+
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export declare function getFilesOnlyInArchive(projectDir: string, srcDir: string): Promise<string[]>;
|
|
2
|
+
export declare function writeArchiveDiffFile(archiveDest: string, files: string[]): string;
|
|
3
|
+
type FailedFileCopy = {
|
|
4
|
+
file: string;
|
|
5
|
+
error: unknown;
|
|
6
|
+
};
|
|
7
|
+
type CopyArchivedFilesResult = {
|
|
8
|
+
copiedCount: number;
|
|
9
|
+
failures: FailedFileCopy[];
|
|
10
|
+
};
|
|
11
|
+
export declare function copyArchivedFilesToSource(projectDir: string, srcDir: string, files: string[]): CopyArchivedFilesResult;
|
|
12
|
+
export {};
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
import fs from 'fs';
|
|
2
|
+
import path from 'path';
|
|
3
|
+
import { ARCHIVE_DIR_NAME, ROOT_SRC_DIR, getProjectArchiveDest, } from './archive.js';
|
|
4
|
+
const DIFF_FILE_NAME = 'diff.json';
|
|
5
|
+
const IGNORED_DIR_NAMES = new Set(['node_modules', 'dist', '.git']);
|
|
6
|
+
function toPosixPath(filePath) {
|
|
7
|
+
return filePath.split(path.sep).join('/');
|
|
8
|
+
}
|
|
9
|
+
function isIgnoredDir(entry, { rootDir, currentDir, ignoredRootEntry }) {
|
|
10
|
+
const isIgnoredRootEntry = currentDir === rootDir && entry.name === ignoredRootEntry;
|
|
11
|
+
return isIgnoredRootEntry || IGNORED_DIR_NAMES.has(entry.name);
|
|
12
|
+
}
|
|
13
|
+
async function listEntryFiles(options, entry) {
|
|
14
|
+
const { rootDir, currentDir = rootDir } = options;
|
|
15
|
+
const entryPath = path.join(currentDir, entry.name);
|
|
16
|
+
if (entry.isDirectory() && !isIgnoredDir(entry, { ...options, currentDir })) {
|
|
17
|
+
return listFiles({ ...options, currentDir: entryPath });
|
|
18
|
+
}
|
|
19
|
+
if (entry.isFile()) {
|
|
20
|
+
return [toPosixPath(path.relative(rootDir, entryPath))];
|
|
21
|
+
}
|
|
22
|
+
return [];
|
|
23
|
+
}
|
|
24
|
+
async function listFiles(options) {
|
|
25
|
+
const { rootDir, currentDir = rootDir } = options;
|
|
26
|
+
if (!fs.existsSync(currentDir)) {
|
|
27
|
+
return [];
|
|
28
|
+
}
|
|
29
|
+
const entries = await fs.promises.readdir(currentDir, {
|
|
30
|
+
withFileTypes: true,
|
|
31
|
+
});
|
|
32
|
+
const nestedFiles = await Promise.all(entries.map(entry => listEntryFiles({ ...options, currentDir }, entry)));
|
|
33
|
+
return nestedFiles.flat();
|
|
34
|
+
}
|
|
35
|
+
export async function getFilesOnlyInArchive(projectDir, srcDir) {
|
|
36
|
+
const archiveFiles = await listFiles({
|
|
37
|
+
rootDir: getProjectArchiveDest(projectDir),
|
|
38
|
+
});
|
|
39
|
+
const downloadedFiles = new Set(await listFiles({
|
|
40
|
+
rootDir: path.join(projectDir, srcDir),
|
|
41
|
+
ignoredRootEntry: srcDir === ROOT_SRC_DIR ? ARCHIVE_DIR_NAME : undefined,
|
|
42
|
+
}));
|
|
43
|
+
return archiveFiles.filter(file => !downloadedFiles.has(file)).sort();
|
|
44
|
+
}
|
|
45
|
+
export function writeArchiveDiffFile(archiveDest, files) {
|
|
46
|
+
const diffFilePath = path.join(archiveDest, DIFF_FILE_NAME);
|
|
47
|
+
fs.writeFileSync(diffFilePath, `${JSON.stringify(files, null, 2)}\n`);
|
|
48
|
+
return diffFilePath;
|
|
49
|
+
}
|
|
50
|
+
function copyArchivedFile(archiveDest, srcPath, file) {
|
|
51
|
+
const destination = path.join(srcPath, file);
|
|
52
|
+
fs.mkdirSync(path.dirname(destination), { recursive: true });
|
|
53
|
+
fs.copyFileSync(path.join(archiveDest, file), destination, fs.constants.COPYFILE_EXCL);
|
|
54
|
+
}
|
|
55
|
+
export function copyArchivedFilesToSource(projectDir, srcDir, files) {
|
|
56
|
+
const archiveDest = getProjectArchiveDest(projectDir);
|
|
57
|
+
const srcPath = path.join(projectDir, srcDir);
|
|
58
|
+
const failures = [];
|
|
59
|
+
files.forEach(file => {
|
|
60
|
+
try {
|
|
61
|
+
copyArchivedFile(archiveDest, srcPath, file);
|
|
62
|
+
}
|
|
63
|
+
catch (error) {
|
|
64
|
+
failures.push({ file, error });
|
|
65
|
+
}
|
|
66
|
+
});
|
|
67
|
+
return { copiedCount: files.length - failures.length, failures };
|
|
68
|
+
}
|
package/lib/projects/config.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import fs from 'fs-extra';
|
|
2
2
|
import path from 'path';
|
|
3
|
-
import findup from 'findup
|
|
3
|
+
import { findup } from '@hubspot/local-dev-lib/findup';
|
|
4
4
|
import { getAbsoluteFilePath, getCwd } from '@hubspot/local-dev-lib/path';
|
|
5
5
|
import { parseProjectConfig, ProjectConfigValidationError, } from '@hubspot/project-parsing-lib/projects';
|
|
6
6
|
import { PROJECT_CONFIG_FILE } from '../constants.js';
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
export type LocalProject = {
|
|
2
|
+
projectName: string;
|
|
3
|
+
projectDir: string;
|
|
4
|
+
srcDir: string;
|
|
5
|
+
};
|
|
6
|
+
export type ArchivePlan = {
|
|
7
|
+
projectDir: string;
|
|
8
|
+
srcDir: string;
|
|
9
|
+
archiveDest: string;
|
|
10
|
+
};
|
|
11
|
+
type DownloadDestination = {
|
|
12
|
+
absoluteDestPath: string;
|
|
13
|
+
archivePlan?: ArchivePlan;
|
|
14
|
+
};
|
|
15
|
+
type ResolveDownloadDestinationOptions = {
|
|
16
|
+
projectName: string;
|
|
17
|
+
dest?: string;
|
|
18
|
+
localProject?: LocalProject;
|
|
19
|
+
};
|
|
20
|
+
export declare function getLocalProject(): LocalProject | undefined;
|
|
21
|
+
export declare function resolveDownloadDestination({ projectName, dest, localProject, }: ResolveDownloadDestinationOptions): DownloadDestination;
|
|
22
|
+
export declare function getDisplayPath(absolutePath: string): string;
|
|
23
|
+
export declare function describeArchiveLocation({ archiveDest }: ArchivePlan): string;
|
|
24
|
+
type HandleArchivedSourceOptions = {
|
|
25
|
+
archivePlan: ArchivePlan;
|
|
26
|
+
keepLocalFiles?: boolean;
|
|
27
|
+
canPrompt: boolean;
|
|
28
|
+
};
|
|
29
|
+
export declare function handleArchivedSource({ archivePlan, keepLocalFiles, canPrompt, }: HandleArchivedSourceOptions): Promise<void>;
|
|
30
|
+
type ExtractBuildOptions = {
|
|
31
|
+
zippedProject: Buffer;
|
|
32
|
+
projectName: string;
|
|
33
|
+
absoluteDestPath: string;
|
|
34
|
+
archivePlan?: ArchivePlan;
|
|
35
|
+
};
|
|
36
|
+
export declare function extractBuild({ zippedProject, projectName, absoluteDestPath, archivePlan, }: ExtractBuildOptions): Promise<void>;
|
|
37
|
+
export {};
|
|
@@ -0,0 +1,123 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { getCwd, sanitizeFileName } from '@hubspot/local-dev-lib/path';
|
|
3
|
+
import { extractZipArchive } from '@hubspot/local-dev-lib/archive';
|
|
4
|
+
import { commands } from '../../lang/en.js';
|
|
5
|
+
import { debugError } from '../errorHandlers/index.js';
|
|
6
|
+
import { confirmPrompt } from '../prompts/promptUtils.js';
|
|
7
|
+
import { uiLogger } from '../ui/logger.js';
|
|
8
|
+
import { getIsInProject, getProjectConfig } from './config.js';
|
|
9
|
+
import { getProjectArchiveDest, restoreSourceFromProjectArchive, } from './archive.js';
|
|
10
|
+
import { copyArchivedFilesToSource, getFilesOnlyInArchive, writeArchiveDiffFile, } from './archiveDiff.js';
|
|
11
|
+
const MAX_LISTED_ARCHIVE_ONLY_FILES = 25;
|
|
12
|
+
export function getLocalProject() {
|
|
13
|
+
if (!getIsInProject()) {
|
|
14
|
+
return undefined;
|
|
15
|
+
}
|
|
16
|
+
const { projectConfig, projectDir } = getProjectConfig();
|
|
17
|
+
return {
|
|
18
|
+
projectName: projectConfig.name,
|
|
19
|
+
projectDir,
|
|
20
|
+
srcDir: projectConfig.srcDir,
|
|
21
|
+
};
|
|
22
|
+
}
|
|
23
|
+
export function resolveDownloadDestination({ projectName, dest, localProject, }) {
|
|
24
|
+
if (localProject && !dest && localProject.projectName === projectName) {
|
|
25
|
+
const { projectDir, srcDir } = localProject;
|
|
26
|
+
return {
|
|
27
|
+
absoluteDestPath: projectDir,
|
|
28
|
+
archivePlan: {
|
|
29
|
+
projectDir,
|
|
30
|
+
srcDir,
|
|
31
|
+
archiveDest: getProjectArchiveDest(projectDir),
|
|
32
|
+
},
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
const sanitizedProjectName = sanitizeFileName(projectName);
|
|
36
|
+
const absoluteDestPath = dest
|
|
37
|
+
? path.resolve(getCwd(), dest, sanitizedProjectName)
|
|
38
|
+
: path.resolve(getCwd(), sanitizedProjectName);
|
|
39
|
+
return { absoluteDestPath };
|
|
40
|
+
}
|
|
41
|
+
export function getDisplayPath(absolutePath) {
|
|
42
|
+
return path.relative(getCwd(), absolutePath) || '.';
|
|
43
|
+
}
|
|
44
|
+
export function describeArchiveLocation({ archiveDest }) {
|
|
45
|
+
return commands.project.download.archiveLocation(getDisplayPath(archiveDest));
|
|
46
|
+
}
|
|
47
|
+
function restoreArchivedSource({ projectDir, srcDir, archiveDest, }) {
|
|
48
|
+
try {
|
|
49
|
+
restoreSourceFromProjectArchive(projectDir, srcDir);
|
|
50
|
+
uiLogger.warn(commands.project.download.warnings.sourceRestored);
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
debugError(error);
|
|
54
|
+
uiLogger.error(commands.project.download.errors.restoreFailed(getDisplayPath(archiveDest)));
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
function tryWriteArchiveDiffFile(archiveDest, files) {
|
|
58
|
+
try {
|
|
59
|
+
return writeArchiveDiffFile(archiveDest, files);
|
|
60
|
+
}
|
|
61
|
+
catch (error) {
|
|
62
|
+
debugError(error);
|
|
63
|
+
return undefined;
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
async function logFilesOnlyInArchive({ projectDir, srcDir, archiveDest, }) {
|
|
67
|
+
let files;
|
|
68
|
+
try {
|
|
69
|
+
files = await getFilesOnlyInArchive(projectDir, srcDir);
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
debugError(error);
|
|
73
|
+
return [];
|
|
74
|
+
}
|
|
75
|
+
if (files.length === 0) {
|
|
76
|
+
return [];
|
|
77
|
+
}
|
|
78
|
+
const diffFilePath = tryWriteArchiveDiffFile(archiveDest, files);
|
|
79
|
+
uiLogger.log('');
|
|
80
|
+
uiLogger.log(commands.project.download.logs.filesOnlyInArchive(files.slice(0, MAX_LISTED_ARCHIVE_ONLY_FILES), Math.max(files.length - MAX_LISTED_ARCHIVE_ONLY_FILES, 0), diffFilePath ? getDisplayPath(diffFilePath) : undefined));
|
|
81
|
+
return files;
|
|
82
|
+
}
|
|
83
|
+
async function shouldCopyFilesBack({ files, keepLocalFiles, canPrompt, }) {
|
|
84
|
+
if (keepLocalFiles !== undefined) {
|
|
85
|
+
return keepLocalFiles;
|
|
86
|
+
}
|
|
87
|
+
if (!canPrompt) {
|
|
88
|
+
return false;
|
|
89
|
+
}
|
|
90
|
+
uiLogger.log('');
|
|
91
|
+
return confirmPrompt(commands.project.download.prompts.confirmCopyFilesBack(files.length));
|
|
92
|
+
}
|
|
93
|
+
async function copyFilesBack(options) {
|
|
94
|
+
const { archivePlan, files } = options;
|
|
95
|
+
if (files.length === 0 || !(await shouldCopyFilesBack(options))) {
|
|
96
|
+
return;
|
|
97
|
+
}
|
|
98
|
+
const { projectDir, srcDir } = archivePlan;
|
|
99
|
+
const { copiedCount, failures } = copyArchivedFilesToSource(projectDir, srcDir, files);
|
|
100
|
+
failures.forEach(({ error }) => debugError(error));
|
|
101
|
+
if (copiedCount > 0) {
|
|
102
|
+
uiLogger.success(commands.project.download.logs.filesCopiedBack(copiedCount, getDisplayPath(path.join(projectDir, srcDir))));
|
|
103
|
+
}
|
|
104
|
+
if (failures.length > 0) {
|
|
105
|
+
uiLogger.warn(commands.project.download.warnings.filesNotCopiedBack(failures.length));
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
export async function handleArchivedSource({ archivePlan, keepLocalFiles, canPrompt, }) {
|
|
109
|
+
uiLogger.info(commands.project.download.logs.sourceContentsArchived(describeArchiveLocation(archivePlan)));
|
|
110
|
+
const files = await logFilesOnlyInArchive(archivePlan);
|
|
111
|
+
await copyFilesBack({ archivePlan, files, keepLocalFiles, canPrompt });
|
|
112
|
+
}
|
|
113
|
+
export async function extractBuild({ zippedProject, projectName, absoluteDestPath, archivePlan, }) {
|
|
114
|
+
try {
|
|
115
|
+
await extractZipArchive(zippedProject, sanitizeFileName(projectName), absoluteDestPath);
|
|
116
|
+
}
|
|
117
|
+
catch (error) {
|
|
118
|
+
if (archivePlan) {
|
|
119
|
+
restoreArchivedSource(archivePlan);
|
|
120
|
+
}
|
|
121
|
+
throw error;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
@@ -3,7 +3,7 @@ import { fetchAppMetadataBySourceId, fetchPublicAppProductionInstallCounts, inst
|
|
|
3
3
|
import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
|
|
4
4
|
import { APP_AUTH_TYPES, APP_DISTRIBUTION_TYPES, APP_INSTALLATION_STATES, LOCAL_DEV_SERVER_MESSAGE_TYPES, } from '../../constants.js';
|
|
5
5
|
import { EXIT_CODES } from '../../enums/exitCodes.js';
|
|
6
|
-
import {
|
|
6
|
+
import { logUiLine } from '../../ui/index.js';
|
|
7
7
|
import { logError } from '../../errorHandlers/index.js';
|
|
8
8
|
import { isPromptExitError } from '../../errors/PromptExitError.js';
|
|
9
9
|
import { installAppAutoPrompt, installAppBrowserPrompt, } from '../../prompts/installAppPrompt.js';
|
|
@@ -118,9 +118,9 @@ class AppDevModeInterface {
|
|
|
118
118
|
text: lib.AppDevModeInterface.fetchAppData.activeInstallations(this.appNode?.config.name || '', this.marketplaceAppInstalls),
|
|
119
119
|
failColor: 'yellow',
|
|
120
120
|
});
|
|
121
|
-
|
|
121
|
+
logUiLine();
|
|
122
122
|
uiLogger.log(lib.LocalDevManager.activeInstallWarning.explanation);
|
|
123
|
-
|
|
123
|
+
logUiLine();
|
|
124
124
|
const proceed = await confirmPrompt(lib.LocalDevManager.activeInstallWarning.confirmationPrompt, { defaultAnswer: false });
|
|
125
125
|
if (!proceed) {
|
|
126
126
|
return this.localDevState.actions.exit(EXIT_CODES.SUCCESS);
|
|
@@ -2,7 +2,7 @@ import { hasLocalStateFlag } from '@hubspot/local-dev-lib/config';
|
|
|
2
2
|
import { getConfigDefaultAccountIfExists, isConfigFlagEnabled, } from '@hubspot/local-dev-lib/config';
|
|
3
3
|
import { CONFIG_FLAGS } from '@hubspot/local-dev-lib/constants/config';
|
|
4
4
|
import { uiLogger } from '../../ui/logger.js';
|
|
5
|
-
import {
|
|
5
|
+
import { logUiLine, uiAccountDescription, uiCommandReference, } from '../../ui/index.js';
|
|
6
6
|
import { lib } from '../../../lang/en.js';
|
|
7
7
|
import SpinniesManager from '../../ui/SpinniesManager.js';
|
|
8
8
|
import { logError, getErrorMessage } from '../../errorHandlers/index.js';
|
|
@@ -105,7 +105,7 @@ class LocalDevLogger {
|
|
|
105
105
|
}
|
|
106
106
|
uiLogger.log('');
|
|
107
107
|
uiLogger.log(lib.LocalDevManager.quitHelper);
|
|
108
|
-
|
|
108
|
+
logUiLine();
|
|
109
109
|
uiLogger.log('');
|
|
110
110
|
}
|
|
111
111
|
cleanupStart() {
|
|
@@ -155,12 +155,12 @@ class LocalDevLogger {
|
|
|
155
155
|
uploadSuccess() {
|
|
156
156
|
uiLogger.log('');
|
|
157
157
|
uiLogger.log(lib.LocalDevProcess.uploadSuccess);
|
|
158
|
-
|
|
158
|
+
logUiLine();
|
|
159
159
|
uiLogger.log('');
|
|
160
160
|
}
|
|
161
161
|
uploadSuccessAutoDeployDisabled() {
|
|
162
162
|
uiLogger.warn(lib.LocalDevProcess.uploadSuccessAutoDeployDisabled);
|
|
163
|
-
|
|
163
|
+
logUiLine();
|
|
164
164
|
uiLogger.log('');
|
|
165
165
|
}
|
|
166
166
|
deployError(error) {
|
|
@@ -174,7 +174,7 @@ class LocalDevLogger {
|
|
|
174
174
|
deploySuccess() {
|
|
175
175
|
uiLogger.log('');
|
|
176
176
|
uiLogger.log(lib.LocalDevProcess.deploySuccess);
|
|
177
|
-
|
|
177
|
+
logUiLine();
|
|
178
178
|
uiLogger.log('');
|
|
179
179
|
}
|
|
180
180
|
monitorConsoleOutput() {
|
|
@@ -7,6 +7,7 @@ const WATCH_EVENTS = {
|
|
|
7
7
|
unlink: 'unlink',
|
|
8
8
|
unlinkDir: 'unlinkDir',
|
|
9
9
|
};
|
|
10
|
+
const IGNORED_DIRECTORIES = ['dist', 'node_modules'];
|
|
10
11
|
class LocalDevWatcher {
|
|
11
12
|
localDevProcess;
|
|
12
13
|
watcher;
|
|
@@ -23,7 +24,7 @@ class LocalDevWatcher {
|
|
|
23
24
|
start() {
|
|
24
25
|
this.watcher = chokidar.watch(this.localDevProcess.projectDir, {
|
|
25
26
|
ignoreInitial: true,
|
|
26
|
-
ignored:
|
|
27
|
+
ignored: filePath => IGNORED_DIRECTORIES.includes(path.basename(filePath)),
|
|
27
28
|
});
|
|
28
29
|
const configPaths = Object.values(this.localDevProcess.projectNodes).map(component => component.localDev.componentConfigPath);
|
|
29
30
|
const projectConfigPath = path.join(this.localDevProcess.projectDir, PROJECT_CONFIG_FILE);
|
|
@@ -12,7 +12,7 @@ import { isSpecifiedError } from '@hubspot/local-dev-lib/errors/index';
|
|
|
12
12
|
import { PROJECT_BUILD_TEXT, PROJECT_CONFIG_FILE, PROJECT_DEPLOY_TEXT, PROJECT_ERROR_TYPES, } from '../../../constants.js';
|
|
13
13
|
import { lib } from '../../../../lang/en.js';
|
|
14
14
|
import { uiLogger } from '../../../ui/logger.js';
|
|
15
|
-
import { uiAccountDescription,
|
|
15
|
+
import { uiAccountDescription, logUiLine } from '../../../ui/index.js';
|
|
16
16
|
import { confirmPrompt } from '../../../prompts/promptUtils.js';
|
|
17
17
|
import SpinniesManager from '../../../ui/SpinniesManager.js';
|
|
18
18
|
import { EXIT_CODES } from '../../../enums/exitCodes.js';
|
|
@@ -32,9 +32,9 @@ export async function createNewProjectForLocalDev(projectConfig, targetAccountId
|
|
|
32
32
|
.projectMustExistExplanation;
|
|
33
33
|
const explanationString = explanationLangFunction(projectConfig.name, targetAccountId);
|
|
34
34
|
uiLogger.log('');
|
|
35
|
-
|
|
35
|
+
logUiLine();
|
|
36
36
|
uiLogger.log(explanationString);
|
|
37
|
-
|
|
37
|
+
logUiLine();
|
|
38
38
|
shouldCreateProject = await confirmPrompt(lib.localDevHelpers.project.createNewProjectForLocalDev.createProject(projectConfig.name, uiAccountDescription(targetAccountId)));
|
|
39
39
|
}
|
|
40
40
|
if (shouldCreateProject) {
|
|
@@ -3,7 +3,7 @@ import { getBuildStatus, getBuildStructure, getDeployStatus, getDeployStructure,
|
|
|
3
3
|
import { DEFAULT_POLLING_DELAY, PROJECT_BUILD_TEXT, PROJECT_DEPLOY_TEXT, PROJECT_TASK_TYPES, PROJECT_ERROR_TYPES, } from '../constants.js';
|
|
4
4
|
import SpinniesManager from '../ui/SpinniesManager.js';
|
|
5
5
|
import { logError, ApiErrorContext } from '../errorHandlers/index.js';
|
|
6
|
-
import {
|
|
6
|
+
import { logUiLine, uiLink, uiAccountDescription } from '../ui/index.js';
|
|
7
7
|
import { getProjectBuildDetailUrl, getProjectDeployDetailUrl, getProjectActivityUrl, } from './urls.js';
|
|
8
8
|
import { lib } from '../../lang/en.js';
|
|
9
9
|
import { uiLogger } from '../ui/logger.js';
|
|
@@ -172,12 +172,12 @@ function makePollTaskStatusFunc({ statusFn, structureFn, statusText, statusStrin
|
|
|
172
172
|
});
|
|
173
173
|
if (!silenceLogs) {
|
|
174
174
|
const failedSubtasks = subtasks.filter(subtask => subtask.status === 'FAILURE');
|
|
175
|
-
|
|
175
|
+
logUiLine();
|
|
176
176
|
uiLogger.log(`${statusStrings.SUBTASK_FAIL(failedSubtasks.length === 1
|
|
177
177
|
? getSubtaskName(failedSubtasks[0])
|
|
178
178
|
: failedSubtasks.length + ' components', displayId)}\n`);
|
|
179
179
|
uiLogger.log(lib.projectBuildAndDeploy.makePollTaskStatusFunc.errorSummary);
|
|
180
|
-
|
|
180
|
+
logUiLine();
|
|
181
181
|
const displayErrors = failedSubtasks.filter(subtask => subtask?.standardError?.subCategory !==
|
|
182
182
|
PROJECT_ERROR_TYPES.SUBBUILD_FAILED &&
|
|
183
183
|
subtask?.standardError?.subCategory !==
|
|
@@ -295,7 +295,7 @@ export async function pollProjectBuildAndDeploy(accountId, projectConfig, tempFi
|
|
|
295
295
|
const { silenceLogs = false, skipDeploy = false } = options;
|
|
296
296
|
let buildStatus = await pollBuildStatus(accountId, projectConfig.name, buildId, null, silenceLogs);
|
|
297
297
|
if (!silenceLogs) {
|
|
298
|
-
|
|
298
|
+
logUiLine();
|
|
299
299
|
}
|
|
300
300
|
const result = {
|
|
301
301
|
succeeded: true,
|
|
@@ -4,7 +4,7 @@ import { APP_KEY, USER_FACING_TO_INTERNAL_TYPE, } from '@hubspot/project-parsing
|
|
|
4
4
|
import { debugError } from '../errorHandlers/index.js';
|
|
5
5
|
import { getProjectDetailUrl } from './urls.js';
|
|
6
6
|
import { commands } from '../../lang/en.js';
|
|
7
|
-
import {
|
|
7
|
+
import { logUiLine, uiLink } from '../ui/index.js';
|
|
8
8
|
import { uiLogger } from '../ui/logger.js';
|
|
9
9
|
export async function getProjectInfo(project, platformVersion, accountId) {
|
|
10
10
|
const deployedBuild = project.deployedBuild;
|
|
@@ -46,7 +46,7 @@ export async function getProjectInfo(project, platformVersion, accountId) {
|
|
|
46
46
|
}
|
|
47
47
|
export function logProjectInfo(projectInfo) {
|
|
48
48
|
uiLogger.log(chalk.bold(commands.project.info.project.title(projectInfo.projectName)));
|
|
49
|
-
|
|
49
|
+
logUiLine();
|
|
50
50
|
uiLogger.log(commands.project.info.project.platformVersion(projectInfo.platformVersion));
|
|
51
51
|
uiLogger.log(commands.project.info.project.id(projectInfo.projectId));
|
|
52
52
|
uiLogger.log(commands.project.info.project.deployedBuild(projectInfo.deployedBuildId));
|
|
@@ -58,7 +58,7 @@ export function logProjectInfo(projectInfo) {
|
|
|
58
58
|
if (projectInfo.app) {
|
|
59
59
|
uiLogger.log('');
|
|
60
60
|
uiLogger.log(chalk.bold(commands.project.info.app.title));
|
|
61
|
-
|
|
61
|
+
logUiLine();
|
|
62
62
|
uiLogger.log(commands.project.info.app.name(projectInfo.app.name));
|
|
63
63
|
uiLogger.log(commands.project.info.app.id(projectInfo.app.id));
|
|
64
64
|
uiLogger.log(commands.project.info.app.uid(projectInfo.app.uid));
|
|
@@ -72,7 +72,7 @@ export function logProjectInfo(projectInfo) {
|
|
|
72
72
|
if (projectInfo.components.length > 0) {
|
|
73
73
|
uiLogger.log('');
|
|
74
74
|
uiLogger.log(chalk.bold(commands.project.info.componentsHeader));
|
|
75
|
-
|
|
75
|
+
logUiLine();
|
|
76
76
|
const typeColWidth = Math.max(commands.project.info.labels.type.length, ...projectInfo.components.map(c => c.type.length));
|
|
77
77
|
uiLogger.log(`${commands.project.info.labels.type.padEnd(typeColWidth)} ${commands.project.info.labels.uid}`);
|
|
78
78
|
for (const component of projectInfo.components) {
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import path from 'path';
|
|
2
2
|
import { loadHsProfileFile, getHsProfileFilename, validateProfileVariables, } from '@hubspot/project-parsing-lib/profiles';
|
|
3
3
|
import { commands, lib } from '../../lang/en.js';
|
|
4
|
-
import { indent,
|
|
4
|
+
import { indent, logUiLine } from '../ui/index.js';
|
|
5
5
|
import { uiLogger } from '../ui/logger.js';
|
|
6
6
|
import { getConfigAccountById } from '@hubspot/local-dev-lib/config';
|
|
7
7
|
import SpinniesManager from '../ui/SpinniesManager.js';
|
|
8
8
|
import { handleTranslate } from './upload.js';
|
|
9
9
|
import { getErrorMessage } from '../errorHandlers/index.js';
|
|
10
10
|
export function logProfileHeader(profileName) {
|
|
11
|
-
|
|
11
|
+
logUiLine();
|
|
12
12
|
uiLogger.log(lib.projectProfiles.logs.usingProfile(getHsProfileFilename(profileName)));
|
|
13
13
|
uiLogger.log('');
|
|
14
14
|
}
|
|
@@ -21,7 +21,7 @@ export function logProfileFooter(profile, includeVariables = false) {
|
|
|
21
21
|
uiLogger.log(` ${key}: ${value}`);
|
|
22
22
|
});
|
|
23
23
|
}
|
|
24
|
-
|
|
24
|
+
logUiLine();
|
|
25
25
|
uiLogger.log('');
|
|
26
26
|
}
|
|
27
27
|
export function loadProfile(projectConfig, projectDir, profileName) {
|
package/lib/projects/ui.js
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import { uiLogger } from '../ui/logger.js';
|
|
2
2
|
import { FEEDBACK_INTERVAL } from '../constants.js';
|
|
3
|
-
import {
|
|
3
|
+
import { logUiLine } from '../ui/index.js';
|
|
4
4
|
import { lib } from '../../lang/en.js';
|
|
5
5
|
import { confirmPrompt } from '../prompts/promptUtils.js';
|
|
6
6
|
export function logFeedbackMessage(buildId) {
|
|
7
7
|
if (buildId > 0 && buildId % FEEDBACK_INTERVAL === 0) {
|
|
8
|
-
|
|
8
|
+
logUiLine();
|
|
9
9
|
uiLogger.log(lib.projects.logFeedbackMessage.feedbackHeader);
|
|
10
|
-
|
|
10
|
+
logUiLine();
|
|
11
11
|
uiLogger.log(lib.projects.logFeedbackMessage.feedbackMessage);
|
|
12
12
|
}
|
|
13
13
|
}
|
package/lib/projects/upload.d.ts
CHANGED
|
@@ -8,6 +8,7 @@ type ProjectUploadResult<T> = {
|
|
|
8
8
|
projectNotFound?: boolean;
|
|
9
9
|
projectId?: number;
|
|
10
10
|
userDeclined?: boolean;
|
|
11
|
+
skippedHsMetaFiles?: string[];
|
|
11
12
|
};
|
|
12
13
|
type HandleProjectUploadArg<T> = {
|
|
13
14
|
accountId: number;
|
|
@@ -23,8 +24,9 @@ type HandleProjectUploadArg<T> = {
|
|
|
23
24
|
skipAutoDeploy?: boolean;
|
|
24
25
|
profile?: string;
|
|
25
26
|
force?: boolean;
|
|
27
|
+
formatOutputAsJson?: boolean;
|
|
26
28
|
};
|
|
27
|
-
export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, skipNpmAudit, skipAutoDeploy, force, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
|
|
29
|
+
export declare function handleProjectUpload<T>({ accountId, projectConfig, projectDir, callbackFunc, profile, uploadMessage, forceCreate, isUploadCommand, sendIR, skipValidation, skipNpmAudit, skipAutoDeploy, force, formatOutputAsJson, }: HandleProjectUploadArg<T>): Promise<ProjectUploadResult<T>>;
|
|
28
30
|
export type SourceDirectoryWarning = {
|
|
29
31
|
message: string;
|
|
30
32
|
file: string;
|