@hubspot/local-dev-lib 0.3.13 → 0.3.15

package/api/github.js

@@ -16,7 +16,7 @@ const GITHUB_AUTH_HEADERS = {
 async function fetchRepoReleaseData(repoPath, tag = '') {
     const URL = `${GITHUB_REPOS_API}/${repoPath}/releases`;
     return axios_1.default.get(`${URL}/${tag ? `tags/${tag}` : 'latest'}`, {
-        headers: { ...getAxiosConfig_1.DEFAULT_USER_AGENT_HEADERS, ...GITHUB_AUTH_HEADERS },
+        headers: { ...(0, getAxiosConfig_1.getDefaultUserAgentHeader)(), ...GITHUB_AUTH_HEADERS },
     });
 }
 exports.fetchRepoReleaseData = fetchRepoReleaseData;
@@ -25,21 +25,21 @@ exports.fetchRepoReleaseData = fetchRepoReleaseData;
 async function fetchRepoAsZip(zipUrl) {
     return axios_1.default.get(zipUrl, {
         responseType: 'arraybuffer',
-        headers: { ...getAxiosConfig_1.DEFAULT_USER_AGENT_HEADERS, ...GITHUB_AUTH_HEADERS },
+        headers: { ...(0, getAxiosConfig_1.getDefaultUserAgentHeader)(), ...GITHUB_AUTH_HEADERS },
     });
 }
 exports.fetchRepoAsZip = fetchRepoAsZip;
 // Returns the raw file contents via the raw.githubusercontent endpoint
 async function fetchRepoFile(repoPath, filePath, ref) {
     return axios_1.default.get(`${GITHUB_RAW_CONTENT_API_PATH}/${repoPath}/${ref}/${filePath}`, {
-        headers: { ...getAxiosConfig_1.DEFAULT_USER_AGENT_HEADERS, ...GITHUB_AUTH_HEADERS },
+        headers: { ...(0, getAxiosConfig_1.getDefaultUserAgentHeader)(), ...GITHUB_AUTH_HEADERS },
     });
 }
 exports.fetchRepoFile = fetchRepoFile;
 // Returns the raw file contents via the raw.githubusercontent endpoint
 async function fetchRepoFileByDownloadUrl(downloadUrl) {
     return axios_1.default.get(downloadUrl, {
-        headers: { ...getAxiosConfig_1.DEFAULT_USER_AGENT_HEADERS, ...GITHUB_AUTH_HEADERS },
+        headers: { ...(0, getAxiosConfig_1.getDefaultUserAgentHeader)(), ...GITHUB_AUTH_HEADERS },
     });
 }
 exports.fetchRepoFileByDownloadUrl = fetchRepoFileByDownloadUrl;
@@ -48,7 +48,7 @@ exports.fetchRepoFileByDownloadUrl = fetchRepoFileByDownloadUrl;
 async function fetchRepoContents(repoPath, path, ref) {
     const refQuery = ref ? `?ref=${ref}` : '';
     return axios_1.default.get(`${GITHUB_REPOS_API}/${repoPath}/contents/${path}${refQuery}`, {
-        headers: { ...getAxiosConfig_1.DEFAULT_USER_AGENT_HEADERS, ...GITHUB_AUTH_HEADERS },
+        headers: { ...(0, getAxiosConfig_1.getDefaultUserAgentHeader)(), ...GITHUB_AUTH_HEADERS },
     });
 }
 exports.fetchRepoContents = fetchRepoContents;

package/api/projects.d.ts

@@ -4,6 +4,7 @@ import { Project, FetchProjectResponse, UploadProjectResponse, ProjectSettings }
 import { Build, FetchProjectBuildsResponse } from '../types/Build';
 import { ComponentMetadataResponse, ComponentStructureResponse } from '../types/ComponentStructure';
 import { Deploy, ProjectDeployResponse } from '../types/Deploy';
+import { ProjectLog } from '../types/ProjectLog';
 export declare function fetchProjects(accountId: number): Promise<FetchProjectResponse>;
 export declare function createProject(accountId: number, name: string): Promise<Project>;
 export declare function uploadProject(accountId: number, projectName: string, projectFile: string, uploadMessage: string, platformVersion?: string): Promise<UploadProjectResponse>;
@@ -28,4 +29,10 @@ export declare function queueBuild(accountId: number, projectName: string, platf
 export declare function uploadFileToBuild(accountId: number, projectName: string, filePath: string, path: string): Promise<void>;
 export declare function deleteFileFromBuild(accountId: number, projectName: string, path: string): Promise<void>;
 export declare function cancelStagedBuild(accountId: number, projectName: string): Promise<void>;
+export declare function fetchBuildWarnLogs(accountId: number, projectName: string, buildId: number): Promise<{
+    logs: Array<ProjectLog>;
+}>;
+export declare function fetchDeployWarnLogs(accountId: number, projectName: string, deployId: number): Promise<{
+    logs: Array<ProjectLog>;
+}>;
 export {};

package/api/projects.js

@@ -3,11 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.cancelStagedBuild = exports.deleteFileFromBuild = exports.uploadFileToBuild = exports.queueBuild = exports.provisionBuild = exports.fetchDeployComponentsMetadata = exports.fetchProjectSettings = exports.getDeployStructure = exports.getDeployStatus = exports.deployProject = exports.getBuildStructure = exports.getBuildStatus = exports.fetchProjectBuilds = exports.fetchPlatformVersions = exports.deleteProject = exports.downloadProject = exports.fetchProject = exports.uploadProject = exports.createProject = exports.fetchProjects = void 0;
+exports.fetchDeployWarnLogs = exports.fetchBuildWarnLogs = exports.cancelStagedBuild = exports.deleteFileFromBuild = exports.uploadFileToBuild = exports.queueBuild = exports.provisionBuild = exports.fetchDeployComponentsMetadata = exports.fetchProjectSettings = exports.getDeployStructure = exports.getDeployStatus = exports.deployProject = exports.getBuildStructure = exports.getBuildStatus = exports.fetchProjectBuilds = exports.fetchPlatformVersions = exports.deleteProject = exports.downloadProject = exports.fetchProject = exports.uploadProject = exports.createProject = exports.fetchProjects = void 0;
 const http_1 = __importDefault(require("../http"));
 const fs_1 = __importDefault(require("fs"));
 const PROJECTS_API_PATH = 'dfs/v1/projects';
 const PROJECTS_DEPLOY_API_PATH = 'dfs/deploy/v1';
+const PROJECTS_LOGS_API_PATH = 'dfs/logging/v1';
 const DEVELOPER_PROJECTS_API_PATH = 'developer/projects/v1';
 async function fetchProjects(accountId) {
     return http_1.default.get(accountId, {
@@ -159,3 +160,15 @@ async function cancelStagedBuild(accountId, projectName) {
     });
 }
 exports.cancelStagedBuild = cancelStagedBuild;
+async function fetchBuildWarnLogs(accountId, projectName, buildId) {
+    return http_1.default.get(accountId, {
+        url: `${PROJECTS_LOGS_API_PATH}/logs/projects/${projectName}/builds/${buildId}/combined/warn`,
+    });
+}
+exports.fetchBuildWarnLogs = fetchBuildWarnLogs;
+async function fetchDeployWarnLogs(accountId, projectName, deployId) {
+    return http_1.default.get(accountId, {
+        url: `${PROJECTS_LOGS_API_PATH}/logs/projects/${projectName}/deploys/${deployId}/combined/warn`,
+    });
+}
+exports.fetchDeployWarnLogs = fetchDeployWarnLogs;

package/config/CLIConfiguration.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = require("../lib/logging/logger");
+const logger_1 = require("../lib/logger");
 const standardErrors_1 = require("../errors/standardErrors");
 const environment_1 = require("./environment");
 const environment_2 = require("../lib/environment");

package/config/configFile.js

@@ -8,7 +8,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const js_yaml_1 = __importDefault(require("js-yaml"));
-const logger_1 = require("../lib/logging/logger");
+const logger_1 = require("../lib/logger");
 const fileSystemErrors_1 = require("../errors/fileSystemErrors");
 const standardErrors_1 = require("../errors/standardErrors");
 const config_1 = require("../constants/config");

package/config/configUtils.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.generateConfig = exports.getOrderedConfig = exports.getOrderedAccount = void 0;
-const logger_1 = require("../lib/logging/logger");
+const logger_1 = require("../lib/logger");
 const auth_1 = require("../constants/auth");
 const lang_1 = require("../utils/lang");
 const i18nKey = 'config.configUtils';

package/config/config_DEPRECATED.js

@@ -13,7 +13,7 @@ const environments_1 = require("../constants/environments");
 const auth_1 = require("../constants/auth");
 const files_1 = require("../constants/files");
 const environment_1 = require("../lib/environment");
-const logger_1 = require("../lib/logging/logger");
+const logger_1 = require("../lib/logger");
 const git_1 = require("../utils/git");
 const errors_DEPRECATED_1 = require("../errors/errors_DEPRECATED");
 const ALL_MODES = Object.values(files_1.MODE);

package/config/environment.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadConfigFromEnvironment = void 0;
-const logger_1 = require("../lib/logging/logger");
+const logger_1 = require("../lib/logger");
 const environments_1 = require("../constants/environments");
 const auth_1 = require("../constants/auth");
 const configUtils_1 = require("./configUtils");

package/http/getAxiosConfig.d.ts

@@ -1,6 +1,9 @@
 import { AxiosConfigOptions } from '../types/Http';
 import { AxiosRequestConfig } from 'axios';
-export declare const DEFAULT_USER_AGENT_HEADERS: {
+export declare const USER_AGENTS: {
+    [key: string]: string;
+};
+export declare function getDefaultUserAgentHeader(): {
     'User-Agent': string;
 };
 export declare function getAxiosConfig(options: AxiosConfigOptions): AxiosRequestConfig;

package/http/getAxiosConfig.js

@@ -1,12 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAxiosConfig = exports.DEFAULT_USER_AGENT_HEADERS = void 0;
+exports.getAxiosConfig = exports.getDefaultUserAgentHeader = exports.USER_AGENTS = void 0;
 const package_json_1 = require("../package.json");
 const config_1 = require("../config");
 const urls_1 = require("../lib/urls");
-exports.DEFAULT_USER_AGENT_HEADERS = {
-    'User-Agent': `HubSpot Local Dev Lib/${package_json_1.version}`,
+exports.USER_AGENTS = {
+    'HubSpot Local Dev Lib': package_json_1.version,
 };
+function getDefaultUserAgentHeader() {
+    let userAgentString = '';
+    Object.keys(exports.USER_AGENTS).forEach((userAgentKey, i) => {
+        userAgentString += `${i > 0 ? ', ' : ''}${userAgentKey}/${exports.USER_AGENTS[userAgentKey]}`;
+    });
+    return {
+        'User-Agent': userAgentString,
+    };
+}
+exports.getDefaultUserAgentHeader = getDefaultUserAgentHeader;
 const DEFAULT_TRANSITIONAL = {
     clarifyTimeoutError: true,
 };
@@ -16,7 +26,7 @@ function getAxiosConfig(options) {
     return {
         baseURL: (0, urls_1.getHubSpotApiOrigin)(env, localHostOverride ? false : httpUseLocalhost),
         headers: {
-            ...exports.DEFAULT_USER_AGENT_HEADERS,
+            ...getDefaultUserAgentHeader(),
             ...(headers || {}),
         },
         timeout: httpTimeout || 15000,

package/http/index.d.ts

@@ -1,5 +1,6 @@
 import { AxiosResponse } from 'axios';
 import { HttpOptions } from '../types/Http';
+export declare function addUserAgentHeader(key: string, value: string): void;
 declare function getRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
 declare function postRequest<T>(accountId: number, options: HttpOptions): Promise<T>;
 declare function putRequest<T>(accountId: number, options: HttpOptions): Promise<T>;

package/http/index.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.addUserAgentHeader = void 0;
 const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const content_disposition_1 = __importDefault(require("content-disposition"));
@@ -12,9 +13,13 @@ const getAxiosConfig_1 = require("./getAxiosConfig");
 const personalAccessKey_1 = require("../lib/personalAccessKey");
 const oauth_1 = require("../lib/oauth");
 const standardErrors_1 = require("../errors/standardErrors");
-const logger_1 = require("../lib/logging/logger");
+const logger_1 = require("../lib/logger");
 const lang_1 = require("../utils/lang");
 const i18nKey = 'http.index';
+function addUserAgentHeader(key, value) {
+    getAxiosConfig_1.USER_AGENTS[key] = value;
+}
+exports.addUserAgentHeader = addUserAgentHeader;
 async function withOauth(accountId, accountConfig, axiosConfig) {
     const { headers } = axiosConfig;
     const oauth = (0, oauth_1.getOauthManager)(accountId, accountConfig);

package/lang/en.json

@@ -183,21 +183,6 @@
                 "ready": "Watcher is ready and watching {{ src }}. Any changes detected will be automatically uploaded and overwrite the current version in the developer file system."
             }
         },
-        "logging": {
-            "git": {
-                "securityIssue": "Security Issue Detected",
-                "configFileTracked": "The HubSpot config file can be tracked by git.",
-                "fileName": "File: \"{{ configPath }}\"",
-                "remediate": "To remediate:",
-                "moveConfig": "- Move the config file to your home directory: '{{ homeDir }}'",
-                "addGitignore": "- Add gitignore pattern '{{ configPath }}' to a .gitignore file in root of your repository.",
-                "noRemote": "- Ensure that the config file has not already been pushed to a remote repository.",
-                "checkFailed": "Unable to determine if config file is properly ignored by git."
-            },
-            "logs": {
-                "unableToProcessLog": "Unable to process log {{ log }}"
-            }
-        },
         "oauth": {
             "writeTokenInfo": "Updating Oauth2 token info for portalId: {{ portalId }}",
             "addOauthToAccountConfig": {
@@ -395,7 +380,7 @@
                 "429": "The {{ messageDetail }} surpassed the rate limit. Retry in one minute.",
                 "503": "The {{ messageDetail }} could not be handled at this time. Please try again or visit https://help.hubspot.com/ to submit a ticket or contact HubSpot Support if the issue persists.",
                 "403ProjectMissingScope": "Couldn't run the project command because there are scopes missing in your production account. To update scopes, deactivate your current personal access key for {{ accountId }}, and generate a new one. Then run `hs auth` to update the CLI with the new key.",
-                "403ProjectGating": "The current target account {{ accountId }} does not have access to HubSpot projects. To opt in to the CRM Development Beta and use projects, visit https://app.hubspot.com/l/whats-new/betas?productUpdateId=13860216.",
+                "403ProjectGating": "The current target account {{ accountId }} does not have access to HubSpot projects. To opt in to the CRM Development Beta and use projects, visit https://app.hubspot.com/l/product-updates/in-beta?update=13899236.",
                 "500Generic": "The {{ messageDetail }} failed due to a server error. Please try again or visit https://help.hubspot.com/ to submit a ticket or contact HubSpot Support if the issue persists.",
                 "400Generic": "The {{ messageDetail }} failed due to a client error.",
                 "generic": "The {{ messageDetail }} failed."

package/lang/lang/en.json

@@ -183,21 +183,6 @@
         "ready": "Watcher is ready and watching {{ src }}. Any changes detected will be automatically uploaded and overwrite the current version in the developer file system."
       }
     },
-    "logging": {
-      "git": {
-        "securityIssue": "Security Issue Detected",
-        "configFileTracked": "The HubSpot config file can be tracked by git.",
-        "fileName": "File: \"{{ configPath }}\"",
-        "remediate": "To remediate:",
-        "moveConfig": "- Move the config file to your home directory: '{{ homeDir }}'",
-        "addGitignore": "- Add gitignore pattern '{{ configPath }}' to a .gitignore file in root of your repository.",
-        "noRemote": "- Ensure that the config file has not already been pushed to a remote repository.",
-        "checkFailed": "Unable to determine if config file is properly ignored by git."
-      },
-      "logs": {
-        "unableToProcessLog": "Unable to process log {{ log }}"
-      }
-    },
     "oauth": {
       "writeTokenInfo": "Updating Oauth2 token info for portalId: {{ portalId }}",
       "addOauthToAccountConfig": {
@@ -395,7 +380,7 @@
         "429": "The {{ messageDetail }} surpassed the rate limit. Retry in one minute.",
         "503": "The {{ messageDetail }} could not be handled at this time. Please try again or visit https://help.hubspot.com/ to submit a ticket or contact HubSpot Support if the issue persists.",
         "403ProjectMissingScope": "Couldn't run the project command because there are scopes missing in your production account. To update scopes, deactivate your current personal access key for {{ accountId }}, and generate a new one. Then run `hs auth` to update the CLI with the new key.",
-        "403ProjectGating": "The current target account {{ accountId }} does not have access to HubSpot projects. To opt in to the CRM Development Beta and use projects, visit https://app.hubspot.com/l/whats-new/betas?productUpdateId=13860216.",
+        "403ProjectGating": "The current target account {{ accountId }} does not have access to HubSpot projects. To opt in to the CRM Development Beta and use projects, visit https://app.hubspot.com/l/product-updates/in-beta?update=13899236.",
         "500Generic": "The {{ messageDetail }} failed due to a server error. Please try again or visit https://help.hubspot.com/ to submit a ticket or contact HubSpot Support if the issue persists.",
         "400Generic": "The {{ messageDetail }} failed due to a client error.",
         "generic": "The {{ messageDetail }} failed."

package/lib/archive.js

@@ -10,7 +10,7 @@ const os_1 = require("os");
 const extract_zip_1 = __importDefault(require("extract-zip"));
 const fileSystemErrors_1 = require("../errors/fileSystemErrors");
 const standardErrors_1 = require("../errors/standardErrors");
-const logger_1 = require("./logging/logger");
+const logger_1 = require("./logger");
 const lang_1 = require("../utils/lang");
 const i18nKey = 'lib.archive';
 async function extractZip(name, zip) {

package/lib/cms/functions.js

@@ -9,7 +9,7 @@ const path_1 = __importDefault(require("path"));
 const findup_sync_1 = __importDefault(require("findup-sync"));
 const path_2 = require("../path");
 const github_1 = require("../github");
-const logger_1 = require("../logging/logger");
+const logger_1 = require("../logger");
 const standardErrors_1 = require("../../errors/standardErrors");
 const fileSystemErrors_1 = require("../../errors/fileSystemErrors");
 const lang_1 = require("../../utils/lang");

package/lib/cms/handleFieldsJS.js

@@ -10,7 +10,7 @@ const path_1 = __importDefault(require("path"));
 const child_process_1 = require("child_process");
 const escapeRegExp_1 = require("../escapeRegExp");
 const modules_1 = require("../../utils/cms/modules");
-const logger_1 = require("../logging/logger");
+const logger_1 = require("../logger");
 const standardErrors_1 = require("../../errors/standardErrors");
 const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.handleFieldsJs';

package/lib/cms/modules.js

@@ -10,7 +10,7 @@ const path_2 = require("../path");
 const fs_1 = require("../fs");
 const github_1 = require("../github");
 const standardErrors_1 = require("../../errors/standardErrors");
-const logger_1 = require("../logging/logger");
+const logger_1 = require("../logger");
 const modules_1 = require("../../utils/cms/modules");
 const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.modules';

package/lib/cms/templates.js

@@ -8,7 +8,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const github_1 = require("../github");
 const standardErrors_1 = require("../../errors/standardErrors");
-const logger_1 = require("../logging/logger");
+const logger_1 = require("../logger");
 const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.templates';
 // Matches the .html file extension, excluding module.html

package/lib/cms/uploadFolder.js

@@ -14,7 +14,7 @@ const escapeRegExp_1 = require("../escapeRegExp");
 const path_2 = require("../path");
 const standardErrors_1 = require("../../errors/standardErrors");
 const apiErrors_1 = require("../../errors/apiErrors");
-const logger_1 = require("../logging/logger");
+const logger_1 = require("../logger");
 const files_1 = require("../../constants/files");
 const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.uploadFolder';

package/lib/cms/watch.js

@@ -18,7 +18,7 @@ const escapeRegExp_1 = require("../escapeRegExp");
 const path_2 = require("../path");
 const notify_1 = require("../notify");
 const themes_1 = require("./themes");
-const logger_1 = require("../logging/logger");
+const logger_1 = require("../logger");
 const lang_1 = require("../../utils/lang");
 const i18nKey = 'lib.cms.watch';
 const queue = new p_queue_1.default({

package/lib/fileManager.js

@@ -9,7 +9,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const fileManager_1 = require("../api/fileManager");
 const fs_1 = require("./fs");
-const logger_1 = require("./logging/logger");
+const logger_1 = require("./logger");
 const ignoreRules_1 = require("./ignoreRules");
 const http_1 = __importDefault(require("../http"));
 const escapeRegExp_1 = require("./escapeRegExp");

package/lib/fileMapper.js

@@ -9,7 +9,7 @@ const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const p_queue_1 = __importDefault(require("p-queue"));
 const path_2 = require("./path");
-const logger_1 = require("./logging/logger");
+const logger_1 = require("./logger");
 const fileMapper_1 = require("../api/fileMapper");
 const standardErrors_1 = require("../errors/standardErrors");
 const extensions_1 = require("../constants/extensions");

package/lib/github.js

@@ -8,7 +8,7 @@ const path_1 = __importDefault(require("path"));
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const standardErrors_1 = require("../errors/standardErrors");
 const archive_1 = require("./archive");
-const logger_1 = require("./logging/logger");
+const logger_1 = require("./logger");
 const github_1 = require("../api/github");
 const lang_1 = require("../utils/lang");
 const i18nKey = 'lib.github';

package/lib/gitignore.d.ts

@@ -1 +1,8 @@
 export declare function checkAndAddConfigToGitignore(configPath: string): void;
+type GitInclusionResult = {
+    inGit: boolean;
+    configIgnored: boolean;
+    gitignoreFiles: Array<string>;
+};
+export declare function checkGitInclusion(configPath: string): GitInclusionResult;
+export {};

package/lib/gitignore.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAndAddConfigToGitignore = void 0;
+exports.checkGitInclusion = exports.checkAndAddConfigToGitignore = void 0;
 const fs_extra_1 = require("fs-extra");
 const path_1 = __importDefault(require("path"));
 const git_1 = require("../utils/git");
@@ -13,7 +13,7 @@ const i18nKey = 'lib.gitignore';
 const GITIGNORE_FILE = '.gitignore';
 function checkAndAddConfigToGitignore(configPath) {
     try {
-        const { configIgnored, gitignoreFiles } = (0, git_1.checkGitInclusion)(configPath);
+        const { configIgnored, gitignoreFiles } = checkGitInclusion(configPath);
         if (configIgnored)
             return;
         let gitignoreFilePath = gitignoreFiles && gitignoreFiles.length ? gitignoreFiles[0] : null;
@@ -30,3 +30,20 @@ function checkAndAddConfigToGitignore(configPath) {
     }
 }
 exports.checkAndAddConfigToGitignore = checkAndAddConfigToGitignore;
+function checkGitInclusion(configPath) {
+    const result = {
+        inGit: false,
+        configIgnored: false,
+        gitignoreFiles: [],
+    };
+    if ((0, git_1.isConfigPathInGitRepo)(configPath)) {
+        result.inGit = true;
+        result.gitignoreFiles = (0, git_1.getGitignoreFiles)(configPath);
+        if ((0, git_1.configFilenameIsIgnoredByGitignore)(result.gitignoreFiles, configPath)) {
+            // Found ignore statement in .gitignore that matches config filename
+            result.configIgnored = true;
+        }
+    }
+    return result;
+}
+exports.checkGitInclusion = checkGitInclusion;

package/lib/oauth.js

@@ -7,7 +7,7 @@ exports.addOauthToAccountConfig = exports.getOauthManager = void 0;
 const OAuth2Manager_1 = __importDefault(require("../models/OAuth2Manager"));
 const auth_1 = require("../constants/auth");
 const standardErrors_1 = require("../errors/standardErrors");
-const logger_1 = require("./logging/logger");
+const logger_1 = require("./logger");
 const getAccountIdentifier_1 = require("../utils/getAccountIdentifier");
 const config_1 = require("../config");
 const lang_1 = require("../utils/lang");

package/lib/personalAccessKey.js

@@ -13,7 +13,7 @@ const sandboxHubs_1 = require("../api/sandboxHubs");
 const config_1 = require("../config");
 const config_2 = require("../constants/config");
 const developerTestAccounts_1 = require("../api/developerTestAccounts");
-const logger_1 = require("./logging/logger");
+const logger_1 = require("./logger");
 const apiErrors_1 = require("../errors/apiErrors");
 const i18nKey = 'lib.personalAccessKey';
 const refreshRequests = new Map();

package/lib/trackUsage.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.trackUsage = void 0;
 const axios_1 = __importDefault(require("axios"));
 const getAxiosConfig_1 = require("../http/getAxiosConfig");
-const logger_1 = require("./logging/logger");
+const logger_1 = require("./logger");
 const http_1 = __importDefault(require("../http"));
 const config_1 = require("../config");
 const fileMapper_1 = require("../api/fileMapper");

package/models/OAuth2Manager.js

@@ -7,7 +7,7 @@ const axios_1 = __importDefault(require("axios"));
 const moment_1 = __importDefault(require("moment"));
 const urls_1 = require("../lib/urls");
 const environment_1 = require("../lib/environment");
-const logger_1 = require("../lib/logging/logger");
+const logger_1 = require("../lib/logger");
 const getAccountIdentifier_1 = require("../utils/getAccountIdentifier");
 const auth_1 = require("../constants/auth");
 const standardErrors_1 = require("../errors/standardErrors");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hubspot/local-dev-lib",
-    "version": "0.3.13",
+    "version": "0.3.15",
     "description": "Provides library functionality for HubSpot local development tooling, including the HubSpot CLI",
     "main": "lib/index.js",
     "repository": {
@@ -54,7 +54,6 @@
         "./http": "./http/index.js",
         "./config": "./config/index.js",
         "./constants/*": "./constants/*.js",
-        "./logger": "./lib/logging/logger.js",
         "./models/*": "./models/*.js"
     },
     "dependencies": {
@@ -75,7 +74,6 @@
         "p-queue": "^6.0.2",
         "prettier": "^3.0.3",
         "semver": "^6.3.0",
-        "table": "^6.8.1",
         "unixify": "^1.0.0"
     },
     "engines": {

package/types/ProjectLog.d.ts

@@ -0,0 +1,9 @@
+export type ProjectLog = {
+    lineNumber: number;
+    logLevel: string;
+    message: string;
+    pipelineStepId: number;
+    pipelineSubstepId?: string;
+    pipelineSubstepName?: string;
+    timestamp: number;
+};

package/types/ProjectLog.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/utils/PortManagerServer.js

@@ -8,7 +8,7 @@ const cors_1 = __importDefault(require("cors"));
 const detectPort_1 = require("./detectPort");
 const ports_1 = require("../constants/ports");
 const standardErrors_1 = require("../errors/standardErrors");
-const logger_1 = require("../lib/logging/logger");
+const logger_1 = require("../lib/logger");
 const lang_1 = require("./lang");
 const i18nKey = 'utils.PortManagerServer';
 class PortManagerServer {

package/utils/git.d.ts

@@ -1,9 +1,3 @@
+export declare function getGitignoreFiles(configPath: string): Array<string>;
 export declare function isConfigPathInGitRepo(configPath: string): boolean;
 export declare function configFilenameIsIgnoredByGitignore(ignoreFiles: Array<string>, configPath: string): boolean;
-type GitInclusionResult = {
-    inGit: boolean;
-    configIgnored: boolean;
-    gitignoreFiles: Array<string>;
-};
-export declare function checkGitInclusion(configPath: string): GitInclusionResult;
-export {};

package/utils/git.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkGitInclusion = exports.configFilenameIsIgnoredByGitignore = exports.isConfigPathInGitRepo = void 0;
+exports.configFilenameIsIgnoredByGitignore = exports.isConfigPathInGitRepo = exports.getGitignoreFiles = void 0;
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const path_1 = __importDefault(require("path"));
 const ignore_1 = __importDefault(require("ignore"));
@@ -47,6 +47,7 @@ function getGitignoreFiles(configPath) {
     }
     return files;
 }
+exports.getGitignoreFiles = getGitignoreFiles;
 function isConfigPathInGitRepo(configPath) {
     const gitDir = getGitComparisonDir();
     if (!gitDir)
@@ -68,20 +69,3 @@ function configFilenameIsIgnoredByGitignore(ignoreFiles, configPath) {
     });
 }
 exports.configFilenameIsIgnoredByGitignore = configFilenameIsIgnoredByGitignore;
-function checkGitInclusion(configPath) {
-    const result = {
-        inGit: false,
-        configIgnored: false,
-        gitignoreFiles: [],
-    };
-    if (isConfigPathInGitRepo(configPath)) {
-        result.inGit = true;
-        result.gitignoreFiles = getGitignoreFiles(configPath);
-        if (configFilenameIsIgnoredByGitignore(result.gitignoreFiles, configPath)) {
-            // Found ignore statement in .gitignore that matches config filename
-            result.configIgnored = true;
-        }
-    }
-    return result;
-}
-exports.checkGitInclusion = checkGitInclusion;

package/lib/logging/git.d.ts

@@ -1,2 +0,0 @@
-export declare function checkAndWarnGitInclusion(configPath: string): void;
-export declare function checkAndUpdateGitignore(configPath: string): void;

package/lib/logging/git.js

@@ -1,54 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAndUpdateGitignore = exports.checkAndWarnGitInclusion = void 0;
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const path_1 = __importDefault(require("path"));
-const os_1 = __importDefault(require("os"));
-const git_1 = require("../../utils/git");
-const logger_1 = require("./logger");
-const lang_1 = require("../../utils/lang");
-const config_1 = require("../../constants/config");
-const GITIGNORE_FILE = '.gitignore';
-const i18nKey = 'lib.logging.git';
-function checkAndWarnGitInclusion(configPath) {
-    try {
-        const { inGit, configIgnored } = (0, git_1.checkGitInclusion)(configPath);
-        if (!inGit || configIgnored)
-            return;
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.securityIssue`));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.configFileTracked`));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.fileName`, { configPath }));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.remediate`));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.moveConfig`, { homeDir: os_1.default.homedir() }));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.addGitignore`, { configPath }));
-        logger_1.logger.warn((0, lang_1.i18n)(`${i18nKey}.noRemote`));
-    }
-    catch (e) {
-        // fail silently
-        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.checkFailed`));
-    }
-}
-exports.checkAndWarnGitInclusion = checkAndWarnGitInclusion;
-function checkAndUpdateGitignore(configPath) {
-    try {
-        const { configIgnored, gitignoreFiles } = (0, git_1.checkGitInclusion)(configPath);
-        if (configIgnored)
-            return;
-        let gitignoreFilePath = gitignoreFiles && gitignoreFiles.length ? gitignoreFiles[0] : null;
-        if (!gitignoreFilePath) {
-            gitignoreFilePath = path_1.default.resolve(configPath, GITIGNORE_FILE);
-            fs_extra_1.default.writeFileSync(gitignoreFilePath, '');
-        }
-        const gitignoreContents = fs_extra_1.default.readFileSync(gitignoreFilePath).toString();
-        const updatedContents = `${gitignoreContents.trim()}\n\n# HubSpot config file\n${config_1.DEFAULT_HUBSPOT_CONFIG_YAML_FILE_NAME}\n`;
-        fs_extra_1.default.writeFileSync(gitignoreFilePath, updatedContents);
-    }
-    catch (e) {
-        // fail silently
-        logger_1.logger.debug((0, lang_1.i18n)(`${i18nKey}.checkFailed`));
-    }
-}
-exports.checkAndUpdateGitignore = checkAndUpdateGitignore;

package/lib/logging/logs.d.ts

@@ -1,22 +0,0 @@
-type Log = {
-    log: string;
-    status: 'SUCCESS' | 'ERROR' | 'UNHANDLED_ERROR' | 'HANDLED_ERROR';
-    createdAt: string;
-    executionTime: string;
-    error: {
-        type: string;
-        message: string;
-        stackTrace: Array<Array<string>>;
-    };
-};
-type Options = {
-    compact: boolean;
-    insertions: {
-        header: string;
-    };
-};
-type LogsResponse = {
-    results: Array<Log>;
-};
-export declare function outputLogs(logsResp: LogsResponse, options: Options): void;
-export {};

package/lib/logging/logs.js

@@ -1,86 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.outputLogs = void 0;
-const moment_1 = __importDefault(require("moment"));
-const chalk_1 = __importDefault(require("chalk"));
-const logger_1 = require("./logger");
-const lang_1 = require("../../utils/lang");
-const i18nKey = 'lib.logging.logs';
-const SEPARATOR = ' - ';
-const LOG_STATUS_COLORS = {
-    SUCCESS: logger_1.Styles.success,
-    ERROR: logger_1.Styles.error,
-    UNHANDLED_ERROR: logger_1.Styles.error,
-    HANDLED_ERROR: logger_1.Styles.error,
-};
-function errorHandler(log, options) {
-    return `${formatLogHeader(log, options)}${formatError(log, options)}`;
-}
-const logHandler = {
-    ERROR: errorHandler,
-    UNHANDLED_ERROR: errorHandler,
-    HANDLED_ERROR: errorHandler,
-    SUCCESS: (log, options) => {
-        return `${formatLogHeader(log, options)}${formatSuccess(log, options)}`;
-    },
-};
-function formatSuccess(log, options) {
-    if (!log.log || options.compact) {
-        return '';
-    }
-    return `\n${log.log}`;
-}
-function formatError(log, options) {
-    if (!log.error || options.compact) {
-        return '';
-    }
-    return `${log.error.type}: ${log.error.message}\n${formatStackTrace(log)}`;
-}
-function formatLogHeader(log, options) {
-    const color = LOG_STATUS_COLORS[log.status];
-    const headerInsertion = options && options.insertions && options.insertions.header;
-    return `${formatTimestamp(log)}${SEPARATOR}${color(log.status)}${headerInsertion ? `${SEPARATOR}${headerInsertion}` : ''}${SEPARATOR}${formatExecutionTime(log)}`;
-}
-function formatStackTrace(log) {
-    const stackTrace = (log.error.stackTrace && log.error.stackTrace[0]) || [];
-    return stackTrace
-        .map(trace => {
-        return `  at ${trace}\n`;
-    })
-        .join('');
-}
-function formatTimestamp(log) {
-    return `${chalk_1.default.whiteBright((0, moment_1.default)(log.createdAt).toISOString())}`;
-}
-function formatExecutionTime(log) {
-    return `${chalk_1.default.whiteBright('Execution Time:')} ${log.executionTime}ms`;
-}
-function processLog(log, options) {
-    try {
-        return logHandler[log.status](log, options);
-    }
-    catch (e) {
-        logger_1.logger.error((0, lang_1.i18n)(`${i18nKey}.unableToProcessLog`, {
-            log: JSON.stringify(log),
-        }));
-    }
-}
-function processLogs(logsResp, options) {
-    if (!logsResp || (logsResp.results && !logsResp.results.length)) {
-        return 'No logs found.';
-    }
-    else if (logsResp.results && logsResp.results.length) {
-        return logsResp.results
-            .map(log => {
-            return processLog(log, options);
-        })
-            .join('\n');
-    }
-}
-function outputLogs(logsResp, options) {
-    logger_1.logger.log(processLogs(logsResp, options));
-}
-exports.outputLogs = outputLogs;

package/lib/logging/table.d.ts

@@ -1,3 +0,0 @@
-import { TableUserConfig } from 'table';
-export declare function getTableContents(tableData?: Array<Array<any>>, tableConfig?: TableUserConfig): string;
-export declare function getTableHeader(headerItems: Array<string>): Array<string>;

package/lib/logging/table.js

@@ -1,47 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTableHeader = exports.getTableContents = void 0;
-const chalk_1 = __importDefault(require("chalk"));
-const table_1 = require("table");
-const objectUtils_1 = require("../../utils/objectUtils");
-const tableConfigDefaults = {
-    singleLine: true,
-    border: {
-        topBody: '',
-        topJoin: '',
-        topLeft: '',
-        topRight: '',
-        bottomBody: '',
-        bottomJoin: '',
-        bottomLeft: '',
-        bottomRight: '',
-        bodyLeft: '',
-        bodyRight: '',
-        bodyJoin: '',
-        joinBody: '',
-        joinLeft: '',
-        joinRight: '',
-        joinJoin: '',
-    },
-    columnDefault: {
-        paddingLeft: 0,
-        paddingRight: 1,
-    },
-    drawHorizontalLine: () => {
-        return false;
-    },
-};
-function getTableContents(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-tableData = [], tableConfig = {}) {
-    const mergedConfig = (0, objectUtils_1.mergeDeep)({}, tableConfigDefaults, tableConfig);
-    return (0, table_1.table)(tableData, mergedConfig);
-}
-exports.getTableContents = getTableContents;
-function getTableHeader(headerItems) {
-    return headerItems.map(headerItem => chalk_1.default.bold(headerItem));
-}
-exports.getTableHeader = getTableHeader;

package/utils/objectUtils.d.ts

@@ -1,8 +0,0 @@
-export declare function isObject(item: any): any;
-export declare function mergeDeep(target: {
-    [key: string]: any;
-}, ...sources: Array<{
-    [key: string]: any;
-}>): {
-    [key: string]: any;
-};

package/utils/objectUtils.js

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeDeep = exports.isObject = void 0;
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function isObject(item) {
-    return item && typeof item === 'object' && !Array.isArray(item);
-}
-exports.isObject = isObject;
-function mergeDeep(
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-target, 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-...sources
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-) {
-    if (!sources.length)
-        return target;
-    const source = sources.shift();
-    if (isObject(target) && source && isObject(source)) {
-        for (const key in source) {
-            if (isObject(source[key])) {
-                if (!target[key])
-                    Object.assign(target, { [key]: {} });
-                mergeDeep(target[key], source[key]);
-            }
-            else {
-                Object.assign(target, { [key]: source[key] });
-            }
-        }
-    }
-    return mergeDeep(target, ...sources);
-}
-exports.mergeDeep = mergeDeep;